Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: extra/libdvdnav/PKGBUILD extra/libguess/PKGBUILD extra/libmowgli/PKGBUILD extra/xchm/PKGBUILD libre/linux-libre/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-12-03 19:44:19 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-12-03 19:44:19 -0300
commit: 5f03f36a1327a1c1ade065b89ec2ad873b708a0d (patch)
tree: 0bbfab5010c0318a1faa46d5897fd831e0e4d60c
parent: 1ac43f3f1d47a56bbc1564ae7d2fd0869f345b6c (diff)
parent: 8eed59114cbcf729b65f87d3f73530f6c8363d20 (diff)
43 files changed, 989 insertions, 211 deletions
diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD
index f64e7e5d1..d85d74344 100644
--- a/community-testing/lightspark/PKGBUILD
+++ b/community-testing/lightspark/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=lightspark
-pkgver=0.5.2.1
-pkgrel=3
+pkgver=0.5.3
+pkgrel=2
 pkgdesc='An alternative Flash Player for Linux.'
 arch=('i686' 'x86_64')
 url='http://lightspark.sourceforge.net'
@@ -15,7 +15,7 @@ optdepends=('gnash-gtk: fallback support')
 install="lightspark.install"
 source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz"
         'llvm29.diff')
-md5sums=('ac2233a83e8bf0b305563bbce322cd76'
+md5sums=('2d4519c61aabc34cbba97120f5c01d18'
          '5f717d1d9ead478184ca68f6ac068099')
 
 build() {
diff --git a/community-testing/qbittorrent/PKGBUILD b/community-testing/qbittorrent/PKGBUILD
index c64904198..5ee1bfe5c 100644
--- a/community-testing/qbittorrent/PKGBUILD
+++ b/community-testing/qbittorrent/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59769 2011-11-30 06:36:04Z ibiru $
+# $Id: PKGBUILD 59888 2011-12-02 04:19:15Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
 pkgver=2.9.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64')
 url="http://www.qbittorrent.org/"
diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD
index 03cb2247e..de236d4cd 100644
--- a/community/aqbanking/PKGBUILD
+++ b/community/aqbanking/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57278 2011-10-25 09:57:16Z spupykin $
+# $Id: PKGBUILD 59854 2011-12-01 11:32:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Moore <davidm@sjsoft.com>
 
 pkgname=aqbanking
-pkgver=5.0.16
-_dnrel=87
+pkgver=5.0.17
+_dnrel=88
 pkgrel=1
 pkgdesc="A library for online banking and financial applications"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('gwenhywfar' 'ktoblzcheck' 'libofx')
 options=('!makeflags' '!libtool')
 source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz")
-md5sums=('30549bc6a95f5814b2efe433edeb6f85')
+md5sums=('4543012286159310bdf13badf221a173')
 
 build() {
   cd $srcdir/aqbanking-$pkgver
diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD
index 51297121f..184290b1e 100644
--- a/community/canorus/PKGBUILD
+++ b/community/canorus/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id$
+# $Id: PKGBUILD 59873 2011-12-01 13:49:19Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Linux Pro Audio <dev@archaudio.org>
 # Contributor: Coenraad van der Westhuizen <chwesthuizen@gmail.com>
 # Contributor: hm_b <holger (at) music-nerds (dot) net>
 
 pkgname=canorus
 pkgver=0.7.R1002
-pkgrel=3
+pkgrel=4
 pkgdesc="A free music score editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.canorus.org/"
@@ -18,10 +19,10 @@ md5sums=('5575b7c54633056a463177579a390318')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   export QTDIR=/usr
-
-  cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr -DDEFAULT_DATA_DIR="/usr/share/canorus"
+  cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \
+	-DDEFAULT_DATA_DIR="/usr/share/canorus" \
+	-DNO_SWIG=ON
   make install
 
   install -d $pkgdir/usr/share/{applications,pixmaps}
diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index 7e592886b..61359b1c2 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 13437 2010-03-23 14:09:37Z spupykin $
+# $Id: PKGBUILD 59865 2011-12-01 13:10:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 # Contributor: Sean Gillespie <Sean.D.Gillespie@gmail.com>
 
 pkgname=classpath
 pkgver=0.98
-pkgrel=3
+pkgrel=4
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/classpath/"
 license=('GPL')
-depends=('gtk2>=2.8' 'libxtst')
-makedepends=('gtk2>=2.8' 'libxtst')
+depends=('gtk2>=2.8' 'libxtst' 'libsm')
+makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'openjdk6')
+optdepends=('file' 'gconf')
 source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz)
 md5sums=('90c6571b8b0309e372faa0f9f6255ea9')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   patch -p0 Makefile.in <<EOF
 298,299c298,299
@@ -28,34 +29,34 @@ build() {
 EOF
 
   ./configure --prefix=/usr --disable-Werror --disable-plugin
-  make EXAMPLESDIR= || return 1
-  make EXAMPLESDIR= DESTDIR=$startdir/pkg install || return 1
+  make EXAMPLESDIR=
+  make EXAMPLESDIR= DESTDIR=$pkgdir install
 
-  rm -f $startdir/pkg/usr/bin/gappletviewer && \
-  rm -f $startdir/pkg/usr/bin/gjar && \
-  rm -f $startdir/pkg/usr/bin/gjarsigner && \
-  rm -f $startdir/pkg/usr/bin/gjavah && \
-  rm -f $startdir/pkg/usr/bin/gkeytool && \
-  rm -f $startdir/pkg/usr/bin/gnative2ascii && \
-  rm -f $startdir/pkg/usr/bin/gorbd && \
-  rm -f $startdir/pkg/usr/bin/grmic && \
-  rm -f $startdir/pkg/usr/bin/grmid && \
-  rm -f $startdir/pkg/usr/bin/grmiregistry && \
-  rm -f $startdir/pkg/usr/bin/gserialver && \
-  rm -f $startdir/pkg/usr/bin/gtnameserv && \
-  rm -f $startdir/pkg/usr/lib/logging.properties && \
-  rm -f $startdir/pkg/usr/lib/security/classpath.security && \
-  rm -f $startdir/pkg/usr/share/man/man1/gappletviewer.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gcjh.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gjar.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gjarsigner.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gjavah.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gkeytool.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gnative2ascii.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gorbd.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/grmid.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/grmiregistry.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gserialver.1* && \
-  rm -f $startdir/pkg/usr/share/man/man1/gtnameserv.1* && \
+  rm -f $pkgdir/usr/bin/gappletviewer
+  rm -f $pkgdir/usr/bin/gjar
+  rm -f $pkgdir/usr/bin/gjarsigner
+  rm -f $pkgdir/usr/bin/gjavah
+  rm -f $pkgdir/usr/bin/gkeytool
+  rm -f $pkgdir/usr/bin/gnative2ascii
+  rm -f $pkgdir/usr/bin/gorbd
+  rm -f $pkgdir/usr/bin/grmic
+  rm -f $pkgdir/usr/bin/grmid
+  rm -f $pkgdir/usr/bin/grmiregistry
+  rm -f $pkgdir/usr/bin/gserialver
+  rm -f $pkgdir/usr/bin/gtnameserv
+  rm -f $pkgdir/usr/lib/logging.properties
+  rm -f $pkgdir/usr/lib/security/classpath.security
+  rm -f $pkgdir/usr/share/man/man1/gappletviewer.1*
+  rm -f $pkgdir/usr/share/man/man1/gcjh.1*
+  rm -f $pkgdir/usr/share/man/man1/gjar.1*
+  rm -f $pkgdir/usr/share/man/man1/gjarsigner.1*
+  rm -f $pkgdir/usr/share/man/man1/gjavah.1*
+  rm -f $pkgdir/usr/share/man/man1/gkeytool.1*
+  rm -f $pkgdir/usr/share/man/man1/gnative2ascii.1*
+  rm -f $pkgdir/usr/share/man/man1/gorbd.1*
+  rm -f $pkgdir/usr/share/man/man1/grmid.1*
+  rm -f $pkgdir/usr/share/man/man1/grmiregistry.1*
+  rm -f $pkgdir/usr/share/man/man1/gserialver.1*
+  rm -f $pkgdir/usr/share/man/man1/gtnameserv.1*
   rm -f $pkgdir/usr/share/info/dir
 }
diff --git a/community/enter/PKGBUILD b/community/enter/PKGBUILD
index 49b07c5f4..e74da4ff0 100644
--- a/community/enter/PKGBUILD
+++ b/community/enter/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 7949 2010-01-12 22:33:43Z dgriffiths $
+# $Id: PKGBUILD 59871 2011-12-01 13:33:05Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
 
-pkgname=enter	                       
+pkgname=enter
 pkgver=0.0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Enter is a lightweight graphical login manager for X."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://enter.sf.net"
@@ -11,12 +12,12 @@ license=('GPL')
 depends=('libxft' 'imlib2' 'xorg-server')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('47a77ae57e667f887f856c0a126d667a')
-sha1sums=('f41c31229914bd22722f5d9e6aefacf65e8c41c2')
-
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|\[xft-config\]|\[pkg-config\]|' configure.ac
+  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt"
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD
index f9207b5ff..54d44e823 100644
--- a/community/flam3/PKGBUILD
+++ b/community/flam3/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 33592 2010-11-26 06:08:59Z ebelanger $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 59890 2011-12-02 04:26:05Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=flam3
-pkgver=3.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://flam3.com/"
-license=('GPL')
+license=('GPL3')
 depends=('libjpeg' 'libpng' 'libxml2')
 options=('!libtool')
 source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('0526e476338327f718d76e6f48ddc090')
-sha1sums=('5b3317bdf51ecce7414a728c9d3735122a083b23')
+sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
-  sed -i 's|libpng12|libpng|g' flam3.pc.in
   ./configure --prefix=/usr --enable-shared
   make
 }
diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD
index 6171fed8b..1a287da02 100644
--- a/community/flickcurl/PKGBUILD
+++ b/community/flickcurl/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 48114 2011-05-28 21:04:15Z remy $
+# $Id: PKGBUILD 59867 2011-12-01 13:14:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=flickcurl
 pkgver=1.21
-pkgrel=2
+pkgrel=3
 pkgdesc="C library for the Flickr API"
 arch=(i686 x86_64 'mips64el')
 url="http://librdf.org/flickcurl/"
 license=('GPL')
-depends=(raptor)
+depends=('raptor' 'curl')
 source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz)
 md5sums=('d4d364231505dc22a6af42be7bc85edf')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|#include <curl/types.h>||' src/flickcurl_internal.h
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
index 45fa60629..6014591fd 100644
--- a/community/gnome-do/PKGBUILD
+++ b/community/gnome-do/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 51990 2011-07-18 20:45:07Z spupykin $
+# $Id: PKGBUILD 59852 2011-12-01 10:45:29Z spupykin $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Doehni <dohny@gmx.de>
 
 pkgname=gnome-do
 pkgver=0.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A launcher application for gnome (like Launchy or Katapult)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://do.davebsd.com/"
 license=('GPL3')
-depends=('ndesk-dbus-glib' 'gnome-desktop-sharp' 'mono-addins' 'gtk2' 'gnome-vfs-sharp'
-	 'gnome-keyring-sharp' 'notify-sharp-svn' 'xdg-utils' 'desktop-file-utils'
-	 'gconf-sharp' 'libgnome-sharp')
-makedepends=('intltool' 'ca-certificates')
+depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'libgnome-sharp'
+         'mono-addins' 'notify-sharp-svn' 'hicolor-icon-theme')
+makedepends=('intltool' 'ca-certificates' 'rsvg2-sharp' 'wnck-sharp')
 options=('!libtool')
 install=$pkgname.install
 source=("http://edge.launchpad.net/do/trunk/$pkgver/+download/gnome-do-$pkgver.tar.gz")
 md5sums=('71e0e653021f895f151a6f46a97f75ba')
 
 build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-  cd "${srcdir}/${pkgname}-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
+  export MONO_SHARED_DIR="$srcdir/.wabi"
+  mkdir -p "$MONO_SHARED_DIR"
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gnome-do/gnome-do.install b/community/gnome-do/gnome-do.install
index b69cc3275..407103128 100644
--- a/community/gnome-do/gnome-do.install
+++ b/community/gnome-do/gnome-do.install
@@ -1,16 +1,25 @@
+pkgname=gnome-do
+
 post_install() {
-  update-desktop-database -q
+  usr/sbin/gconfpkg --install $pkgname
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 
   echo "==> To use docky, make sure your compoisiting manager is"
   echo "==> running before launching gnome-do."
 }
 
+pre_upgrade() {
+  pre_remove $1
+}
+
 post_upgrade() {
   post_install $1
 }
 
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall $pkgname
+}
+
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index 0d987eb07..ee67ea9c8 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56777 2011-10-12 06:44:39Z ibiru $
+# $Id: PKGBUILD 59850 2011-12-01 08:07:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet-gtk
-pkgver=0.9.0pre3
-pkgrel=3
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="A frontend for GNUnet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
@@ -14,7 +14,7 @@ depends=('gnunet' 'glade' 'adns')
 makedepends=('pkgconfig')
 source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz
         drop_gtk2.patch)
