Fri Dec 2 23:14:59 UTC 2011

21 files changed, 277 insertions, 108 deletions

diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index b3fe7427e..e5573747c 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')
 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 a593b3a71..a4b703403 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)
+arch=('i686' 'x86_64')
 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 ff26ce9a1..ff92396a1 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')
 url='http://atheme.org/project/libguess'
 license=('BSD')
 depends=('libmowgli')
-source=("http://distfiles.atheme.org/libguess-$pkgver.tgz")
-sha1sums=('b5324b4840176324576eb91d401e5f9e1322feec')
+arch=('i686' 'x86_64')
+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 468cd762f..cd00382cc 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')
 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 c9b11d1c0..7cce17917 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')
 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')
+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 8bd45f129..a3a50c67c 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')
 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 fa6549515..859379449 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)
 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 0f1c90102..e6c9575c6 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')
 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 c50886bde..2f579874c 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')
 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 8609ada5b..3ca27ff05 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')
 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 7f3d85374..5feb4da37 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')
 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 93923b007..ab50710c8 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')
 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 5c4567cae..b718ec3ed 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')
 url="http://mama.indstate.edu/users/ice/tree/"
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
index 84dc43232..093b7007d 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')
 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 ee8b413f4..316933b34 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')
 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 ad9966358..a8c893f44 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')
 url="http://www.weechat.org/"
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index fcbf0fc9f..a6423691b 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')
@@ -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 6c76cc559..938ef597b 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')
-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
   make
@@ -26,6 +27,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 b83953432..9d3713ff3 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')
 url="http://cyberelk.net/tim/software/xmlto/"