-md5sums=('42f90a00aee541cef576ead682d7fb44'
+md5sums=('5df53665628889a6a12d2bc323003f8d'
          'f709c0195beffd0ca64d498be83a118b')
 
 build() {
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index 85b880cfb..436345e04 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56776 2011-10-12 06:43:47Z ibiru $
+# $Id: PKGBUILD 59848 2011-12-01 08:06:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet
-pkgver=0.9.0pre3
-pkgrel=2
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
@@ -15,10 +15,12 @@ backup=(etc/gnunetd.conf)
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz
 	gnunet.rc
-	gnunet.conf.d)
-md5sums=('34665809d6913a54547b19dcd260a951'
+	gnunet.conf.d
+	defaults.conf)
+md5sums=('e114291bbaf92de085a0ac6f2bfbe54c'
          '0d62ab7f2a28af3ac082015696ee6ef3'
-         'f161b46915736e4017e77ad735521453')
+         'f161b46915736e4017e77ad735521453'
+         '0fe23b2ca5b3fc47a0b5645e04406da0')
 
 build() {
   cd $srcdir/gnunet-$pkgver
@@ -31,6 +33,6 @@ package() {
   make DESTDIR=$pkgdir install
   install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd
   install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd
-  install -D -m0644 $srcdir/gnunet-$pkgver/contrib/defaults.conf $pkgdir/etc/gnunetd.conf
+  install -D -m0644 $srcdir/defaults.conf $pkgdir/etc/gnunetd.conf
   rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h
 }
diff --git a/community/gnunet/defaults.conf b/community/gnunet/defaults.conf
new file mode 100644
index 000000000..bb4193433
--- /dev/null
+++ b/community/gnunet/defaults.conf
@@ -0,0 +1,483 @@
+[PATHS]
+SERVICEHOME = ~/.gnunet/
+# SERVICEHOME = /var/lib/gnunet/
+# DEFAULTCONFIG = /etc/gnunet.conf
+# If 'DEFAULTCONFIG' is not defined, the current
+# configuration file is assumed to be the default,
+# which is what we want by default...
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[TESTING]
+WEAKRANDOM = NO
+# How long before failing a connection?
+CONNECT_TIMEOUT = 30
+# How many connect attempts should we make?
+CONNECT_ATTEMPTS = 3
+# How many connections can happen simultaneously?
+MAX_OUTSTANDING_CONNECTIONS = 50
+
+# Should we clean up the files on peer group shutdown?
+DELETE_FILES = YES
+
+[client]
+HOME = $SERVICEHOME
+
+[nat]
+# Are we behind NAT?
+BEHIND_NAT = NO
+
+# Is the NAT hole-punched?
+PUNCHED_NAT = NO
+
+# Enable UPNP by default?
+ENABLE_UPNP = NO
+
+# Use addresses from the local network interfaces (inluding loopback, but also others)
+USE_LOCALADDR = YES
+
+# Use address obtained from a DNS lookup of our hostname
+USE_HOSTNAME = NO
+
+# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
+# normal interface IP address for non-NATed peers; 
+# possibly auto-detected (using UPnP) if possible if not specified
+# EXTERNAL_ADDRESS = 
+
+# Should we use ICMP-based NAT traversal to try connect to NATed peers
+# or, if we are behind NAT, to allow connections to us?
+ENABLE_ICMP_CLIENT = NO
+ENABLE_ICMP_SERVER = NO
+
+# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
+# normal interface IP address for non-NATed peers; 
+# likely auto-detected (via interface list) if not specified (!)
+# INTERNAL_ADDRESS = 
+
+# Disable IPv6 support
+DISABLEV6 = NO
+
+# How often do we query the DNS resolver
+# for our hostname (to get our own IP), in ms
+HOSTNAME_DNS_FREQUENCY = 1200000
+
+# How often do we iterate over our 
+# network interfaces to check for changes
+# in our IP address? in ms
+IFC_SCAN_FREQUENCY = 3000000
+
+# How often do we query the DNS resolver
+# for our hostname (to get our own IP), in ms
+DYNDNS_FREQUENCY = 140000
+
+[gnunet-nat-server]
+HOSTNAME = gnunet.org
+PORT = 5724
+
+[transport-tcp]
+# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
+PORT = 2086
+ADVERTISED_PORT = 2086
+
+# Maximum number of open TCP connections allowed
+MAX_CONNECTIONS = 128
+
+TIMEOUT = 5000
+
+# ACCEPT_FROM =
+# ACCEPT_FROM6 =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# BINDTO =
+
+MAX_CONNECTIONS = 128
+
+
+[transport-udp]
+PORT = 2086
+
+MAX_BPS = 1000000
+
+
+[transport-http]
+PORT = 1080
+MAX_CONNECTIONS = 128
+
+[transport-https]
+PORT = 4433
+CRYPTO_INIT = NORMAL
+KEY_FILE = https.key
+CERT_FILE = https.cert
+MAX_CONNECTIONS = 128
+
+
+[transport-wlan]
+# Name of the interface in monitor mode (typically monX)
+INTERFACE = mon0
+# Real hardware, no testing
+TESTMODE = 0
+
+
+[arm]
+PORT = 2087
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-arm
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DEFAULTSERVICES = topology hostlist
+UNIXPATH = /tmp/gnunet-service-arm.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
+# GLOBAL_PREFIX =
+# USERNAME =
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
+[statistics]
+AUTOSTART = YES
+PORT = 2088
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-statistics
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-statistics.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
+[resolver]
+AUTOSTART = YES
+PORT = 2089
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-resolver
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-resolver.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = NO
+# DISABLE_SOCKET_FORWARDING = NO
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
+[peerinfo]
+AUTOSTART = YES
+PORT = 2090
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-peerinfo
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-peerinfo.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO = 
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+HOSTS = $SERVICEHOME/data/hosts/
+
+
+[transport]
+AUTOSTART = YES
+PORT = 2091
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-transport
+#PREFIX = valgrind
+NEIGHBOUR_LIMIT = 50
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+PLUGINS = tcp
+UNIXPATH = /tmp/gnunet-service-transport.sock
+BLACKLIST_FILE = $SERVICEHOME/blacklist
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
+
+# ATS options
+DUMP_MLP = NO
+DUMP_SOLUTION = NO
+DUMP_OVERWRITE = NO 
+DUMP_MIN_PEERS = 0
+DUMP_MIN_ADDRS = 0
+DUMP_OVERWRITE = NO
+ATS_MIN_INTERVAL = 15000
+ATS_EXEC_INTERVAL = 30000
+
+
+[core]
+AUTOSTART = YES
+PORT = 2092
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-core
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+# quotas are in bytes per second now!
+TOTAL_QUOTA_IN = 65536
+TOTAL_QUOTA_OUT = 65536
+UNIXPATH = /tmp/gnunet-service-core.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
+
+[topology]
+MINIMUM-FRIENDS = 0
+FRIENDS-ONLY = NO
+AUTOCONNECT = YES
+TARGET-CONNECTION-COUNT = 16
+FRIENDS = $SERVICEHOME/friends
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-topology
+
+[hostlist]
+# port for hostlist http server
+HTTPPORT = 8080
+HOME = $SERVICEHOME
+HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-hostlist
+# consider having "-e" as default as well once implemented
+OPTIONS = -b
+SERVERS = http://v9.gnunet.org:58080/
+# proxy for downloading hostlists
+HTTP-PROXY = 
+
+
+[datastore]
+AUTOSTART = YES
+UNIXPATH = /tmp/gnunet-service-datastore.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+PORT = 2093
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-datastore
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+QUOTA = 100000000
+BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
+DATABASE = sqlite
+# DISABLE_SOCKET_FORWARDING = NO
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[datastore-postgres]
+CONFIG = connect_timeout=10; dbname=gnunet
+
+[datastore-mysql]
+DATABASE = gnunet
+CONFIG = ~/.my.cnf
+# USER = gnunet
+# PASSWORD = 
+# HOST = localhost
+# PORT = 3306
+
+[datacache-mysql]
+DATABASE = gnunetcheck
+CONFIG = ~/.my.cnf
+# USER = gnunet
+# PASSWORD =
+# HOST = localhost
+# PORT = 3306
+
+
+[fs]
+AUTOSTART = YES
+INDEXDB = $SERVICEHOME/idxinfo.lst
+TRUST = $SERVICEHOME/data/credit/
+IDENTITY_DIR = $SERVICEHOME/identities/
+STATE_DIR = $SERVICEHOME/persistence/
+UPDATE_DIR = $SERVICEHOME/updates/
+PORT = 2094
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-fs
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+
+DELAY = YES
+CONTENT_CACHING = YES
+CONTENT_PUSHING = YES
+
+UNIXPATH = /tmp/gnunet-service-fs.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
+MAX_PENDING_REQUESTS = 65536
+# Maximum frequency we're allowed to poll the datastore
+# for content for migration (can be used to reduce 
+# GNUnet's disk-IO rate)
+MIN_MIGRATION_DELAY = 100
+EXPECTED_NEIGHBOUR_COUNT = 128
+
+[dht]
+AUTOSTART = YES
+PORT = 2095
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dht
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+BUCKET_SIZE = 4
+UNIXPATH = /tmp/gnunet-service-dht.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+# DO_FIND_PEER =
+# STRICT_KADEMLIA =
+# USE_MAX_HOPS =
+# MAX_HOPS =
+# REPUBLISH = YES
+# REPLICATION_FREQUENCY = 60 
+# STOP_ON_CLOSEST =
+# STOP_FOUND =
+# CONVERGE_MODIFIER =
+
+
+[dhtcache]
+DATABASE = sqlite
+QUOTA = 1024000
+
+[block]
+PLUGINS = fs dht test dns
+
+[mesh]
+AUTOSTART = YES
+PORT = 2096
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-mesh
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-mesh.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[nse]
+AUTOSTART = YES
+PORT = 2097
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-nse
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-nse-service-nse.unix
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+PROOFFILE = $SERVICEHOME/.nse-proof
+HISTOGRAM = $SERVICEHOME/nse-history.log
+
+# How 'slowly' should the proof-of-work be constructed (delay
+# between rounds in ms); sane values between 0 and ~1000.
+WORKDELAY = 5
+
+# Note: changing any of the values below will make this peer
+# completely incompatible with other peers! 
+INTERVAL = 3600000
+WORKBITS = 20
+
+
+[vpn]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-vpn
+IPV6ADDR = 1234::1
+IPV6PREFIX = 32
+IPV4ADDR = 10.11.10.1
+IPV4MASK = 255.255.0.0
+VIRTDNS = 10.11.10.2
+IFNAME = vpn-gnunet
+
+[exit]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-exit
+IPV6ADDR = 1234:1::1
+IPV6PREFIX = 32
+IPV4ADDR = 10.10.1.1
+IPV4MASK = 255.255.0.0
+IFNAME = exit-gnunet
+ENABLE_UDP = NO
+ENABLE_TCP = NO
+
+[dns]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-dns.sock
+PROVIDE_EXIT = NO
+
diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD
index dcb1b6cf7..523a163d1 100644
--- a/community/lightspark/PKGBUILD
+++ b/community/lightspark/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=lightspark
-pkgver=0.5.2.1
-pkgrel=2
+pkgver=0.5.3
+pkgrel=1
 pkgdesc='An alternative Flash Player for Linux.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://lightspark.sourceforge.net'
@@ -15,7 +15,7 @@ optdepends=('gnash-gtk: fallback support')
 install="lightspark.install"
 source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz"
         'llvm29.diff')
-md5sums=('ac2233a83e8bf0b305563bbce322cd76'
+md5sums=('2d4519c61aabc34cbba97120f5c01d18'
          '5f717d1d9ead478184ca68f6ac068099')
 
 build() {
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index b0bf25819..9421b151f 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.3
+pkgver=0.6.4
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('e9c72081c2a1141128e53f84dcba3f0e')
+md5sums=('a170bef450de365720223c3af3747bf7')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
new file mode 100644
index 000000000..1a3c77533
--- /dev/null
+++ b/community/sslh/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
+# Contributor: Jason Rodriguez <jason-aur@catloaf.net>
+
+pkgname=sslh
+pkgver=1.10
+pkgrel=3
+pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
+arch=('i686' 'x86_64')
+url='http://www.rutschle.net/tech/sslh.shtml'
+license=('GPL2')
+backup=('etc/conf.d/sslh')
+source=("http://www.rutschle.net/tech/${pkgname}-${pkgver}.tar.gz"
+        'rc.sslh'
+        'conf.sslh')
+md5sums=('bc34e9a4770d634633e70589c72708cc'
+         '1ad105ad572284fa137d06ae8d1f16fc'
+         'e9b05de9d626803e35f46bdd1e968421')
+
+build() {
+  cd $pkgname-$pkgver
+  # fix archlinux path in manpage
+  sed -i -e "s/init.d/rc.d/" sslh.pod
+  sed -i -e "s+/etc/default+/etc/conf.d+" sslh.pod
+  make
+}
+
+package() {
+  install -D -m 755 rc.sslh "${pkgdir}/etc/rc.d/sslh"
+  install -D -m 644 conf.sslh "${pkgdir}/etc/conf.d/sslh"
+  cd $pkgname-$pkgver
+  make PREFIX="$pkgdir/usr" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/conf.sslh b/community/sslh/conf.sslh
new file mode 100644
index 000000000..e49283da2
--- /dev/null
+++ b/community/sslh/conf.sslh
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+SSLH_OPTIONS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody -P /var/lock/sslh.lock'
diff --git a/community/sslh/rc.sslh b/community/sslh/rc.sslh
new file mode 100644
index 000000000..57912922c
--- /dev/null
+++ b/community/sslh/rc.sslh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sslh
+
+
+PID=$(pidof -o %PPID /usr/sbin/sslh)
+
+case "$1" in
+	start)
+		stat_busy "Starting sslh daemon"
+		[[ ! $PID ]] && /usr/sbin/sslh ${SSLH_OPTIONS} && add_daemon sslh && stat_done && exit 0
+		stat_fail
+	;;
+  stop)
+		stat_busy "Stopping sslh daemon"
+		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon sslh && stat_done && exit 0
+		stat_fail
+	;;
+  restart)
+		$0 stop
+		$0 start
+		exit 0
+	;;
+  *) 
+		echo "usage: ${0##*/} {start|stop|restart}" >&2
+	;;
+esac
+
+exit 1
+
+# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community/tdfsb/PKGBUILD b/community/tdfsb/PKGBUILD
index 63acbf48f..668abdad0 100644
--- a/community/tdfsb/PKGBUILD
+++ b/community/tdfsb/PKGBUILD
@@ -1,28 +1,35 @@
-# $Id: PKGBUILD 34698 2010-12-11 21:21:17Z giovanni $
+# $Id: PKGBUILD 59877 2011-12-01 15:19:47Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=tdfsb
 pkgver=0.0.10
-pkgrel=4
+pkgrel=5
 pkgdesc="SDL based graphical file browser"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.determinate.net/webdata/seg/tdfsb.html"
 license=('GPL')
 depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu')
-source=(http://www.determinate.net/webdata/data/${pkgname}-${pkgver}.tar.gz
-        tdfsb.desktop
-        tdfsb.png)
+source=("http://www.determinate.net/webdata/data/${pkgname}-${pkgver}.tar.gz"
+        'tdfsb.desktop'
+        'tdfsb.png')
 md5sums=('8162994a7e882dc7074a5f628d2ac076'
          '4070a7de1153c00df875384a1817e43b'
          'ecabb39597a3c17f9541300869873e50')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:g" compile.sh
-  ./compile.sh || return 1
+  ./compile.sh
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   install -D -m755 tdfsb "${pkgdir}/usr/bin/tdfsb"
+
   # Install desktop file
-  install -D -m755 ${srcdir}/tdfsb.desktop "${pkgdir}/usr/share/applications/tdfsb.desktop" || return 1
+  install -D -m755 ${srcdir}/tdfsb.desktop "${pkgdir}/usr/share/applications/tdfsb.desktop"
   # Install icon
-  install -D -m644 ${srcdir}/tdfsb.png "${pkgdir}/usr/share/pixmaps/tdfsb.png" || return 1
+  install -D -m644 ${srcdir}/tdfsb.png "${pkgdir}/usr/share/pixmaps/tdfsb.png"
 }
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index 3e826570a..0013d3c44 100644
--- a/extra/cmus/PKGBUILD
+++ b/extra/cmus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142618 2011-11-12 17:15:10Z ibiru $
+# $Id: PKGBUILD 144025 2011-12-02 04:00:48Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cmus
-pkgver=2.4.2
-pkgrel=2
+pkgver=2.4.3
+pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cmus.sourceforge.net/"
@@ -25,8 +25,7 @@ optdepends=('alsa-lib: for ALSA output plugin support'
             'flac: for flac input plugin support'
             'libmp4v2: for mp4 input plugin support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-md5sums=('f3ed7f14db20344ad7386aef48b98a4c')
-sha1sums=('12573e96e03435eca9b8a4aaeeb13a2da66f40a4')
+sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index ab1d622b7..cb1bc49a3 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -1,27 +1,32 @@
-# $Id: PKGBUILD 69820 2010-02-22 22:23:44Z giovanni $
+# $Id: PKGBUILD 144004 2011-12-01 16:22:55Z giovanni $
 # Maintainer: arjan <arjan@archlinux.org>
 # contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdnav
 pkgver=4.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The library for xine-dvdnav plugin."
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/"
-depends=('libdvdread>=4.1.3')
+depends=('libdvdread')
 options=(!libtool)
-source=(http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2
-        deadlock.patch)
+source=("http://www.mplayerhq.hu/MPlayer/releases/dvdnav-old/${pkgname}-${pkgver}.tar.bz2"
+        'deadlock.patch')
 md5sums=('d62383c45b28816771e283515f2c27fa'
          '864529165a1136ae4c1ccbc7b43cdb1a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   
-  patch -Np1 -i ${srcdir}/deadlock.patch || return 1
+  patch -Np1 -i ${srcdir}/deadlock.patch
 
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libguess/PKGBUILD b/extra/libguess/PKGBUILD
index 917b5fe70..4cd4ec315 100644
--- a/extra/libguess/PKGBUILD
+++ b/extra/libguess/PKGBUILD
@@ -1,25 +1,27 @@
+# $Id: PKGBUILD 144020 2011-12-02 00:37:26Z bisson $
+
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kemka Andrey <dr.andru@gmail.com>
 
 pkgname=libguess
-pkgver=1.0
-pkgrel=3
+pkgver=1.1
+pkgrel=1
 pkgdesc='High-speed character set detection library'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://atheme.org/project/libguess'
 license=('BSD')
 depends=('libmowgli')
-source=("http://distfiles.atheme.org/libguess-$pkgver.tgz")
-sha1sums=('b5324b4840176324576eb91d401e5f9e1322feec')
+arch=('i686' 'x86_64' 'mips64el')
+source=("http://distfiles.atheme.org/libguess-${pkgver}.tar.gz")
+sha1sums=('2760e63b71497506208f9d6269ec52f83bfc6f0b')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -D COPYING "$pkgdir"/usr/share/licenses/libguess/COPYING
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -D COPYING "${pkgdir}"/usr/share/licenses/libguess/COPYING
 }
diff --git a/extra/libiec61883/PKGBUILD b/extra/libiec61883/PKGBUILD
index d3ca8d1ce..cec337815 100644
--- a/extra/libiec61883/PKGBUILD
+++ b/extra/libiec61883/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93012 2010-10-02 21:31:27Z giovanni $
+# $Id: PKGBUILD 144006 2011-12-01 16:55:03Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,20 +6,25 @@
 
 pkgname=libiec61883
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/linux/libs/ieee1394/"
 license=('LGPL')
 depends=('libraw1394')
 options=('!libtool')
-source=(http://www.kernel.org/pub/linux/libs/ieee1394//${pkgname}-${pkgver}.tar.gz)
+source=("http://ftp.osuosl.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.gz")
 md5sums=('8af39fff74988073c3ad53fbab147da9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD
index d3f4a0512..7d4ca777a 100644
--- a/extra/libmowgli/PKGBUILD
+++ b/extra/libmowgli/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 139564 2011-10-03 13:29:22Z bisson $
+# $Id: PKGBUILD 144018 2011-12-02 00:36:56Z bisson $
+
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Brad Gordon <brad@rpgcyco.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libmowgli
-pkgver=0.9.95
+pkgver=1.0.0
 pkgrel=1
 pkgdesc='Performance and usability-oriented extensions to C'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://www.atheme.org/project/mowgli'
 license=('custom')
 depends=('glibc')
-source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2")
-sha1sums=('50d32d4d84f2438382c203bd7c85adc976683c25')
+arch=('i686' 'x86_64' 'mips64el')
+source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('403473582e3086c1acaafed59b9915f29a5d0ce0')
 
 build() {
-	cd "${srcdir}/libmowgli-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "${srcdir}/libmowgli-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmowgli/COPYING"
+	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/libunique/PKGBUILD b/extra/libunique/PKGBUILD
index a03262a99..6beff607b 100644
--- a/extra/libunique/PKGBUILD
+++ b/extra/libunique/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 109868 2011-02-13 14:14:02Z heftig $
+# $Id: PKGBUILD 143972 2011-12-01 07:46:29Z ibiru $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 pkgname=libunique
 pkgver=1.1.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for writing single instance applications"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -11,13 +11,16 @@ makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 url="http://live.gnome.org/LibUnique"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.1/${pkgname}-${pkgver}.tar.bz2
-        unique-gdbus.patch)
+        unique-gdbus.patch
+        remove_G_CONST_RETURN.patch)
 sha256sums=('e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb'
-            'bf99ddbf9104502ea498a6812ec2d700f61f4dbbaa2471cd52174b0b27070769')
+            'bf99ddbf9104502ea498a6812ec2d700f61f4dbbaa2471cd52174b0b27070769'
+            '194ebfcc4c9297c44bbcfe5d45474310983121cdad881b72265d79cf4ec44235')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/unique-gdbus.patch"
+  patch -Np1 -i "${srcdir}/remove_G_CONST_RETURN.patch"
   autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
diff --git a/extra/libunique/remove_G_CONST_RETURN.patch b/extra/libunique/remove_G_CONST_RETURN.patch
new file mode 100644
index 000000000..7c70ba0c9
--- /dev/null
+++ b/extra/libunique/remove_G_CONST_RETURN.patch
@@ -0,0 +1,117 @@
+diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c libunique-1.1.6/unique/uniqueapp.c
+--- libunique-1.1.6.orig/unique/uniqueapp.c	2011-12-01 07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniqueapp.c	2011-12-01 07:39:59.132319788 +0000
+@@ -781,7 +781,7 @@
+ }
+ 
+ 
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_command_to_string (UniqueApp *app,
+                           gint       command)
+ {
+@@ -863,7 +863,7 @@
+   return retval;
+ }
+ 
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_response_to_string (UniqueResponse response)
+ {
+   GEnumClass *enum_class;
+diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c libunique-1.1.6/unique/uniquebackend.c
+--- libunique-1.1.6.orig/unique/uniquebackend.c	2011-12-01 07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquebackend.c	2011-12-01 07:39:24.418677950 +0000
+@@ -111,7 +111,7 @@
+  *
+  * Return value: FIXME
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_name (UniqueBackend *backend)
+ {
+   g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+@@ -154,7 +154,7 @@
+  *
+  * Return value: FIXME
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_startup_id (UniqueBackend *backend)
+ {
+   g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h libunique-1.1.6/unique/uniquebackend.h
+--- libunique-1.1.6.orig/unique/uniquebackend.h	2011-12-01 07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquebackend.h	2011-12-01 07:42:13.833467492 +0000
+@@ -94,10 +94,10 @@
+ 
+ UniqueBackend *       unique_backend_create         (void);
+ 
+-G_CONST_RETURN gchar *unique_backend_get_name       (UniqueBackend     *backend);
++const gchar *unique_backend_get_name       (UniqueBackend     *backend);
+ void                  unique_backend_set_name       (UniqueBackend     *backend,
+                                                      const gchar       *name);
+-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend     *backend);
++const gchar *unique_backend_get_startup_id (UniqueBackend     *backend);
+ void                  unique_backend_set_startup_id (UniqueBackend     *backend,
+                                                      const gchar       *startup_id);
+ GdkScreen *           unique_backend_get_screen     (UniqueBackend     *backend);
+diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h libunique-1.1.6/unique/uniqueinternals.h
+--- libunique-1.1.6.orig/unique/uniqueinternals.h	2011-12-01 07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniqueinternals.h	2011-12-01 07:41:17.142977914 +0000
+@@ -44,11 +44,11 @@
+  * and then back into an id
+  */
+ UniqueResponse        unique_response_from_string  (const gchar    *response);
+-G_CONST_RETURN gchar *unique_response_to_string    (UniqueResponse  response);
++const gchar *unique_response_to_string    (UniqueResponse  response);
+ 
+ gint                  unique_command_from_string   (UniqueApp      *app,
+                                                     const gchar    *command);
+-G_CONST_RETURN gchar *unique_command_to_string     (UniqueApp      *app,
++const gchar *unique_command_to_string     (UniqueApp      *app,
+                                                     gint            command);
+ 
+ G_END_DECLS
+diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c libunique-1.1.6/unique/uniquemessage.c
+--- libunique-1.1.6.orig/unique/uniquemessage.c	2011-12-01 07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquemessage.c	2011-12-01 07:41:45.743225713 +0000
+@@ -185,7 +185,7 @@
+  *
+  * Since: 1.0.2
+  */
+-G_CONST_RETURN guchar *
++const guchar *
+ unique_message_data_get (UniqueMessageData *message_data,
+                          gsize             *length)
+ {
+@@ -525,7 +525,7 @@
+  *   owned by the #UniqueMessageData structure and should not be
+  *   modified or freed
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_message_data_get_startup_id (UniqueMessageData *message_data)
+ {
+   g_return_val_if_fail (message_data != NULL, NULL);
+diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h libunique-1.1.6/unique/uniquemessage.h
+--- libunique-1.1.6.orig/unique/uniquemessage.h	2011-12-01 07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquemessage.h	2011-12-01 07:40:47.576064565 +0000
+@@ -48,7 +48,7 @@
+ void                   unique_message_data_set            (UniqueMessageData *message_data,
+                                                            const guchar      *data,
+                                                            gsize              length);
+-G_CONST_RETURN guchar *unique_message_data_get            (UniqueMessageData *message_data,
++const guchar *unique_message_data_get            (UniqueMessageData *message_data,
+                                                            gsize             *length);
+ 
+ gboolean               unique_message_data_set_text       (UniqueMessageData *message_data,
+@@ -63,7 +63,7 @@
+ gchar *                unique_message_data_get_filename   (UniqueMessageData *message_data);
+ 
+ GdkScreen *            unique_message_data_get_screen     (UniqueMessageData *message_data);
+-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
++const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
+ guint                  unique_message_data_get_workspace  (UniqueMessageData *message_data);
+ 
+ G_END_DECLS
diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD
index 33fb57a58..1008137cc 100644
--- a/extra/perl-netaddr-ip/PKGBUILD
+++ b/extra/perl-netaddr-ip/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 125270 2011-05-25 19:19:11Z foutrelis $
-# Maintainer: Dale Blount <dale@archlinux.org>
+# $Id: PKGBUILD 143974 2011-12-01 07:52:54Z andrea $
+# Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org>
 
 pkgname=perl-netaddr-ip
 _realname=NetAddr-IP
-pkgver=4.037
-pkgrel=2
+pkgver=4.058
+pkgrel=1
 pkgdesc="Perl module to manage IP addresses and subnets"
 arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic' 'GPL')
-depends=('perl>=5.10.0')
-options=(!emptydirs)
+depends=('perl')
+options=('!emptydirs')
 url="http://search.cpan.org/dist/${_realname}/"
 source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz)
-md5sums=('d966eac6b5941af3f7c1fad839569cb4')
+md5sums=('8829958dd84a8b36e3cd10347564739d')
 
 build() {
   cd ${srcdir}/${_realname}-${pkgver}
   # install module in vendor directories.
   perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+check() {
+  cd ${srcdir}/${_realname}-${pkgver}
   make test
 }
 
 package() {
   cd ${srcdir}/${_realname}-${pkgver}
-  make install DESTDIR=${pkgdir}
+  make DESTDIR=${pkgdir} install
 
   # remove perllocal.pod and .packlist
   find ${pkgdir} -name perllocal.pod -delete
diff --git a/extra/physfs/PKGBUILD b/extra/physfs/PKGBUILD
index e68e4141b..d32550c62 100644
--- a/extra/physfs/PKGBUILD
+++ b/extra/physfs/PKGBUILD
@@ -3,22 +3,25 @@
 
 pkgname=physfs
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to provide abstract access to various archives"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/physfs/"
 license=('ZLIB')
-depends=('zlib' 'readline')
+depends=('zlib')
 makedepends=('cmake' 'doxygen')
+options=('!makeflags')
 source=(http://icculus.org/physfs/downloads/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4e8927c3d30279b03e2592106eb9184a')
 sha1sums=('2d3d3cc819ad26542d34451f44050b85635344d0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's/-Werror//' CMakeLists.txt
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
   export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DPHYSFS_BUILD_TEST=OFF -DPHYSFS_BUILD_WX_TEST=OFF
+  cmake . -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPHYSFS_BUILD_TEST=OFF -DPHYSFS_BUILD_WX_TEST=OFF
   make all docs
 }
 
diff --git a/extra/raptor1/PKGBUILD b/extra/raptor1/PKGBUILD
index c8cf6aa7b..085809cc9 100644
--- a/extra/raptor1/PKGBUILD
+++ b/extra/raptor1/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 110599 2011-02-20 15:52:07Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# $Id: PKGBUILD 144014 2011-12-01 20:20:30Z andrea $
+# Maintainer:
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor1
 pkgver=1.4.21
-pkgrel=3
+pkgrel=4
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://librdf.org/raptor"
-depends=('libxml2' 'curl' 'zlib' 'libxslt')
+depends=('curl' 'libxslt')
 license=('LGPL')
 options=('!libtool' '!docs')
-source=(http://librdf.org/dist/source/raptor-$pkgver.tar.gz)
-md5sums=('992061488af7a9e2d933df6b694bb876')
+source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz"
+        'curl.patch')
+md5sums=('992061488af7a9e2d933df6b694bb876'
+         '8fe28761645d6a6607b25c94f9ada964')
 
 build() {
-  cd ${srcdir}/raptor-${pkgver}
-  ./configure --prefix=/usr --disable-static
+  cd "${srcdir}"/raptor-${pkgver}
+  patch -p1 -i "${srcdir}"/curl.patch
+
+  ./configure --prefix=/usr \
+    --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/raptor-${pkgver}
-  make prefix=${pkgdir}/usr install
+  cd "${srcdir}/raptor-${pkgver}"
+  make prefix="${pkgdir}"/usr install
   
-  mv ${pkgdir}/usr/bin/rapper ${pkgdir}/usr/bin/rapperV1
-  rm -f ${pkgdir}/usr/share/man/man1/rapper.1
+  mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1
+  rm -f "${pkgdir}"/usr/share/man/man1/rapper.1
 }
diff --git a/extra/raptor1/curl.patch b/extra/raptor1/curl.patch
new file mode 100644
index 000000000..590140536
--- /dev/null
+++ b/extra/raptor1/curl.patch
@@ -0,0 +1,11 @@
+diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
+--- raptor-1.4.21/src/raptor_internal.h.curl	2010-01-29 17:54:42.000000000 -0600
++++ raptor-1.4.21/src/raptor_internal.h	2011-07-31 11:02:44.182465296 -0500
+@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
+ 
+ #ifdef RAPTOR_WWW_LIBCURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+ 
diff --git a/extra/srm/PKGBUILD b/extra/srm/PKGBUILD
index d35fb4531..1ca84e154 100644
--- a/extra/srm/PKGBUILD
+++ b/extra/srm/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 100939 2010-11-26 19:52:12Z giovanni $
+# $Id: PKGBUILD 143982 2011-12-01 15:00:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=srm
 pkgver=1.2.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A secure replacement for rm(1) that overwrites data before unlinking"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://srm.sourceforge.net/"
 license=('custom')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('ee8269be18de6bbd3f74252d6e3039fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
-  make || return 1
-  make prefix="${pkgdir}/usr" install || return 1
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/srm/LICENSE" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make prefix="${pkgdir}/usr" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/srm/LICENSE"
 }
diff --git a/extra/sshfs/PKGBUILD b/extra/sshfs/PKGBUILD
index 64231d518..f12852bee 100644
--- a/extra/sshfs/PKGBUILD
+++ b/extra/sshfs/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 131653 2011-07-13 12:06:33Z giovanni $
+# $Id: PKGBUILD 143984 2011-12-01 15:06:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=sshfs
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="FUSE client based on the SSH File Transfer Protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fuse.sourceforge.net/sshfs.html"
 license=('GPL')
 depends=('fuse' 'glib2' 'openssh')
-makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/fuse/${pkgname}-fuse-${pkgver}.tar.gz)
+makedepends=('pkg-config')
+source=("http://downloads.sourceforge.net/sourceforge/fuse/${pkgname}-fuse-${pkgver}.tar.gz")
 md5sums=('f72f12fda186dbd92382f70d25662ed3')
 
 build() {
diff --git a/extra/strace/PKGBUILD b/extra/strace/PKGBUILD
index 44e774b28..3ccdc693e 100644
--- a/extra/strace/PKGBUILD
+++ b/extra/strace/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 115123 2011-03-17 01:51:59Z giovanni $
+# $Id: PKGBUILD 143986 2011-12-01 15:13:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=strace
 pkgver=4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A useful diagnositic, instructional, and debugging tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/strace/"
 license=('custom')
 depends=('perl')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz")
 md5sums=('e537b2b1afeec70c0e6e27a0d0fd671e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" install
 
-  install -Dm644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  make DESTDIR="${pkgdir}/" install
+  install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/tree/PKGBUILD b/extra/tree/PKGBUILD
index 9ae90de60..82294e718 100644
--- a/extra/tree/PKGBUILD
+++ b/extra/tree/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129903 2011-06-29 17:46:59Z giovanni $
+# $Id: PKGBUILD 143988 2011-12-01 15:23:36Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=tree
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A directory listing program displaying a depth indented list of files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mama.indstate.edu/users/ice/tree/"
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
index 824887a2c..f8f794675 100644
--- a/extra/usbview/PKGBUILD
+++ b/extra/usbview/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 68125 2010-02-10 20:30:36Z giovanni $
+# $Id: PKGBUILD 143990 2011-12-01 15:29:15Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=usbview
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="USB Viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kroah.com/linux-usb/"
 license=('GPL')
 depends=('gtk2')
-makedepends=('pkgconfig')
-source=(http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz)
+makedepends=('pkg-config')
+source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz")
 md5sums=('8bf5e66351156356f3ad07454123affa')
 
 build() {
@@ -20,8 +20,13 @@ build() {
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
 	      --localstatedir=/var
-  make || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make prefix="${pkgdir}/usr" \
        sysconfdir="${pkgdir}/etc" \
-       localstatedir="${pkgdir}/var" install || return 1
+       localstatedir="${pkgdir}/var" install
 }
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 5ac96556b..e7ff01c5e 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 134333 2011-08-02 23:08:23Z giovanni $
+# $Id: PKGBUILD 143992 2011-12-01 15:40:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vice
 pkgver=2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A Versatile Commodore Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.viceteam.org/"
-depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 'libxv' 'libjpeg' 'libpng' 'libxaw' 
-'libxxf86vm')
+depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 
+         'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
 makedepends=('xorg-font-utils')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz
-        vice-2.3-x11video.patch)
+source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
+        'vice-2.3-x11video.patch')
 md5sums=('b48d137874daad50c087a0686cbdde34'
          '088292ce9efe785edfb2b0c7c670785e')
 
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 09e7c3a69..144e12ccc 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141059 2011-10-22 19:05:29Z giovanni $
+# $Id: PKGBUILD 143994 2011-12-01 15:45:52Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
 pkgver=0.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index ac95cae6c..727038a39 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141085 2011-10-23 14:30:06Z giovanni $
+# $Id: PKGBUILD 143998 2011-12-01 15:53:42Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.12
+pkgver=5.0.13
 pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libidn')
 makedepends=('perl')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.gz")
-md5sums=('1147b6a993af384ba341cb91666c7e97')
+md5sums=('1c703fa6ddc2f41ae94efc7c8bfc794d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index 613d13d0f..569da6710 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 122945 2011-05-07 11:59:58Z giovanni $
+# $Id: PKGBUILD 144000 2011-12-01 15:58:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=xchm
 pkgver=1.20
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://xchm.sourceforge.net"
+url="http://xchm.sourceforge.net/"
 license=('GPL')
 depends=('chmlib' 'wxgtk' 'desktop-file-utils')
 install=xchm.install
-source=(http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz
-        xchm.desktop
-        xchm.xml)
+source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
+        'xchm.desktop'
+        'xchm.xml')
 md5sums=('85943645d20af536704a20b58ebd5849'
          '31fb9692b9ee9f2a205f58b9ff4bc4fe'
          '4102b0a393f5c60236143cc034664dd0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
   ./configure --prefix=/usr \
               --build=$CHOST \
@@ -28,6 +29,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
   install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml"
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index dbbbbf2a7..8301002d9 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 133999 2011-07-31 15:01:38Z giovanni $
+# $Id: PKGBUILD 144002 2011-12-01 16:02:56Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=xmlto
 pkgver=0.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Convert xml to many other formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyberelk.net/tim/software/xmlto/"
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 772e15b24..146d349d1 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.1.2-1-LIBRE
+KERNEL_VERSION=3.1.4-1-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch
index 79be53afb..880849db5 100644
--- a/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch
+++ b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch
@@ -38,4 +38,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			continue;
  
  		disk_stack_limits(mddev->gendisk, rdev->bdev,
-
diff --git a/testing/audiofile/PKGBUILD b/testing/audiofile/PKGBUILD
new file mode 100644
index 000000000..85cf1347b
--- /dev/null
+++ b/testing/audiofile/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 144016 2011-12-01 21:44:40Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=audiofile
+pkgver=0.3.2
+pkgrel=1
+pkgdesc="Silicon Graphics Audio File Library"
+arch=('i686' 'x86_64')
+url="http://www.68k.org/~michael/audiofile/"
+license=('LGPL')
+depends=('gcc-libs' 'alsa-lib')
+options=('!libtool')
+source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz")
+md5sums=('cb2c4fe6e899e688ffe5d1568581cb63')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-12-03 19:44:19 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-12-03 19:44:19 -0300
commit	5f03f36a1327a1c1ade065b89ec2ad873b708a0d (patch)
tree	0bbfab5010c0318a1faa46d5897fd831e0e4d60c
parent	1ac43f3f1d47a56bbc1564ae7d2fd0869f345b6c (diff)
parent	8eed59114cbcf729b65f87d3f73530f6c8363d20 (diff)