Mon Feb 6 23:14:50 UTC 2012

249 files changed, 4944 insertions, 1454 deletions

diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
index 2bb71bb52..b02d1bc68 100644
--- a/extra/abiword/PKGBUILD
+++ b/extra/abiword/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 139550 2011-10-03 12:22:58Z jgc $
+# $Id: PKGBUILD 148668 2012-02-05 11:46:18Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maël Lavault <moimael@neuf.fr>
 
 pkgbase=abiword
 pkgname=('abiword' 'abiword-plugins')
 pkgver=2.8.6
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup')
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 
+             'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup')
 options=('!makeflags' '!libtool')
 source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz"
-        compat_libwpg_0_9.patch
-	abiword-2.8.6-no-undefined.patch)
-sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df'
-          'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea'
-          '159b1cd0b9354868ab86f851b64a03dae7d254dc')
+        'compat_libwpg_0_9.patch'
+	'abiword-2.8.6-no-undefined.patch'
+        'abiword-2.8.6-libpng15.patch')
+md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
+         '09446a2ebba8288fc611e88f7cf17298'
+         '42e2614b6e0aad457d91f6ce20b6f225'
+         '40e370e7e88c5437140ef18037abfbd3')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -24,10 +27,23 @@ build() {
   patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
   # fix a gcc 4.6.x build issue, patch from Fedora
   patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
+  patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
+
   libtoolize --force
   autoreconf
 
-  ./configure --prefix=/usr --enable-clipart --enable-templates --enable-collab-backend-xmpp --enable-collab-backend-tcp --enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins --without-gnomevfs --with-gio --with-goffice --disable-static --with-psiconv-config=/nothere
+  ./configure --prefix=/usr \
+              --enable-clipart \
+              --enable-templates \
+              --enable-collab-backend-xmpp \
+              --enable-collab-backend-tcp \
+              --enable-collab-backend-service \
+              --disable-collab-backend-sugar \
+              --enable-plugins --without-gnomevfs \
+              --with-gio \
+              --with-goffice \
+              --disable-static \
+              --with-psiconv-config=/nothere
   make
 }
 
@@ -54,7 +70,8 @@ package_abiword() {
 
 package_abiword-plugins() {
   pkgdesc="Additional plugins for Abiword"
-  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
+  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
+           'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
   for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
diff --git a/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch
new file mode 100644
index 000000000..7eded4c83
--- /dev/null
+++ b/extra/abiword/abiword-2.8.6-libpng15.patch
@@ -0,0 +1,100 @@
+$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
+
+Fix build with png-1.5.
+
+--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
++++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
+@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
+ 
+ 	/* Clean Up Memory Used */
+ 		
+-	FREEP(m_pPNGInfo->palette);
++	png_colorp palette;
++	int num_palette;
++	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
++	FREEP(palette);
+ 	DELETEP(pBB);
+ 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+    
+@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
+ 	{
+ 		/* Reset error handling for libpng */
+-		if (setjmp(m_pPNG->jmpbuf))
++		if (setjmp(png_jmpbuf(m_pPNG)))
+ 		{
+ 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 			return UT_ERROR;
+@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
+ {
+ 	/* Reset error handling for libpng */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 		return UT_ERROR;
+
+$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
+
+Fix build with png-1.5.
+
+--- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
++++ plugins/garble/xp/abiword-garble-png.cpp
+@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
+ 		png_set_strip_alpha( png_ptr );
+ 		png_set_interlace_handling( png_ptr );
+ 		png_set_bgr( png_ptr );
+-		rowbytes = info_ptr->rowbytes;
++		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
+ 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
+ 	}
+ 
+$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
+@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
+ /** needed for the stejmp context */
+ UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
+ {
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		DELETEP(m_pPngBB);
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
++++ src/af/util/xp/ut_png.cpp
+@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD
index 33832c165..45add6b74 100644
--- a/extra/abook/PKGBUILD
+++ b/extra/abook/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110746 2011-02-22 00:31:00Z bisson $
+# $Id: PKGBUILD 149024 2012-02-05 14:23:12Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,7 +6,7 @@
 
 pkgname=abook
 pkgver=0.6.0pre2
-pkgrel=3
+pkgrel=4
 pkgdesc='Text-based addressbook designed for use with Mutt'
 arch=('i686' 'x86_64')
 url='http://abook.sourceforge.net/'
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
index 9903edb53..ed8cbd042 100644
--- a/extra/allegro/PKGBUILD
+++ b/extra/allegro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142269 2011-11-07 18:27:05Z eric $
+# $Id: PKGBUILD 148670 2012-02-05 11:46:21Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
 pkgver=5.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
 arch=('i686' 'x86_64')
 url="http://alleg.sourceforge.net/"
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index ed5a8b546..b403b8d80 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134328 2011-08-02 22:50:41Z eric $
+# $Id: PKGBUILD 148672 2012-02-05 11:46:26Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=alsaplayer
 pkgver=0.99.81
-pkgrel=2
+pkgrel=3
 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
 arch=('i686' 'x86_64')
 url="http://www.alsaplayer.org/"
@@ -23,7 +23,6 @@ optdepends=('gtk2: for the gtk2 GUI interface' \
 options=('!libtool')
 install=alsaplayer.install
 source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('845c53975791ba342e316ceac8aa1527')
 sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd')
 
 build() {
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 3eba571f9..28da6c0db 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146505 2012-01-12 07:55:40Z giovanni $
+# $Id: PKGBUILD 148674 2012-02-05 11:46:28Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=amule
 pkgver=10708
-pkgrel=1
+pkgrel=2
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD
index c38e8ba48..62e0ba805 100644
--- a/extra/anthy/PKGBUILD
+++ b/extra/anthy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111076 2011-02-23 21:51:47Z bisson $
+# $Id: PKGBUILD 149031 2012-02-05 15:01:58Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=anthy
 pkgver=9100h
 _filecode=37536
-pkgrel=2
+pkgrel=3
 pkgdesc='Hiragana text to Kana Kanji mixed text Japanese input method'
 arch=('i686' 'x86_64')
 url='http://sourceforge.jp/projects/anthy/'
diff --git a/extra/at-spi/PKGBUILD b/extra/at-spi/PKGBUILD
index 0970c90f4..c42990c8f 100644
--- a/extra/at-spi/PKGBUILD
+++ b/extra/at-spi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120762 2011-04-26 14:25:06Z ibiru $
+# $Id: PKGBUILD 148676 2012-02-05 11:46:33Z ibiru $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=at-spi
 pkgver=1.32.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Assistive Technology Service Provider Interface"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,6 +15,8 @@ install=at-spi.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039')
 
+# !! make sure you 'pacman -Rsc python' from your chroot before building the package or it would use python3 instead of the wanted python2 !!
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD
index a6f7bc58d..4e1309042 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 122082 2011-05-02 06:05:33Z andrea $
+# $Id: PKGBUILD 149006 2012-02-05 13:49:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=automoc4
 pkgver=0.9.88
-pkgrel=2
+pkgrel=3
 pkgdesc="Automatic moc for Qt4"
 arch=('i686' 'x86_64')
-url='http://www.kde.org'
+url='http://www.kde.org/'
 license=('custom')
 depends=('qt')
 makedepends=('pkgconfig' 'cmake')
diff --git a/extra/autopano-sift-c/PKGBUILD b/extra/autopano-sift-c/PKGBUILD
index 35a5d7fdc..f3708cb4a 100644
--- a/extra/autopano-sift-c/PKGBUILD
+++ b/extra/autopano-sift-c/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 96768 2010-10-24 16:49:43Z ibiru $
+# $Id: PKGBUILD 148678 2012-02-05 11:46:36Z ibiru $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=autopano-sift-c
 pkgver=2.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Identify key feature points within arbitrary images"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/"
 license=('GPL2')
-depends=('libxml2' 'libpano13>=2.9.17' 'gcc-libs')
+depends=('libxml2' 'libpano13' 'gcc-libs')
 makedepends=('cmake')
 provides=('autopano-sift')
 conflicts=('autopano-sift')
@@ -20,8 +20,12 @@ md5sums=('b9bade07e8c4f2ea383c22a082c260e0')
 
 build() {
   cd "${srcdir}/autopano-sift-C-${pkgver}"
-
   cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt
   make
-  make DESTDIR=${pkgdir} install
+}
+
+package() {
+  cd "${srcdir}/autopano-sift-C-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 1d5f9ccc9..4b3221af6 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143808 2011-11-29 13:33:28Z stephane $
+# $Id: PKGBUILD 148680 2012-02-05 11:46:41Z ibiru $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=6
+pkgrel=7
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD
index 50bbb6257..0cf018e71 100644
--- a/extra/bmp/PKGBUILD
+++ b/extra/bmp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135355 2011-08-13 06:32:50Z eric $
+# $Id: PKGBUILD 148682 2012-02-05 11:46:44Z ibiru $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=bmp
 pkgver=0.9.7.1
-pkgrel=8
+pkgrel=9
 pkgdesc="gtk2 port of xmms"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/beepmp/"
@@ -23,7 +23,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 -i ../${pkgver}-visualization.patch 
   patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch 
-  ./configure --prefix=/usr --mandir=/usr/share/man 
+  LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man 
   make 
 }
 
diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD
index ac8f2a431..949f42453 100644
--- a/extra/cagibi/PKGBUILD
+++ b/extra/cagibi/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 123124 2011-05-08 20:39:38Z andrea $
+# $Id: PKGBUILD 149009 2012-02-05 13:59:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=cagibi
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)'
 arch=('i686' 'x86_64')
-url='http://www.kde.org'
+url='http://www.kde.org/'
 license=('LGPL')
 depends=('qt')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 9c80110a0..218ab470a 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 114393 2011-03-13 08:22:31Z andyrtr $
+# $Id: PKGBUILD 148684 2012-02-05 11:46:48Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.18.4' 'glib2>=2.24.0' 'sh')
-makedepends=('pkgconfig')
+depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
         cairo-1.10.0-buggy_gradients.patch)
 sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
           '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
@@ -26,10 +25,14 @@ build() {
 	--disable-static \
 	--enable-tee
   make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
   make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD
index 8bd23555e..be012872e 100644
--- a/extra/cairomm/PKGBUILD
+++ b/extra/cairomm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124057 2011-05-16 10:35:03Z jgc $
+# $Id: PKGBUILD 148686 2012-02-05 11:46:52Z ibiru $
 # Maintainer: Kevin <kevin@archlinux.org>
 # Contributor: criminy <criminy@gmail.com>
 
 pkgname=cairomm
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ bindings to Cairo vector graphics library"
 arch=('i686' 'x86_64')
 url="http://www.cairographics.org"
diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD
index 039ea496d..88ac314e4 100644
--- a/extra/capi4hylafax/PKGBUILD
+++ b/extra/capi4hylafax/PKGBUILD
@@ -1,49 +1,55 @@
-# $Id: PKGBUILD 84286 2010-06-28 14:07:57Z tpowa $
+# $Id: PKGBUILD 148688 2012-02-05 11:46:56Z ibiru $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capi4hylafax
 pkgver=010300
-pkgrel=4
+pkgrel=5
 pkgdesc="capi plugin for hylafax to enable isdn faxing"
 arch=(i686 x86_64)
 url="ftp://ftp.avm.de/tools"
 license=('GPL')
-depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff')
+depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
 source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
 	config.faxCAPI capi4hylafax.rc)
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         '1fe40c58289fa3ba625ce6fe2fdb3d07')
 install=capi4hylafax.install
 backup=(var/spool/hylafax/etc/config.faxCAPI)
+
 build() {
-  cd $srcdir/$pkgname-01.03.00
+  cd "$srcdir"/$pkgname-01.03.00
 # fix config file
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in || return 1
-  ./configure || return 1
-  make || return 1
-  install -m755 -D src/faxsend/c2faxsend $pkgdir/usr/bin/c2faxsend
-  install -m755 -D src/faxrecv/c2faxrecv $pkgdir/usr/bin/c2faxrecv
-  install -m755 -D setupconffile $pkgdir/usr/bin/c2faxaddmodem
-  install -m644 -D $srcdir/config.faxCAPI $pkgdir/var/spool/hylafax/etc/config.faxCAPI
-  install -m755 -D $srcdir/capi4hylafax.rc $pkgdir/etc/rc.d/capi4hylafax
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
+  autoreconf --force --install
+  ./configure
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-01.03.00
+  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
+  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
+  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
+  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
+  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
 # adding FIFO
-  mkfifo $pkgdir/var/spool/hylafax/FIFO.faxCAPI
-  chown 10 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
-  chgrp 14 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
-  chmod 0600 $pkgdir/var/spool/hylafax/FIFO.faxCAPI
+  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
 # fix /var/spool/hylafax permission
-  chown 10 $pkgdir/var/spool/hylafax
-  chgrp 14 $pkgdir/var/spool/hylafax
+  chown 10 "$pkgdir"/var/spool/hylafax
+  chgrp 14 "$pkgdir"/var/spool/hylafax
 # adding udev rule
-  mkdir -p $pkgdir/lib/udev/rules.d
-cat << EOF >> $pkgdir/lib/udev/rules.d/53-capi4hylafax.rules
+  mkdir -p "$pkgdir"/lib/udev/rules.d
+cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
 # CAPI devices
 SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
 SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
 
 EOF
 # fix c2faxadd
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' $pkgdir/usr/bin/c2faxaddmodem || return 1
-  echo "main_config_dialog" >>  $pkgdir/usr/bin/c2faxaddmodem
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
+  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
 }
-md5sums=('d37dc652ac80d1525ef8693be55ee67f'
-         '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07')
diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD
index 702e3e05f..47608a909 100644
--- a/extra/celestia/PKGBUILD
+++ b/extra/celestia/PKGBUILD
@@ -1,38 +1,50 @@
-# $Id: PKGBUILD 127269 2011-06-12 08:43:30Z ronald $
+# $Id: PKGBUILD 148690 2012-02-05 11:47:02Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=celestia
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Real-time space simulation"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.shatters.net/celestia/"
 depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz
-	celestia-1.5.1-gcc44.patch celestia-1.6.1-gentoo.patch)
+source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
+        'celestia-1.6.1-gcc46.patch' 
+        'celestia-1.6.1-libpng15.patch'
+        'celestia-1.6.1-linking.patch')
 sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
-          '5ab2769e239a89468bb8ffb5740cbeec6018143c'
-          'aebf894630fdba4c4d429622f5e2b8da56d8b61e')
+          '7c08ca391603806d788cb8f3342acedafc924eef'
+          '46ecc4e10b24191384bc848c206652498843adf0'
+          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
 
     # build patch
-    patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch
-    patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.patch
+    patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
+    patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
+    patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
 
+    # This version of Celestia has a bug in the font rendering and requires -fsigned-char 
+    export CFLAGS="$CFLAGS -fsigned-char"
+    export CXXFLAGS="$CXXFLAGS -fsigned-char"
+
+    autoreconf
     ./configure --prefix=/usr \
                 --with-lua=/usr \
 		--datadir=/usr/share \
-                --with-gtk
+                --with-gtk \
+                --disable-rpath \
+                --with-lua
     make
 }
 
 package() {
     cd ${srcdir}/${pkgname}-${pkgver}
+
     make DESTDIR=${pkgdir} install
 }
 
diff --git a/extra/celestia/celestia-1.6.1-gcc46.patch b/extra/celestia/celestia-1.6.1-gcc46.patch
new file mode 100644
index 000000000..ddf4036f2
--- /dev/null
+++ b/extra/celestia/celestia-1.6.1-gcc46.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+
+Patch written by Nils Larsson <ni1s@nerdshack.com>
+--- src/celengine/frametree.h
++++ src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class Star;
+ class Body;
diff --git a/extra/celestia/celestia-1.6.1-libpng15.patch b/extra/celestia/celestia-1.6.1-libpng15.patch
new file mode 100644
index 000000000..5dffbab24
--- /dev/null
+++ b/extra/celestia/celestia-1.6.1-libpng15.patch
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+ 
++// Z_BEST_COMPRESSION
++#include <zlib.h>
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/extra/celestia/celestia-1.6.1-linking.patch b/extra/celestia/celestia-1.6.1-linking.patch
new file mode 100644
index 000000000..d610d5243
--- /dev/null
+++ b/extra/celestia/celestia-1.6.1-linking.patch
@@ -0,0 +1,54 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+
+--- a/src/celestia/Makefile.am
++++ b/src/celestia/Makefile.am
+@@ -7,14 +7,15 @@
+ 
+ if ENABLE_KDE
+ SUBDIRS += kde
+-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+-                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a
+ celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+ endif
+ 
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+ 
+ COMMONSOURCES = \
+@@ -62,6 +63,7 @@
+ 
+ if ENABLE_GLUT
+ GLUTSOURCES = glutmain.cpp
++GLUTLIBS = -lGL
+ endif
+ 
+ if ENABLE_THEORA
+@@ -80,15 +82,16 @@
+ celestia_LDADD = \
+ 	$(celestiaKDELIBS) \
+ 	$(celestiaGTKLIBS) \
+-	$(DL_LIBS) \
+-	$(LUA_LIBS) \
+-	$(THEORA_LIBS) \
+ 	../celengine/libcelengine.a \
+ 	../celtxf/libceltxf.a \
+ 	../cel3ds/libcel3ds.a \
+ 	../celmath/libcelmath.a \
+ 	../celutil/libcelutil.a \
+-	$(SPICE_LIBS)
++	$(LUA_LIBS) \
++	$(THEORA_LIBS) \
++	$(GLUTLIBS) \
++	$(SPICE_LIBS) \
++	$(DL_LIBS)
+ 
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 419c6a1cd..3b9e8e03d 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 143847 2011-11-30 06:23:25Z eric $
+# $Id: PKGBUILD 148694 2012-02-05 11:47:14Z ibiru $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL' 'MIT')
 url="http://www.cinepaint.org"
 depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
 makedepends=('python2' 'gutenprint')
-optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins')
+optdepends=('python2: for python plug-ins' 
+            'gutenprint: for print plug-ins'
+            'ghostscript: for pdf plug-ins')
 options=('!libtool')
 install=cinepaint.install
 source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz
-        LICENSE)
+        LICENSE cinepaint-libpng15.patch)
 md5sums=('7dfdb005d246578392ac9bd500534804'
-         '169085743f667c250ea2e4022efecf5f')
+         '169085743f667c250ea2e4022efecf5f'
+         '682de65ad358512d00a8b76730453664')
 
 build() {
   cd "${srcdir}/${pkgname}"
+  patch -p1 -i ../cinepaint-libpng15.patch
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
   sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
 
   aclocal -I aclocal
   autoconf
-  ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
+  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
     --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
   sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
     plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
@@ -38,5 +42,6 @@ package() {
   make DESTDIR="${pkgdir}" install
   sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
     -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
+  sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/cinepaint/cinepaint-libpng15.patch b/extra/cinepaint/cinepaint-libpng15.patch
new file mode 100644
index 000000000..e22edafae
--- /dev/null
+++ b/extra/cinepaint/cinepaint-libpng15.patch
@@ -0,0 +1,452 @@
+diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
+--- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
++++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
+@@ -390,6 +390,16 @@
+   gchar		*progress;	/* Title for progress display... */
+   guchar	alpha[256],	/* Index -> Alpha */
+   		*alpha_ptr;	/* Temporary pointer */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  int compression_type;
++  png_bytepp iccp_profile;
++  png_uint_32 iccp_proflen;
++  png_uint_32 width, height;
++  png_byte channels;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -405,7 +415,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. File corrupted?", filename);
+     return image;
+@@ -442,21 +452,26 @@
+   */
+ 
+   png_read_info(pp, info);
++  color_type = png_get_color_type(pp, info);
++  width=png_get_image_width(pp, info);
++  height=png_get_image_height(pp, info);
+ 
+  /*
+   * Latest attempt, this should be my best yet :)
+   */
+ 
++  bit_depth = png_get_bit_depth(pp, info);
++
+ #ifndef WORDS_BIGENDIAN
+-  if(info->bit_depth == 16)
++  if(bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+     png_set_expand(pp);
+   }
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
+     png_set_packing(pp);
+   }
+ 
+@@ -464,8 +479,8 @@
+   * Expand G+tRNS to GA, RGB+tRNS to RGBA
+   */
+ 
+-  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
+-                       (info->valid & PNG_INFO_tRNS)) {
++  if (color_type != PNG_COLOR_TYPE_PALETTE &&
++      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
+     png_set_expand(pp);
+   }
+ 
+@@ -482,7 +497,7 @@
+ 
+ #if PNG_LIBPNG_VER > 99
+   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
+-      info->color_type == PNG_COLOR_TYPE_PALETTE)
++      color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
+     /* Copy the existing alpha values from the tRNS chunk */
+@@ -505,9 +520,9 @@
+ 
+   png_read_update_info(pp, info);
+   
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 6;
+@@ -545,7 +560,7 @@
+   }
+   else
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 3;
+@@ -582,7 +597,7 @@
+ 	  };
+   }
+ 
+-  image = gimp_image_new(info->width, info->height, image_type);
++  image = gimp_image_new(width, height, image_type);
+   if (image == -1)
+   {
+     g_message("Can't allocate new image\n%s", filename);
+@@ -595,7 +610,7 @@
+   * Create the "background" layer to hold the image...
+   */
+ 
+-  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
++  layer = gimp_layer_new(image, _("Background"), width, height,
+                          layer_type, 100, NORMAL_MODE);
+   gimp_image_add_layer(image, layer, 0);
+ 
+@@ -627,20 +642,21 @@
+ 
+   empty= 0; /* by default assume no full transparent palette entries */
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
++  if (color_type & PNG_COLOR_MASK_PALETTE) {
+ 
+ #if PNG_LIBPNG_VER > 99
++    png_get_PLTE(pp, info, &palette, &num_palette);
+     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
+         /* Calculates number of fully transparent "empty" entries */
+ 
+-      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
+-                          info->num_palette - empty);
++      gimp_image_set_cmap(image, (guchar *) (palette + empty),
++                          num_palette - empty);
+     } else {
+-      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+     }
+ #else
+-    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+ #endif /* PNG_LIBPNG_VER > 99 */
+ 
+   }
+@@ -659,18 +675,19 @@
+   */
+ 
+   tile_height = gimp_tile_height ();
+-  pixel       = g_new(guchar, tile_height * info->width * bpp);
++  pixel       = g_new(guchar, tile_height * width * bpp);
+   pixels      = g_new(guchar *, tile_height);
++  channels=png_get_channels(pp, info);
+ 
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i * 2;
++		  pixels[i] = pixel + width * channels * i * 2;
+   }
+   else
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i;
++		  pixels[i] = pixel + width * channels * i;
+   }
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+@@ -680,11 +697,11 @@
+ 	   */
+ 
+ 	  for (begin = 0, end = tile_height;
+-			  begin < info->height;
++			  begin < height;
+ 			  begin += tile_height, end += tile_height)
+ 	  {
+-		  if (end > info->height)
+-			  end = info->height;
++		  if (end > height)
++			  end = height;
+ 
+ 		  num = end - begin;
+ 
+@@ -697,20 +714,21 @@
+ 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
+ 				  drawable->width, num);
+ 
+-		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
++		  gimp_progress_update(((double)pass + (double)end / (double)height) /
+ 				  (double)num_passes);
+ 	  };
+   };
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+   /* set icc profile */
+-  if (info->iccp_proflen > 0) {
+-    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
+-                                              info->iccp_profile,
+-                                              ICC_IMAGE_PROFILE);
++  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
++  if (iccp_proflen > 0) {
++    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
++				       (gchar *)iccp_profile,
++				       ICC_IMAGE_PROFILE);
+     printf ("%s:%d %s() set embedded profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++	    (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -808,6 +826,14 @@
+                 blue;           /* Used for palette background */
+   time_t	cutime;         /* Time since epoch */
+   struct tm	*gmt;		/* GMT broken down */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  int filter_method=0;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  png_uint_32 height;
++  int compression_type;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -824,7 +849,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. Couldn't save image", filename);
+     return 0;
+@@ -857,15 +882,6 @@
+   drawable = gimp_drawable_get (drawable_ID);
+   type     = gimp_drawable_type (drawable_ID);
+ 
+- /*
+-  * Set the image dimensions, bit depth, interlacing and compression
+-  */
+-
+-  png_set_compression_level (pp, pngvals.compression_level);
+-
+-  info->width          = drawable->width;
+-  info->height         = drawable->height;
+-  info->interlace_type = pngvals.interlaced;
+ 
+  /*
+   * Set color type and remember bytes per pixel count 
+@@ -874,71 +890,69 @@
+   switch (type)
+   {
+     case RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 8;
+         bpp              = 3;
+         break;
+     case RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 8;
+         bpp              = 4;
+         break;
+     case GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 8;
+         bpp              = 1;
+         break;
+     case GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 8;
+         bpp              = 2;
+         break;
+     case INDEXED_IMAGE :
+ 	bpp		 = 1;
+-	info->bit_depth      = 8;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++	png_get_valid(pp, info, PNG_INFO_PLTE);
++	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case INDEXEDA_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 8;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 8;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     case U16_RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 16;
+         bpp              = 6;
+         break;
+     case U16_RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 16;
+         bpp              = 8;
+         break;
+     case U16_GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 16;
+         bpp              = 2;
+         break;
+     case U16_GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 16;
+         bpp              = 4;
+         break;
+     case U16_INDEXED_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 16;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++	png_get_valid(pp, info, PNG_INFO_PLTE);
++	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case U16_INDEXEDA_IMAGE :
+ 	bpp		 = 4;
+-	info->bit_depth      = 16;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 16;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     default:
+@@ -950,30 +964,36 @@
+   * Fix bit depths for (possibly) smaller colormap images
+   */
+   
+-  if (info->valid & PNG_INFO_PLTE) {
+-    if (info->num_palette <= 2)
+-      info->bit_depth= 1;
+-    else if (info->num_palette <= 4)
+-      info->bit_depth= 2;
+-    else if (info->num_palette <= 16)
+-      info->bit_depth= 4;
++  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
++    png_get_PLTE(pp, info, &palette, &num_palette);
++    if (num_palette <= 2)
++      bit_depth= 1;
++    else if (num_palette <= 4)
++      bit_depth= 2;
++    else if (num_palette <= 16)
++      bit_depth= 4;
+     /* otherwise the default is fine */
+   }
+ 
++ png_set_compression_level (pp, pngvals.compression_level);
++ png_set_IHDR(pp, info, drawable->width, drawable->height,
++	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
++
++
+   // write icc profile
+ #if defined(PNG_iCCP_SUPPORTED)
+   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
+-    int size;
++    int  size;
+     char *buffer;
+     
+     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
+                                                 ICC_IMAGE_PROFILE);
+     png_set_iCCP (pp, info,
+            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
+-                  0, buffer, size);
++                  0, (png_const_bytep)buffer, size);
+     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++	    (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -1039,13 +1059,13 @@
+   * Convert unpacked pixels to packed if necessary
+   */
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
+     png_set_packing(pp);
+ 
+   /* Set swapping for 16 bit per sample images */
+   
+ #ifndef WORDS_BIGENDIAN
+-  if (info->bit_depth == 16)
++  if (bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+   
+@@ -1063,6 +1083,7 @@
+ 
+   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
+                       drawable->height, FALSE, FALSE);
++  height=png_get_image_height(pp, info);
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+   {
+@@ -1077,7 +1098,7 @@
+ 	num = end - begin;
+ 	
+ 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
+-        if (info->valid & PNG_INFO_tRNS) {
++        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1085,7 +1106,7 @@
+             }
+           }
+        /* Forgot this case before, what if there are too many colors? */
+-        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
++        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1095,9 +1116,8 @@
+         }
+ 	
+ 	png_write_rows (pp, pixels, num);
+-	
+ 	gimp_progress_update (((double)pass + (double)end /
+-                    (double)info->height) / (double)num_passes);
++                    (double)height) / (double)num_passes);
+       };
+   };
+ 
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 06738f0f8..8f9780a19 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147965 2012-01-29 09:32:13Z ronald $
+# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index 6544542f1..75cd92aef 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 143707 2011-11-28 13:56:50Z jgc $
+# $Id: PKGBUILD 148700 2012-02-05 11:47:29Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: mgushee
 
 pkgname=djvulibre
 pkgver=3.5.24
-pkgrel=2
+pkgrel=3
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://djvu.sourceforge.net/"
-depends=('gcc-libs' 'libtiff' 'bash' 'hicolor-icon-theme')
+depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme')
 makedepends=('pkg-config')
 provides=("libdjvu=${pkgver}")
 replaces=('libdjvu')
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index edb8134bb..6eda716a9 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143729 2011-11-28 17:32:58Z giovanni $
+# $Id: PKGBUILD 148702 2012-02-05 11:47:33Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca> 
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,19 +6,23 @@
 
 pkgname=dvdauthor
 pkgver=0.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="DVD authoring tools"
 arch=('i686' 'x86_64')
 url="http://dvdauthor.sourceforge.net/"
 license=('GPL')
 depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
 options=('!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('33a447fb98ab3293ac40f869eedc17ff')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'dvdauthor-0.7.0-libpng15.patch')
+md5sums=('33a447fb98ab3293ac40f869eedc17ff'
+         '9ea90bbea6adb0469c8c1b2f7d033f11')
 
 build() {
   cd "${srcdir}/${pkgname}"
 
+  patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch"
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc
   make
diff --git a/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch
new file mode 100644
index 000000000..2bb636380
--- /dev/null
+++ b/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
++++ src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include <netinet/in.h>
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@
+         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+         return -1;
+       } /*if*/
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+       {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         fclose(fp);
diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
index 185581224..079175e12 100644
--- a/extra/ecasound/PKGBUILD
+++ b/extra/ecasound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124853 2011-05-24 19:44:26Z schiv $
+# $Id: PKGBUILD 149067 2012-02-05 16:13:46Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ecasound
 pkgver=2.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A software package designed for multitrack audio processing"
 arch=('i686' 'x86_64')
 url="http://www.eca.cx/ecasound/"
@@ -23,7 +23,6 @@ optdepends=('python2: ecamonitor, ECI API'
             'timidity++: MIDI file input'
             'libmikmod: tracker module')
 options=('!libtool')
-changelog=$pkgname.changelog
 source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz)
 md5sums=('d9ded0074a8eeb59dd507c248220d010')
 
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index b47ca87b9..9d567c69d 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,14 +1,9 @@
-# $Id: PKGBUILD 146181 2012-01-05 13:48:00Z juergen $
+# $Id: PKGBUILD 148704 2012-02-05 11:47:36Z ibiru $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
-_majorver=23.3
-_minorver=b
-# We want something like "23.3.a" so pacman version comparison works, but
-# upstream uses "23.3a", which is a bit silly and interpreted as alpha.
-pkgver=$_majorver.$_minorver
-_realver=$_majorver$_minorver
+pkgver=23.4
 pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
@@ -16,18 +11,21 @@ url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz)
-md5sums=('f2bfd8eab7e3b34a0f7f09acc0667e71')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch)
+md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0'
+         '55eb16eb48b44987693c0e3ea5ab8075'
+         '12e2e7a66df5cc5ded54e1d30083a1fb')
 
 build() {
-  cd "$srcdir"/$pkgname-$_majorver
+  cd "$srcdir"/$pkgname-$pkgver
+  patch -p1 -i ../emacs-subversion17.patch
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=gtk --with-xft
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$_majorver
+  cd "$srcdir"/$pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   # remove conflict with ctags package
diff --git a/extra/emacs/emacs-subversion17.patch b/extra/emacs/emacs-subversion17.patch
new file mode 100644
index 000000000..e7969de81
--- /dev/null
+++ b/extra/emacs/emacs-subversion17.patch
@@ -0,0 +1,83 @@
+From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001
+From: Karl Pflästerer <k@rl.pflaesterer.de>
+Date: Sat, 12 Feb 2011 01:12:53 +0000
+Subject: Adapt to Subversion change, with no .svn directory in each sub directory.
+
+http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html
+
+* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root.
+(vc-svn-root): New function.  Make vc-svn-responsible-p an alias.
+(vc-svn-repository-hostname): Use "svn info".
+---
+(limited to 'lisp/vc/vc-svn.el')
+
+diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
+index aefef50..20c7689 100644
+--- a/lisp/vc-svn.el
++++ b/lisp/vc-svn.el
+@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t."
+ ;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
+ ;;;###autoload                           "_svn")
+ ;;;###autoload                          (t ".svn"))))
+-;;;###autoload     (when (file-readable-p (expand-file-name
+-;;;###autoload                             (concat admin-dir "/entries")
+-;;;###autoload                             (file-name-directory f)))
++;;;###autoload     (when (vc-find-root f admin-dir)
+ ;;;###autoload       (load "vc-svn")
+ ;;;###autoload       (vc-svn-registered f))))
+ 
+ (defun vc-svn-registered (file)
+   "Check if FILE is SVN registered."
+-  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
+-						   "/entries")
+-					   (file-name-directory file)))
++  (when (vc-svn-root file)
+     (with-temp-buffer
+       (cd (file-name-directory file))
+       (let* (process-file-side-effects
+@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches'
+ to the SVN command."
+   (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
+ 
+-(defun vc-svn-responsible-p (file)
+-  "Return non-nil if SVN thinks it is responsible for FILE."
+-  (file-directory-p (expand-file-name vc-svn-admin-directory
+-				      (if (file-directory-p file)
+-					  file
+-					(file-name-directory file)))))
++(defun vc-svn-root (file)
++  (vc-find-root file vc-svn-admin-directory))
+ 
+-(defalias 'vc-svn-could-register 'vc-svn-responsible-p
++(defalias 'vc-svn-responsible-p 'vc-svn-root)
++
++(defalias 'vc-svn-could-register 'vc-svn-root
+   "Return non-nil if FILE could be registered in SVN.
+ This is only possible if SVN is responsible for FILE's directory.")
+ 
+@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
+ 
+ (defun vc-svn-repository-hostname (dirname)
+   (with-temp-buffer
+-    (let ((coding-system-for-read
+-	   (or file-name-coding-system
+-	       default-file-name-coding-system)))
+-      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
+-						"/entries")
+-					dirname)))
++    (let (process-file-side-effects)
++      (vc-svn-command t t dirname "info" "--xml"))
+     (goto-char (point-min))
+-    (when (re-search-forward
+-	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
+-	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
+-		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
+-		   "url=\"\\(?1:[^\"]+\\)\""
+-                   ;; Yet newer ones don't use XML any more.
+-                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
++    (when (re-search-forward "<url>\\(.*\\)</url>" nil t)
+       ;; This is not a hostname but a URL.  This may actually be considered
+       ;; as a feature since it allows vc-svn-stay-local to specify different
+       ;; behavior for different modules on the same server.
+--
+cgit v0.9.0.2
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index b46dbd724..eca14a2fb 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143541 2011-11-26 04:58:43Z eric $
+# $Id: PKGBUILD 148706 2012-02-05 11:47:41Z ibiru $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -15,15 +15,18 @@ replaces=('enblend')
 conflicts=('enblend')
 provides=('enblend')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} libpng-1.4.patch)
+source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \
+        libpng-1.4.patch enblend-4.0-libpng15.patch)
 sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
           'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
-          'eae6cf48ea082865130302d0b4d1ca0b884a563b')
+          'eae6cf48ea082865130302d0b4d1ca0b884a563b'
+          '71e961d90be842eafe9d473d8d70b04b29077036')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
   sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
-  patch -Np1 -i ../libpng-1.4.patch
+  patch -p1 -i ../libpng-1.4.patch
+  patch -p0 -i ../enblend-4.0-libpng15.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/enblend-enfuse/enblend-4.0-libpng15.patch b/extra/enblend-enfuse/enblend-4.0-libpng15.patch
new file mode 100644
index 000000000..d4465ccad
--- /dev/null
+++ b/extra/enblend-enfuse/enblend-4.0-libpng15.patch
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
++++ src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+     png_error_message = std::string(error_msg);
+-    longjmp( png_ptr->jmpbuf, 1 );
++    longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+ 
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+         vigra_postcondition( png != 0, "could not create the read struct." );
+ 
+         // create info struct
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
+         }
+@@ -221,14 +221,14 @@
+         vigra_postcondition( info != 0, "could not create the info struct." );
+ 
+         // init png i/o
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+         }
+         png_init_io( png, file.get() );
+ 
+         // specify that the signature was already read
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
+         }
+@@ -244,13 +244,13 @@
+     void PngDecoderImpl::init()
+     {
+         // read all chunks up to the image data
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
+         png_read_info( png, info );
+ 
+         // pull over the header fields
+         int interlace_method, compression_method, filter_method;
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
+         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+                       &interlace_method, &compression_method, &filter_method );
+@@ -264,7 +264,7 @@
+ 
+         // transform palette to rgb
+         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
+             png_set_palette_to_rgb(png);
+             color_type = PNG_COLOR_TYPE_RGB;
+@@ -273,7 +273,7 @@
+ 
+         // expand gray values to at least one byte size
+         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
+             png_set_expand_gray_1_2_4_to_8(png);
+             bit_depth = 8;
+@@ -283,7 +283,7 @@
+ #if 0
+         // strip alpha channel
+         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
+             png_set_strip_alpha(png);
+             color_type ^= PNG_COLOR_MASK_ALPHA;
+@@ -323,12 +323,12 @@
+ 
+         // read icc profile
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+-        char * dummyName;
++        png_charpp dummyName;
+         int dummyCompType;
+-        char * profilePtr;
++        png_bytepp profilePtr;
+         png_uint_32 profileLen;
+-        if (info->valid & PNG_INFO_iCCP) {
+-            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
++        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
++            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
+             iccProfilePtr = (unsigned char *) profilePtr;
+             iccProfileLength = profileLen;
+         }
+@@ -340,7 +340,7 @@
+         // image gamma
+         double image_gamma = 0.45455;
+         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
+             png_get_gAMA( png, info, &image_gamma );
+         }
+@@ -349,26 +349,26 @@
+         double screen_gamma = 2.2;
+ 
+         // set gamma correction
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
+         png_set_gamma( png, screen_gamma, image_gamma );
+ #endif
+ 
+         // interlace handling, get number of read passes needed
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
+         n_interlace_passes = png_set_interlace_handling(png);
+ 
+         // update png library state to reflect any changes that were made
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
+         png_read_update_info( png, info );
+ 
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
+         n_channels = png_get_channels(png, info);
+ 
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
+         rowsize = png_get_rowbytes(png, info);
+ 
+@@ -379,7 +379,7 @@
+     void PngDecoderImpl::nextScanline()
+     {
+         for (int i=0; i < n_interlace_passes; i++) {
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
+             png_read_row(png, row_data.begin(), NULL);
+         }
+@@ -545,7 +545,7 @@
+         vigra_postcondition( png != 0, "could not create the write struct." );
+ 
+         // create info struct
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_write_struct( &png, &info );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
+         }
+@@ -556,7 +556,7 @@
+         }
+ 
+         // init png i/o
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_write_struct( &png, &info );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+         }
+@@ -571,7 +571,7 @@
+     void PngEncoderImpl::finalize()
+     {
+         // write the IHDR
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
+         png_set_IHDR( png, info, width, height, bit_depth, color_type,
+                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+@@ -579,7 +579,7 @@
+ 
+         // set resolution
+         if (x_resolution > 0 && y_resolution > 0) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
+             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
+                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
+@@ -588,7 +588,7 @@
+ 
+         // set offset
+         if (position.x > 0 && position.y > 0) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
+             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
+         }
+@@ -597,12 +597,12 @@
+         // set icc profile
+         if (iccProfile.size() > 0) {
+             png_set_iCCP(png, info, "icc", 0,
+-                         (char *)iccProfile.begin(), iccProfile.size());
++                         iccProfile.begin(), iccProfile.size());
+         }
+ #endif
+ 
+         // write the info struct
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+         png_write_info( png, info );
+ 
+@@ -634,10 +634,10 @@
+         }
+ 
+         // write the whole image
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
+         png_write_image( png, row_pointers.begin() );
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
+         png_write_end(png, info);
+     }
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index e4a3597a9..ff784f835 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140259 2011-10-11 03:24:04Z eric $
+# $Id: PKGBUILD 149104 2012-02-05 18:10:13Z schiv $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment
 pkgver=1.0.10
 _themever=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast, flexible, and very extensible Window Manager"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -19,7 +19,7 @@ sha1sums=('20e56c851aeb5279479eb43570b5d58bcc1d6ef9'
 
 build() {
   cd "${srcdir}/e16-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-sound-pulse 
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-sound-pulse
   make
 
   cd "${srcdir}/e16-themes-${_themever}"
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 242d7472b..1cca0cead 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142650 2011-11-12 17:18:26Z ibiru $
+# $Id: PKGBUILD 148708 2012-02-05 11:47:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
 pkgver=3.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64')
diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD
index b6081ed88..bab0074f8 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 127739 2011-06-18 00:11:19Z eric $
+# $Id: PKGBUILD 148710 2012-02-05 11:47:47Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fbida
 pkgver=2.08
-pkgrel=1
+pkgrel=2
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
 arch=('i686' 'x86_64')
 url="http://www.kraxel.org/blog/linux/fbida/"
 license=('GPL2')
-depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig')
+depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl')
 makedepends=('libxpm')
 optdepends=('ghostscript: to use fbgs')
 source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index b16f64c3d..229ab4761 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148518 2012-02-03 01:12:43Z bisson $
+# $Id: PKGBUILD 148712 2012-02-05 11:47:50Z ibiru $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=feh
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
 license=('MIT')
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index 3fed7aae2..7cc1baea4 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
@@ -29,6 +29,6 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # FS#24105: Generate thumbnails in nautilus
-  install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \
-    ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop
+  install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
+    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop"
 }
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 5c63fd095..d93e624fe 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142179 2011-11-05 20:03:57Z eric $
+# $Id: PKGBUILD 148718 2012-02-05 11:48:05Z ibiru $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 6319df46f..e483fd487 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 146693 2012-01-16 13:56:18Z bisson $
+# $Id: PKGBUILD 148720 2012-02-05 11:48:07Z ibiru $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
-pkgver=20111214
-pkgrel=3
+pkgver=20120119
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
 options=('!libtool' '!makeflags')
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
+sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c')
 
 # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
 
diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD
index f5d664ee7..5cedf397f 100644
--- a/extra/foobillard++/PKGBUILD
+++ b/extra/foobillard++/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146196 2012-01-05 21:53:59Z eric $
+# $Id: PKGBUILD 148666 2012-02-05 11:46:13Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=foobillard++
 pkgver=3.42beta
-pkgrel=2
+pkgrel=3
 pkgdesc="An OpenGL billiard game"
 arch=('i686' 'x86_64')
 url="http://foobillardplus.sourceforge.net/"
diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD
index 867680ccb..fdc24191a 100644
--- a/extra/fvwm/PKGBUILD
+++ b/extra/fvwm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 140040 2011-10-06 00:22:58Z eric $
+# $Id: PKGBUILD 149155 2012-02-06 01:09:56Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fvwm
-pkgver=2.6.3
+pkgver=2.6.4
 pkgrel=1
 pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ conflicts=('fvwm-devel')
 replaces=('fvwm-devel')
 options=('!emptydirs' '!makeflags')
 source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop)
-sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39'
+sha1sums=('635b803de5af8677c7f5b91a82b450799cfe3ce2'
           '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
 
 build() {
diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD
index 29eeed43a..2d89e7bd2 100644
--- a/extra/gd/PKGBUILD
+++ b/extra/gd/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 137764 2011-09-10 16:29:02Z pierre $
+# $Id: PKGBUILD 148724 2012-02-05 11:48:15Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=gd
 pkgver=2.0.36RC1
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64')
 url="http://www.libgd.org/"
 license=('custom')
-depends=('perl' 'libpng' 'fontconfig' 'libjpeg')
+depends=('libpng' 'fontconfig' 'libjpeg')
+optdepends=('perl: bdftogd script')
 options=('!libtool')
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'libpng14.patch')
@@ -26,5 +27,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 633a78da7..ab0aad374 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 145133 2011-12-17 10:30:04Z ibiru $
+# $Id: PKGBUILD 148726 2012-02-05 11:48:20Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gdk-pixbuf2
 pkgver=2.24.1
-pkgrel=1
+pkgrel=3
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
+depends=('glib2' 'libpng>=1.5.7' 'libtiff' 'libjpeg' 'libx11')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 701e9d5f5..48cafffe6 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144902 2011-12-09 12:21:40Z eric $
+# $Id: PKGBUILD 148728 2012-02-05 11:48:24Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gegl
 pkgver=0.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD
index 3c96df76f..fcc3b3dde 100644
--- a/extra/gif2png/PKGBUILD
+++ b/extra/gif2png/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 143743 2011-11-28 19:26:51Z giovanni $
+# $Id: PKGBUILD 149145 2012-02-05 23:59:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Andrew Rose <ody@netrux.com>
 
 pkgname=gif2png
-pkgver=2.5.4
-pkgrel=2
+pkgver=2.5.5
+pkgrel=1
 pkgdesc="A GIF to PNG image format converter"
 arch=('i686' 'x86_64')
 url="http://www.catb.org/~esr/gif2png/"
 license=('ZLIB')
 depends=('libpng')
 optdepends=('python2: for using web2png')
-source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d63ea3fc6b6119589e8d4d6fead30df9')
+source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gif2png-2.5.5-libpng15.patch')
+md5sums=('cfb4c003966866b6069d3707bfb12435'
+         '5b3467b97157f9a7978a230b934bc488')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's#env python#env python2#' web2png
+  patch -Np1 -i ${srcdir}/gif2png-2.5.5-libpng15.patch
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man
   make
diff --git a/extra/gif2png/gif2png-2.5.5-libpng15.patch b/extra/gif2png/gif2png-2.5.5-libpng15.patch
new file mode 100644
index 000000000..58ca43186
--- /dev/null
+++ b/extra/gif2png/gif2png-2.5.5-libpng15.patch
@@ -0,0 +1,41 @@
+--- a/gif2png.c	2012-01-29 00:02:06.000000000 +0100
++++ b/gif2png.c	2012-02-06 00:49:14.000000000 +0100
+@@ -12,6 +12,7 @@
+ #include <unistd.h>	/* for isatty() */
+ #include <sys/stat.h>
+ #include <utime.h>
++#include <zlib.h>
+ 
+ #if !defined(TRUE)
+ #define FALSE	0
+@@ -122,8 +123,8 @@
+     int colors_used = 0;
+     byte remap[MAXCMSIZE];
+     int low_prec;
+-    png_struct *png_ptr = xalloc(sizeof (png_struct));
+-    png_info *info_ptr = xalloc(sizeof (png_info));
++    png_struct *png_ptr;
++    png_info *info_ptr;
+     int p;
+     int gray_bitdepth;
+     png_color pal_rgb[MAXCMSIZE], *pltep;
+@@ -138,6 +139,19 @@
+     png_text software;
+     png_text comment;
+ 
++    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
++    if (png_ptr == NULL) {
++      fprintf(stderr, "gif2png: fatal error, out of memory\n");
++      fprintf(stderr, "gif2png: exiting ungracefully\n");
++      exit(1);
++    }
++    info_ptr = png_create_info_struct(png_ptr);
++    if (info_ptr == NULL) {
++      fprintf(stderr, "gif2png: fatal error, out of memory\n");
++      fprintf(stderr, "gif2png: exiting ungracefully\n");
++      exit(1);
++    }
++
+     /* these volatile declarations prevent gcc warnings ("variable might be
+      *  clobbered by `longjmp' or `vfork'") */
+     volatile int gray = TRUE;
diff --git a/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD
index f09db2f20..9ebff69c5 100644
--- a/extra/gimp-dbp/PKGBUILD
+++ b/extra/gimp-dbp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128499 2011-06-24 05:56:11Z eric $
+# $Id: PKGBUILD 148736 2012-02-05 11:48:41Z ibiru $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gimp-dbp
 pkgver=1.1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="David's batch processor for the GIMP"
 arch=('i686' 'x86_64')
 url="http://members.ozemail.com.au/~hodsond/dbp.html"
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
index e0b5eaca2..4583941cd 100644
--- a/extra/gimp-devel/PKGBUILD
+++ b/extra/gimp-devel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145035 2011-12-15 15:03:12Z eric $
+# $Id: PKGBUILD 148738 2012-02-05 11:48:46Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gimp-devel
 pkgver=2.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
diff --git a/extra/gimp-ufraw/PKGBUILD b/extra/gimp-ufraw/PKGBUILD
index b360605a7..7273ffd47 100644
--- a/extra/gimp-ufraw/PKGBUILD
+++ b/extra/gimp-ufraw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143849 2011-11-30 06:25:30Z eric $
+# $Id: PKGBUILD 148740 2012-02-05 11:48:50Z ibiru $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=gimp-ufraw
 pkgver=0.18
-pkgrel=3
+pkgrel=4
 pkgdesc="Standalone or gimp plugin converter for raw files"
 url="http://ufraw.sourceforge.net/"
 arch=('i686' 'x86_64')
@@ -14,7 +14,6 @@ optdepends=('gimp: to use the gimp import plugin for raw images'
             'cinepaint: to use the cinepaint import plugin for raw images')
 install=gimp-ufraw.install
 source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz)
-md5sums=('454f40a402928998a82e2645d9265d96')
 sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2')
 
 build() {
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index c083eb449..6522c6c5c 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140569 2011-10-17 08:14:42Z jgc $
+# $Id: PKGBUILD 148734 2012-02-05 11:48:37Z ibiru $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgname=gimp
-pkgver=2.6.11
-pkgrel=7
+pkgver=2.6.12
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
@@ -19,22 +19,15 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu
 options=('!libtool' '!makeflags')
 conflicts=('gimp-devel')
 install=gimp.install
-#source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
-source=(http://mirror.umoss.org/gimp/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
-        uri-backend-libcurl.patch gimp-poppler-0.18.patch)
-md5sums=('bb2939fe13e54fc7255cef5d097bb5dd'
-         'bb27bc214261d36484093e857f015f38'
-         'e894f4b2ffa92c71448fdd350e9b78c6'
-         'bfc73f80e911ed7a7d500d80973469f1')
-sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c'
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
+        uri-backend-libcurl.patch)
+sha1sums=('82964e3d4eb003239f3443a1bccac53f5d780e15'
           '110ce9798173b19a662d086ed7b882b4729f06cf'
-          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4'
-          '1479a6d80be7adf74f66a3b88057a5029fe892e8')
+          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 < ../uri-backend-libcurl.patch
-  patch -p1 < ../gimp-poppler-0.18.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw --with-libcurl \
diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD
index 96d77bced..0e2b13098 100644
--- a/extra/glade-perl/PKGBUILD
+++ b/extra/glade-perl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125153 2011-05-25 19:04:01Z foutrelis $
+# $Id: PKGBUILD 148742 2012-02-05 11:48:53Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glade-perl
 _realname=Gtk2-GladeXML
 pkgver=1.007
-pkgrel=4
+pkgrel=5
 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -19,5 +19,9 @@ build() {
   cd "${srcdir}/${_realname}-${pkgver}"
   perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd "${srcdir}/${_realname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD
index 5c073c3b0..dbf68735b 100644
--- a/extra/glhack/PKGBUILD
+++ b/extra/glhack/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137858 2011-09-12 05:04:42Z eric $
+# $Id: PKGBUILD 148744 2012-02-05 11:48:58Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glhack
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
 arch=('i686' 'x86_64')
 url="http://glhack.sourceforge.net/"
@@ -12,13 +12,13 @@ depends=('sdl' 'libpng' 'libgl')
 makedepends=('mesa')
 options=('!makeflags')
 install=glhack.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b4c68e3ab689610ca638b7660c1b05bd')
-sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz glhack-libpng15.patch)
+sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae'
+          '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d')
 
 build(){
   cd "${srcdir}/${pkgname}-${pkgver}"
-
+  patch -p0 -i ../glhack-libpng15.patch
   sed -i 's|/usr/lib/games|/usr/share|' include/config.h
   sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
   sed -i -e 's|PREFIX	 = /usr|PREFIX	 = $(DESTDIR)/usr|' Makefile
diff --git a/extra/glhack/glhack-libpng15.patch b/extra/glhack/glhack-libpng15.patch
new file mode 100644
index 000000000..d8e644d1c
--- /dev/null
+++ b/extra/glhack/glhack-libpng15.patch
@@ -0,0 +1,11 @@
+--- win/gl/gl_image.c.old	2012-01-19 04:01:26.000000000 -0500
++++ win/gl/gl_image.c	2012-01-19 04:03:04.000000000 -0500
+@@ -486,7 +486,7 @@
+   /* set error handling since we are using the setjmp/longjmp method
+    * (this is the normal method of doing things with libpng).
+    */
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     sdlgl_warning("Problem within LibPNG (unknown)\n");
+     goto failed;
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index c436dc1f5..a13062ece 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146319 2012-01-09 17:51:25Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 148748 2012-02-05 11:49:06Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64)
 url="http://projects.gnome.org/gnome-color-manager/"
@@ -25,6 +25,8 @@ build(){
       --libexecdir=/usr/lib/gnome-color-manager \
       --disable-static --disable-man-pages
 
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
diff --git a/extra/gnome-desktop2/PKGBUILD b/extra/gnome-desktop2/PKGBUILD
index 3829d54f7..e84bd7f64 100644
--- a/extra/gnome-desktop2/PKGBUILD
+++ b/extra/gnome-desktop2/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 121039 2011-04-28 07:31:32Z heftig $
+# $Id: PKGBUILD 148750 2012-02-05 11:49:09Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor:  Jan de Groot <jan@archlinux.org>
 
 _pkgname=gnome-desktop
 pkgname=${_pkgname}2
 pkgver=2.32.1
-pkgrel=1
-pkgdesc="The GNOME Desktop"
+pkgrel=2
+pkgdesc="Library with common API for various GNOME modules (legacy version)"
 arch=(i686 x86_64)
 license=(GPL LGPL)
 depends=(gconf gtk2 startup-notification)
@@ -23,6 +23,9 @@ build() {
       --with-gnome-distributor="Archlinux" \
       --disable-scrollkeeper \
       --disable-gnome-about --disable-desktop-docs
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD
index 81f68ee25..9936311d7 100644
--- a/extra/gnome-perl/PKGBUILD
+++ b/extra/gnome-perl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125159 2011-05-25 19:04:51Z foutrelis $
+# $Id: PKGBUILD 148752 2012-02-05 11:49:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-perl
 _realname=Gnome2
 pkgver=1.042
-pkgrel=6
+pkgrel=7
 pkgdesc="Perl bindings for libgnome"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -19,5 +19,9 @@ build() {
   cd "${srcdir}/${_realname}-${pkgver}"
   perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd "${srcdir}/${_realname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gnome-python/PKGBUILD b/extra/gnome-python/PKGBUILD
index b7a0e897f..26fabe51f 100644
--- a/extra/gnome-python/PKGBUILD
+++ b/extra/gnome-python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 107445 2011-01-25 10:20:52Z jgc $
+# $Id: PKGBUILD 148754 2012-02-05 11:49:16Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgbase=gnome-python
 pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs')
 pkgver=2.28.1
-pkgrel=7
+pkgrel=8
 arch=(i686 x86_64)
 license=('LGPL')
 makedepends=('pygtk' 'pyorbit' 'libgnomeui')
diff --git a/extra/gnome-sharp/PKGBUILD b/extra/gnome-sharp/PKGBUILD
index 276b77a73..33518bbfe 100644
--- a/extra/gnome-sharp/PKGBUILD
+++ b/extra/gnome-sharp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119246 2011-04-11 14:46:11Z jgc $
+# $Id: PKGBUILD 148756 2012-02-05 11:49:19Z ibiru $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgbase=gnome-sharp
 pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
 pkgver=2.24.2
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD
index 2563caae4..81dc19907 100644
--- a/extra/gnomecanvas-perl/PKGBUILD
+++ b/extra/gnomecanvas-perl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125156 2011-05-25 19:04:24Z foutrelis $
+# $Id: PKGBUILD 148746 2012-02-05 11:49:02Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnomecanvas-perl
 _realname=Gnome2-Canvas
 pkgver=1.002
-pkgrel=8
+pkgrel=9
 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -19,5 +19,9 @@ build() {
   cd "${srcdir}/${_realname}-${pkgver}"
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd "${srcdir}/${_realname}-${pkgver}"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/extra/gnugo/PKGBUILD b/extra/gnugo/PKGBUILD
index 8d0c654ea..db803a1b9 100644
--- a/extra/gnugo/PKGBUILD
+++ b/extra/gnugo/PKGBUILD
@@ -1,33 +1,31 @@
-# $Id: PKGBUILD 123739 2011-05-12 20:48:23Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 149077 2012-02-05 16:47:56Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gnugo
 pkgver=3.8
-pkgrel=2
-pkgdesc="A program that plays the game of Go"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gnugo/"
+pkgrel=3
+pkgdesc='Program that plays the game of Go'
+url='http://www.gnu.org/software/gnugo/'
 license=('GPL3' 'custom')
-depends=('ncurses' 'glibc' 'texinfo')
-install=gnugo.install
-source=("http://ftp.gnu.org/gnu/gnugo/$pkgname-$pkgver.tar.gz"
+arch=('i686' 'x86_64')
+depends=('ncurses')
+source=("http://ftp.gnu.org/gnu/gnugo/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
-md5sums=('6db0a528df58876d2b0ef1659c374a9a'
-         '4df5819356804397c553c95ea8164f11')
+sha1sums=('a8ce3c7512634f789bc0c964fe23a5a6209f25db'
+          '0221b29e03fe7356c131429631ad0ac3c8da04d6')
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr
+	make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/info/dir
-  gzip "${pkgdir}"/usr/share/info/*
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	rm -r "${pkgdir}"/usr/share/info
+	install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"/LICENSE
 }
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 47e8fee3c..542723645 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145789 2012-01-01 01:38:15Z bisson $
+# $Id: PKGBUILD 148758 2012-02-05 11:49:24Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=graphicsmagick
 pkgver=1.3.13
-pkgrel=1
+pkgrel=2
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
@@ -19,37 +19,37 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver
 sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6')
 
 build() {
-  cd "${srcdir}/GraphicsMagick-$pkgver"
+	cd "${srcdir}/GraphicsMagick-${pkgver}"
 
-  ./configure \
-    --prefix=/usr \
-    --with-perl \
-    --enable-shared \
-    --disable-static \
-    --with-gs-font-dir=/usr/share/fonts/Type1 \
+	./configure \
+		--prefix=/usr \
+		--with-perl \
+		--enable-shared \
+		--disable-static \
+		--with-gs-font-dir=/usr/share/fonts/Type1 \
 
-  make
+	make
 }
 
 package() {
-  cd "${srcdir}/GraphicsMagick-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-
-  # Install MIT license
-  install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/$pkgname/Copyright.txt"
-
-  # Install perl bindings
-  # The patching was introduced in order to build perl module without installing package itself and
-  # not to introduce unnecessary path into LD_RUN_PATH
-  cd PerlMagick
-  sed -i -e "s:'LDDLFLAGS'  => \"\(.*\)\":'LDDLFLAGS'  => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
-  perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
-  sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
-  make
-  make install
-
-  # Remove perllocal.pod and .packlist
-  rm -rf "${pkgdir}/usr/lib/perl5/core_perl"
-  rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist"
+	cd "${srcdir}/GraphicsMagick-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	# Install MIT license
+	install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
+
+	# Install perl bindings
+	# The patching was introduced in order to build perl module without installing package itself and
+	# not to introduce unnecessary path into LD_RUN_PATH
+	cd PerlMagick
+	sed -i -e "s:'LDDLFLAGS'  => \"\(.*\)\":'LDDLFLAGS'  => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
+	perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
+	sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
+	make
+	make install
+
+	# Remove perllocal.pod and .packlist
+	rm -rf "${pkgdir}/usr/lib/perl5/core_perl"
+	rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist"
 }
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 90865ddae..c6657ed39 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 144296 2011-12-04 10:42:58Z bisson $
-
+# $Id: PKGBUILD 148760 2012-02-05 11:49:28Z ibiru $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index cacb2e3b0..9eb5c7629 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135102 2011-08-10 09:44:06Z jgc $
+# $Id: PKGBUILD 148764 2012-02-05 11:49:36Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.30
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev')
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 04888a61b..09a83f3f8 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 144352 2011-12-04 23:08:08Z heftig $
+# $Id: PKGBUILD 148766 2012-02-05 11:49:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=2.14.1
+pkgver=2.14.2
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://gthumb.sourceforge.net/"
-depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2')
+depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme')
 makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base')
 optdepends=('gstreamer0.10-base: video support')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gthumb "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/gtk-engines/PKGBUILD b/extra/gtk-engines/PKGBUILD
index d614c9def..a1f52dd9e 100644
--- a/extra/gtk-engines/PKGBUILD
+++ b/extra/gtk-engines/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 92895 2010-10-01 18:33:37Z ibiru $
+# $Id: PKGBUILD 148768 2012-02-05 11:49:45Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtk-engines
 pkgver=2.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Theme engines for GTK+ 2"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 depends=('gtk2>=2.22.0')
-makedepends=('pkgconfig' 'intltool')
+makedepends=('pkg-config' 'intltool')
 options=('!libtool')
 url="http://live.gnome.org/GnomeArt"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
@@ -20,5 +20,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-animation
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index eb71463dd..afb9ec494 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147944 2012-01-28 16:25:29Z heftig $
+# $Id: PKGBUILD 148770 2012-02-05 11:49:51Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.9
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -51,7 +51,7 @@ package_gtk2() {
 }
 package_gtk-update-icon-cache() {
     pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2')
+    depends=('gdk-pixbuf2>=2.24.1-3')
 
     cd "$srcdir/gtk+-$pkgver/gtk"
 
diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD
index 50170f6a3..cb5edb812 100644
--- a/extra/gtkglext/PKGBUILD
+++ b/extra/gtkglext/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134243 2011-08-02 17:13:55Z jgc $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 148772 2012-02-05 11:49:55Z ibiru $
+# Maintainer:
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/"
@@ -12,16 +12,24 @@ license=('LGPL')
 depends=('gtk2' 'mesa' 'libxmu')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-	gtk2.20.patch)
+	'gtk2.20.patch')
 md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
          'e5a87ec3f2d0e616c6f32f90c3f7237f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -Np1 -i "${srcdir}/gtk2.20.patch"
   sed '/AC_PATH_XTRA/d' -i configure.in
+
   autoreconf --force --install
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr \
+              --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtkhtml/PKGBUILD b/extra/gtkhtml/PKGBUILD
index c92e9fcaf..b31a3c08e 100644
--- a/extra/gtkhtml/PKGBUILD
+++ b/extra/gtkhtml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 109846 2011-02-13 13:40:17Z ibiru $
+# $Id: PKGBUILD 148774 2012-02-05 11:49:58Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtkhtml
 pkgver=3.32.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight HTML renderer/editor widget for GTK2"
 arch=(i686 x86_64)
 license=('GPL')
@@ -21,6 +21,10 @@ build() {
       --localstatedir=/var --disable-static \
       --disable-deprecated-warning-flags
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/bin/gtkhtml-editor-test"
diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD
index 35801c5cc..a8e549cbd 100644
--- a/extra/gtkmm/PKGBUILD
+++ b/extra/gtkmm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 130876 2011-07-08 15:25:31Z ibiru $
+# $Id: PKGBUILD 148776 2012-02-05 11:50:02Z ibiru $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtkmm
 pkgname=('gtkmm' 'gtkmm-docs')
 pkgver=2.24.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')
diff --git a/extra/gtksourceview2/PKGBUILD b/extra/gtksourceview2/PKGBUILD
index 21473004f..78e6de75c 100644
--- a/extra/gtksourceview2/PKGBUILD
+++ b/extra/gtksourceview2/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 92017 2010-09-28 16:54:55Z ibiru $
+# $Id: PKGBUILD 148778 2012-02-05 11:50:06Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtksourceview2
 pkgver=2.10.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk2>=2.22.0' 'libxml2>=2.7.7')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool' 'pkg-config')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2)
@@ -20,5 +20,9 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/gtksourceview-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD
index 028bacf99..9eb7f80d6 100644
--- a/extra/gv/PKGBUILD
+++ b/extra/gv/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 122132 2011-05-02 09:38:25Z eric $
+# $Id: PKGBUILD 148658 2012-02-05 11:45:52Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gv
-pkgver=3.7.2
+pkgver=3.7.3
 pkgrel=1
 pkgdesc="A program to view PostScript and PDF documents"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gv/"
 license=('GPL')
-depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
+depends=('xaw3d>=1.6' 'ghostscript' 'desktop-file-utils')
 install=gv.install
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
-md5sums=('eb47d465755b7291870af66431c6f2e1'
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png
+        buildfix.diff)
+md5sums=('98ae3e9ce338b64ba5ab622389c5960e'
          'cf04652952f2d0903bc7578b4826f50c'
-         'ab0e3879dbe39e59ad1c923020c28a86')
-sha1sums=('d9573e17f5d88d150fccb257ce205dbceab83e8a'
-          'c8230fe08ee6d22525678a97832f44941237d174'
-          '35b9168e526527001b1b5b8ee34a5b69d9369590')
+         'ab0e3879dbe39e59ad1c923020c28a86'
+         '943baf7a6bb61389a09a4ec71083a900')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # https://trac.macports.org/browser/trunk/dports/print/gv/files/patch-src-Scrollbar.c.diff?rev=89338
+  patch -Np0 -i ${srcdir}/buildfix.diff
   sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in}
   ./configure --prefix=/usr
   make
diff --git a/extra/gv/buildfix.diff b/extra/gv/buildfix.diff
new file mode 100644
index 000000000..76c88b158
--- /dev/null
+++ b/extra/gv/buildfix.diff
@@ -0,0 +1,15 @@
+This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
+
+http://bugs.gentoo.org/399753
+
+--- src/Scrollbar.c
++++ src/Scrollbar.c
+@@ -1006,7 +1006,7 @@
+    TOPLOC = newtop;
+    SHOWNLENGTH = newbot-newtop+1;
+ 
+-   (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
++   (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
+ 
+    ENDMESSAGE(Redisplay)
+ }
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 8c91a9561..b44b06169 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 144049 2011-12-02 20:54:20Z ibiru $
+# $Id: PKGBUILD 148780 2012-02-05 11:50:09Z ibiru $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
-pkgver=2011.2.0
-pkgrel=2
+pkgver=2011.4.0
+pkgrel=1
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/"
 license=('GPL')
 depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
-         'lapack' 'desktop-file-utils' 'make' 'perl-exiftool')
+         'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
 makedepends=('zip' 'cmake' 'boost' 'tclap')
 install=hugin.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('79dfdac229b4e58f50c893c1238bdd0921ad9da6')
+sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index ed87911d6..b086a4621 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135136 2011-08-10 12:54:02Z tpowa $
+# $Id: PKGBUILD 148782 2012-02-05 11:50:17Z ibiru $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -17,49 +17,37 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz
         hylafax 
         hylafax.cron.daily 
         config.local
-        configure-6.0.5.patch)
+        configure-6.0.5.patch 
+        hylafax-libtiff4.patch)
+md5sums=('eb9ac942354ad708e20e4583cec6615f'
+         '6602288a405324d8c8e3c5eac2bf19fd'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '0d2ce24d918226a852539aebf57d3f4a'
+         '51d9f639bb76e5e39cdc8e2ac07e208d'
+         '3d239c186f24720e945508d349b069b1')
 
-# build as root for successful build!
 build() {
-  uucp_created=0
-  if ! grep 'uucp' /etc/passwd > /dev/null; then
-    uucp_created=1
-    groupadd -g 14 uucp &>/dev/null
-    useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
-    useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
-  fi
-  mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
-  mkdir -p $pkgdir/var/{spool/hylafax,lock}
-  cd $srcdir/${pkgname}-${pkgver}
-
+  cd "$srcdir/${pkgname}-${pkgver}"
   cp ../config.local .
   # fix compiling
   patch -Np0 -i ../configure-6.0.5.patch
+  patch -Np1 -i ../hylafax-libtiff4.patch
   ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
   make
 }
 
 package () {
-  cd $srcdir/${pkgname}-${pkgver}
-  make ROOT=$pkgdir install
-  install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax
-  install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax
-  # remove group if created
-  if [ $uucp_created -eq 1 ]; then
-    userdel uucp &>/dev/null
-    groupdel uucp &>/dev/null
-    userdel fax &>/dev/null
-  fi
+  cd "$srcdir/${pkgname}-${pkgver}"
+  mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+  mkdir -p "$pkgdir"/var/{spool/hylafax,lock}
+  make ROOT="$pkgdir" install
+  install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax
+  install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax
   # add missing awk file for notify-4.1 script
-  install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \
-  	$pkgdir/var/spool/hylafax/bin/notify.awk
+  install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \
+  	"$pkgdir"/var/spool/hylafax/bin/notify.awk
   # fix permission on /var/lock
-  chmod 1777 $pkgdir/var/lock
+  chmod 1777 "$pkgdir"/var/lock
 
-  install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
+  install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
-md5sums=('eb9ac942354ad708e20e4583cec6615f'
-         '6602288a405324d8c8e3c5eac2bf19fd'
-         '52beffe7dc296b4f9ce9fd0387f7804e'
-         '0d2ce24d918226a852539aebf57d3f4a'
-         '51d9f639bb76e5e39cdc8e2ac07e208d')
diff --git a/extra/hylafax/hylafax-libtiff4.patch b/extra/hylafax/hylafax-libtiff4.patch
new file mode 100644
index 000000000..4a49511f8
--- /dev/null
+++ b/extra/hylafax/hylafax-libtiff4.patch
@@ -0,0 +1,229 @@
+--- hylafax-6.0.5/configure	2010-09-15 10:42:36.000000000 -0400
++++ hylafax-5.5.1/configure	2012-01-02 17:44:20.000000000 -0500
+@@ -2531,6 +2566,7 @@
+     Note "... checking TIFF library version"
+     tiff_runlen_t=""
+     cat>t.c<<EOF
++#include <stdlib.h>
+ #include <stdio.h>
+ #include "tiffio.h"
+ main()
+@@ -2550,8 +2586,18 @@
+ 	Note "  Found libtiff version ${lib_ver}"
+ 	if [ ${header_ver} -ge 19960307 ]; then
+ 	    case ${lib_ver} in
+-		3.4)		tiff_runlen_t="uint16" ;;
+-		3.[56789])	tiff_runlen_t="uint32" ;;
++		3.4)		tiff_runlen_t="uint16"
++				echo '#define TIFFSTRIPBYTECOUNTS uint32'
++				echo '#define TIFFVERSION TIFF_VERSION'
++				echo '#define TIFFHEADER TIFFHeader';;
++		3.[56789])	tiff_runlen_t="uint32"
++				echo '#define TIFFSTRIPBYTECOUNTS uint32'
++				echo '#define TIFFVERSION TIFF_VERSION'
++				echo '#define TIFFHEADER TIFFHeader';;
++		4.0)		tiff_runlen_t="uint32"
++				echo '#define TIFFSTRIPBYTECOUNTS uint64'
++				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
++				echo '#define TIFFHEADER TIFFHeaderClassic';;
+ 	    esac
+ 	fi
+     else
+@@ -2588,7 +2634,7 @@
+ Incompatible TIFF Library.
+ 
+ HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through
+-3.9.  If you do not have up to date TIFF software on your system
++4.0.  If you do not have up to date TIFF software on your system
+ then you can retrieve it from the location where you obtained this software.
+ The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/
+ EOF
+--- hylafax-6.0.5/hfaxd/FileTransfer.c++	2010-09-15 10:42:36.000000000 -0400
++++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-02 17:44:19.000000000 -0500
+@@ -164,26 +142,26 @@
+  * a single IFD/image from a TIFF file.
+  */
+ typedef struct {
+-    TIFFDirEntry	SubFileType;
+-    TIFFDirEntry	ImageWidth;
+-    TIFFDirEntry	ImageLength;
+-    TIFFDirEntry	BitsPerSample;
+-    TIFFDirEntry	Compression;
+-    TIFFDirEntry	Photometric;
+-    TIFFDirEntry	FillOrder;
+-    TIFFDirEntry	StripOffsets;
+-    TIFFDirEntry	Orientation;
+-    TIFFDirEntry	SamplesPerPixel;
+-    TIFFDirEntry	RowsPerStrip;
+-    TIFFDirEntry	StripByteCounts;
+-    TIFFDirEntry	XResolution;
+-    TIFFDirEntry	YResolution;
+-    TIFFDirEntry	Options;		// T4 or T6
+-    TIFFDirEntry	ResolutionUnit;
+-    TIFFDirEntry	PageNumber;
+-    TIFFDirEntry	BadFaxLines;
+-    TIFFDirEntry	CleanFaxData;
+-    TIFFDirEntry	ConsecutiveBadFaxLines;
++    HFClassicTIFFDirEntry	SubFileType;
++    HFClassicTIFFDirEntry	ImageWidth;
++    HFClassicTIFFDirEntry	ImageLength;
++    HFClassicTIFFDirEntry	BitsPerSample;
++    HFClassicTIFFDirEntry	Compression;
++    HFClassicTIFFDirEntry	Photometric;
++    HFClassicTIFFDirEntry	FillOrder;
++    HFClassicTIFFDirEntry	StripOffsets;
++    HFClassicTIFFDirEntry	Orientation;
++    HFClassicTIFFDirEntry	SamplesPerPixel;
++    HFClassicTIFFDirEntry	RowsPerStrip;
++    HFClassicTIFFDirEntry	StripByteCounts;
++    HFClassicTIFFDirEntry	XResolution;
++    HFClassicTIFFDirEntry	YResolution;
++    HFClassicTIFFDirEntry	Options;		// T4 or T6
++    HFClassicTIFFDirEntry	ResolutionUnit;
++    HFClassicTIFFDirEntry	PageNumber;
++    HFClassicTIFFDirEntry	BadFaxLines;
++    HFClassicTIFFDirEntry	CleanFaxData;
++    HFClassicTIFFDirEntry	ConsecutiveBadFaxLines;
+     uint32		link;			// offset to next directory
+     uint32		xres[2];		// X resolution indirect value
+     uint32		yres[2];		// Y resolution indirect value
+@@ -226,10 +204,10 @@
+ 		 * amount of image data and then adding in
+ 		 * the expected data for the TIFF headers.
+ 		 */
+-		uint32* sb;
++		TIFFSTRIPBYTECOUNTS* sb;
+ 		TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
+ 		file_size = sizeof (DirTemplate) +
+-		    sizeof (TIFFHeader) + sizeof (uint16);
++		    sizeof (TIFFHEADER) + sizeof (uint16);
+ 		for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
+ 		    file_size += sb[s];
+ 		reply(code, "%s for %s (%lu bytes).",
+@@ -261,10 +239,10 @@
+ 	if (fd >= 0) {
+ 	    union {
+ 		char buf[512];
+-		TIFFHeader h;
++		TIFFHEADER h;
+ 	    } b;
+ 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
+-	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
++	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION &&
+ 	      (b.h.tiff_magic == TIFF_BIGENDIAN ||
+ 	       b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
+ 		(void) lseek(fd, 0L, SEEK_SET);		// rewind
+@@ -318,12 +296,12 @@
+ }
+ 
+ static void
+-getLong(TIFF* tif, TIFFDirEntry& de)
++getLong(TIFF* tif, HFClassicTIFFDirEntry& de)
+ {
+     TIFFGetField(tif, de.tdir_tag, &de.tdir_offset);
+ }
+ static void
+-getShort(TIFF* tif, TIFFDirEntry& de)
++getShort(TIFF* tif, HFClassicTIFFDirEntry& de)
+ {
+     uint16 v;
+     TIFFGetField(tif, de.tdir_tag, &v);
+@@ -343,7 +321,7 @@
+ {
+     static DirTemplate templ = {
+ #define	TIFFdiroff(v) \
+-    (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
++    (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \
+       (intptr_t) &(((DirTemplate*) 0)->v))
+ 	{ TIFFTAG_SUBFILETYPE,		TIFF_LONG,	1 },
+ 	{ TIFFTAG_IMAGEWIDTH,		TIFF_LONG,	1 },
+@@ -368,7 +346,7 @@
+ 	0,					// next directory
+ 	{ 0, 1 }, { 0, 1 },			// x+y resolutions
+     };
+-#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry))
++#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry))
+     /*
+      * Construct the TIFF header for this IFD using
+      * the preconstructed template above.  We extract
+@@ -377,14 +355,14 @@
+      * of things about the contents of the TIFF file.
+      */
+     struct {
+-	TIFFHeader h;
++	TIFFHEADER h;
+ 	uint16	dircount;
+ 	u_char	dirstuff[sizeof (templ)];
+     } buf;
+     union { int32 i; char c[4]; } u; u.i = 1;
+     buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
+-    buf.h.tiff_version = TIFF_VERSION;
+-    buf.h.tiff_diroff = sizeof (TIFFHeader);
++    buf.h.tiff_version = TIFFVERSION;
++    buf.h.tiff_diroff = sizeof (TIFFHEADER);
+     buf.dircount = (uint16) NTAGS;
+     getLong(tif, templ.SubFileType);
+     getLong(tif, templ.ImageWidth);
+@@ -412,7 +390,7 @@
+     getShort(tif, templ.CleanFaxData);
+     getLong(tif, templ.ConsecutiveBadFaxLines);
+     if (buf.h.tiff_magic == TIFF_BIGENDIAN) {
+-	TIFFDirEntry* dp = &templ.SubFileType;
++	HFClassicTIFFDirEntry* dp = &templ.SubFileType;
+ 	for (u_int i = 0; i < NTAGS; i++) {
+ 	    if (dp->tdir_type == TIFF_SHORT)
+ 		dp->tdir_offset <<= 16;
+@@ -441,7 +419,7 @@
+ bool
+ HylaFAXServer::sendITIFFData(TIFF* tif, int fdout)
+ {
+-    uint32* sb;
++    TIFFSTRIPBYTECOUNTS* sb;
+     (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
+     tdata_t buf = _TIFFmalloc(sb[0]);
+     tsize_t bsize = sb[0];
+--- hylafax-6.0.5/hfaxd/FileTransfer.c++	2012-01-28 15:27:47.000000000 -0500
++++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-28 15:30:12.000000000 -0500
+@@ -69,7 +69,7 @@
+ 
+ 
+ static bool
+-isTIFF(const TIFFHeader& h)
++isTIFF(const TIFFHEADER& h)
+ {
+     if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
+ 	return (false);
+@@ -82,11 +82,23 @@
+     // byte swap version stamp if opposite byte order
+     if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
+ 	TIFFSwabShort(&version);
+-    return (version == TIFF_VERSION);
++    return (version == TIFFVERSION);
+ }
+ 
+ 
+ /*
++ * This is copied right from tiff.h in version 3.8.2.  This was necessary
++ * to localize here because it was removed from tiff.h in version 4.0.
++ * In tiff.h 3.8.2 it was known as "TIFFDirEntry".
++ */
++typedef struct {
++	uint16		tdir_tag;
++	uint16		tdir_type;	/* data type */
++	uint32		tdir_count;	/* number of items; length in spec */
++	uint32		tdir_offset;	/* byte offset to field data */
++} HFClassicTIFFDirEntry;
++ 
++/*
+  * Record a file transfer in the log file.
+  */
+ void
+@@ -957,7 +957,7 @@
+ 	if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
+ 	    union {
+ 		char buf[512];
+-		TIFFHeader h;
++		TIFFHEADER h;
+ 	    } b;
+ 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
+ 	    if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install
index bd97d42bd..5dacf4045 100644
--- a/extra/hylafax/hylafax.install
+++ b/extra/hylafax/hylafax.install
@@ -1,8 +1,6 @@
 
 print_install() {
   printf "\n"
-  echo "If installing new:"
-  printf "\n"
   echo "Add the following to /etc/inittab and run telinit q"
   echo "  f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0"
   echo "faxgetty should now be running"
@@ -24,16 +22,20 @@ print_remove() {
 }
 
 post_install() {
-  groupadd -g 14 uucp &>/dev/null
-  useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
-  useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
+  post_upgrade
   print_install
 }
 
 post_upgrade() {
-  post_install
-  usermod -d '/' uucp
-  usermod -d '/' fax
+  groupadd -g 14 uucp &>/dev/null
+  useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
+  useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
+  chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc}
+  chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp}
+  chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
+  chown -R uucp /var/spool/hylafax/etc/templates
+  usermod -d '/' uucp &>/dev/null
+  usermod -d '/' fax &>/dev/null
 }
 
 pre_remove() {
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 47c3ccdac..030080c3f 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 144992 2011-12-13 18:04:12Z eric $
+# $Id: PKGBUILD 149151 2012-02-06 00:39:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.4.0
+pkgver=6.7.5.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
-depends=('libltdl' 'lcms2' 'libxt' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo')
+depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo')
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('f0310885972341b74670925b503ad8a8b05ad75d'
+sha1sums=('6970215ee2b95dbbf1b57b8d65e40b2d0d811acb'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD
index dd64f75a4..dda349ac6 100644
--- a/extra/imlib/PKGBUILD
+++ b/extra/imlib/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 134264 2011-08-02 18:15:21Z jgc $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 148786 2012-02-05 11:50:28Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=imlib
 pkgver=1.9.15
-pkgrel=10
+pkgrel=11
 pkgdesc="General image handling library for X11 and Gtk"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/imlib/"
 license=('GPL')
-depends=('gtk' 'giflib' 'libpng>=1.4.0' 'libtiff>=3.9.2-2' 'libjpeg>=8')
+depends=('gtk' 'giflib' 'libpng' 'libtiff')
 makedepends=('libxt')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
-        debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch libpng14.patch)
-md5sums=('7db987e6c52e4daf70d7d0f471238eae' '5f9da697934b6bd3b497ac9160ce4f5c'\
-         'b273d36aa60adbfaacaf6062234e4c1f' '33b832f0dc6c9723cd0dfe9c8d0a6797'\
-         '9d8a029f5fb05978db0dbcd4ff38fe23')
-sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'\
-         'ec1b47281c1a7fb21abe841f948ecc56ed13f310' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'\
-         '20ed6063ba787ac7c2677bb4b135c0b7285c52af')
+        debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch)
+sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
+          'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
+          'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
+          'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
+          '33c3aaa43eb624f2a6ab0406285a8515903333e3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/debian-bug448360.patch"
-  patch -Np1 -i "${srcdir}/CAN-2004-1026.patch"
-  patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
-  patch -Np1 -i "${srcdir}/libpng14.patch"
+  patch -p1 -i "${srcdir}/debian-bug448360.patch"
+  patch -p1 -i "${srcdir}/CAN-2004-1026.patch"
+  patch -p0 -i "${srcdir}/aclocal-fixes.patch"
+  patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch"
   sed '/AC_PATH_XTRA/d' -i configure.in
   libtoolize --force
   cp /usr/bin/libtool .
@@ -34,5 +32,9 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/imlib/imlib-1.9.15-libpng15.patch b/extra/imlib/imlib-1.9.15-libpng15.patch
new file mode 100644
index 000000000..7837cd488
--- /dev/null
+++ b/extra/imlib/imlib-1.9.15-libpng15.patch
@@ -0,0 +1,142 @@
+--- gdk_imlib/io-png.c
++++ gdk_imlib/io-png.c
+@@ -40,13 +40,13 @@
+       return NULL;
+     }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
+     }
+ 
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
+@@ -275,13 +275,13 @@
+       return NULL;
+     }
+   
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
+     }
+   
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
+@@ -301,6 +301,9 @@
+   /* Setup Translators */
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+     png_set_expand(png_ptr);
++  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
++    png_set_expand(png_ptr);
++
+   png_set_strip_16(png_ptr);
+   png_set_packing(png_ptr);
+   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+@@ -440,13 +443,13 @@
+ 		return NULL;
+ 	}
+ 	
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 		return NULL;
+ 	}
+ 	
+-	if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ 	{
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 		return NULL;
+@@ -635,7 +638,7 @@
+ 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ 	      return 0;
+ 	    }
+-	  if (setjmp(png_ptr->jmpbuf))
++	  if (setjmp(png_jmpbuf(png_ptr)))
+ 	    {
+ 	      fclose(f);
+ 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+--- Imlib/load.c
++++ Imlib/load.c
+@@ -197,12 +197,12 @@
+       png_destroy_read_struct(&png_ptr, NULL, NULL);
+       return NULL;
+     }
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
+     }
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
+@@ -260,7 +260,8 @@
+   png_read_image(png_ptr, lines);
+   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+   ptr = data;
+-  if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++  if (color_type == PNG_COLOR_TYPE_GRAY
++      || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+     {
+       for (y = 0; y < *h; y++)
+ 	{
+@@ -285,6 +286,7 @@
+ 	    }
+ 	}
+     }
++#if 0
+   else if (color_type == PNG_COLOR_TYPE_GRAY)
+     {
+       for (y = 0; y < *h; y++)
+@@ -300,6 +302,7 @@
+ 	    }
+ 	}
+     }
++#endif
+   else
+     {
+       for (y = 0; y < *h; y++)
+--- Imlib/save.c
++++ Imlib/save.c
+@@ -342,7 +342,7 @@
+ 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ 	      return 0;
+ 	    }
+-	  if (setjmp(png_ptr->jmpbuf))
++	  if (setjmp(png_jmpbuf(png_ptr)))
+ 	    {
+ 	      fclose(f);
+ 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+--- Imlib/utils.c
++++ Imlib/utils.c
+@@ -1981,14 +1981,13 @@
+       png_destroy_read_struct(&png_ptr, NULL, NULL);
+       return NULL;
+     }
+-  
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))  
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
+     }
+   
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 030f74f2d..191816935 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136939 2011-09-03 09:44:35Z ronald $
+# $Id: PKGBUILD 148788 2012-02-05 11:50:31Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Arjan Timmerman <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
 pkgver=1.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
 sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   # disable optimizations, they cause problems (e.g. FS#12268)
   [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx"
@@ -30,9 +30,9 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 
   # Install License
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 079ca3009..b7266212d 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143645 2011-11-28 00:27:02Z bisson $
+# $Id: PKGBUILD 148790 2012-02-05 11:50:35Z ibiru $
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.2
-pkgrel=5
+pkgrel=6
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -20,8 +20,10 @@ optdepends=('pstoedit: latex formulas'
             'pyxml: some extensions'
             'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'libpng15.patch')
+sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3'
+          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
 
 install=install
 
@@ -34,6 +36,8 @@ build() {
 	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
 	sed -i 's|"python"|"python2"|g' src/main.cpp
 
+	patch -p1 -i ../libpng15.patch
+
 	./configure --prefix=/usr \
 		--with-python \
 		--with-perl \
diff --git a/extra/inkscape/libpng15.patch b/extra/inkscape/libpng15.patch
new file mode 100644
index 000000000..e24913ed6
--- /dev/null
+++ b/extra/inkscape/libpng15.patch
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,7 @@
+         return NULL;
+     }
+     // Set error handler
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return NULL;
+     }
+--- inkscape-0.48.1/src/helper/png-write.cpp
++++ inkscape-0.48.1-mod//src/helper/png-write.cpp
+@@ -165,7 +165,7 @@
+     /* Set error handling.  REQUIRED if you aren't supplying your own
+      * error hadnling functions in the png_create_write_struct() call.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         /* If we get here, we had a problem reading the file */
+         fclose(fp);
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+--- inkscape-0.48.1/src/sp-image.cpp
++++ inkscape-0.48.1-mod//src/sp-image.cpp
+@@ -386,9 +386,13 @@
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+                 {
+-                    char* name = 0;
++                    png_charp name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++#if (PNG_LIBPNG_VER < 10500)
++                    png_charp profile = 0;
++#else
++                    png_bytep profile = 0;
++#endif
+                     png_uint_32 proflen = 0;
+                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
+ //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index f8c8a21f0..e5fcec80a 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146529 2012-01-12 16:16:17Z andyrtr $
+# $Id: PKGBUILD 148792 2012-02-05 11:50:44Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Guillaume ALAUX <guillaume@archlinux.org>
@@ -24,26 +24,25 @@ _OPENJDK_CHANGESET=0a76e5390e68
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
 options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 
-             'alsa-lib' 'apache-ant>=1.8.1' 'giflib'
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
+             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
              'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`?
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive
-#_url=http://icedtea.classpath.org/hg/icedtea7-forest/archive
+_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-        ${_url}/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
-        ${_url}/${_CORBA_CHANGESET}.tar.gz						# corba.tar.gz
-        ${_url}/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
-        ${_url}/${_JAXWS_CHANGESET}.tar.gz						# jaxws.tar.gz
-        ${_url}/${_JDK_CHANGESET}.tar.gz						# jdk.tar.gz
-        ${_url}/${_LANGTOOLS_CHANGESET}.tar.gz						# langtools.tar.gz
-        ${_url}/${_HOTSPOT_CHANGESET}.tar.gz						# hotspot.tar.gz
+        ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
+        ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
+        ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
+        ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz					# jaxws.tar.gz
+        ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz						# jdk.tar.gz
+        ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
+        ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
         fontconfig-paths.diff
         fix_corba_cmds_path.diff
         openjdk7_fix_jdk_cmds_path.diff
@@ -52,19 +51,9 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh
-	glibc2_15.diff)
-
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
-           "${_CORBA_CHANGESET}.tar.gz"
-           "${_JAXP_CHANGESET}.tar.gz"
-           "${_JAXWS_CHANGESET}.tar.gz"
-           "${_JDK_CHANGESET}.tar.gz"
-           "${_LANGTOOLS_CHANGESET}.tar.gz"
-           "${_HOTSPOT_CHANGESET}.tar.gz")
+        glibc2_15.diff)
 md5sums=('752721a037a625001fad7a5fc2013f60'
-         'ffb12013564794e9abbffbbbd0c58502'
+         '4c34ddf70124ea90c79201c1afede3e3'
          '8f8d222d0a6d363d06b40576da5f1ea2'
          '4abf34372e34cccd74ad337e487ed790'
          'f2f40590a83889b8aa1d4631b705092d'
@@ -81,6 +70,16 @@ md5sums=('752721a037a625001fad7a5fc2013f60'
          '62443459da0cb28181feb260dc0e5ce7'
          'a4293acadff03bdccbc9b412ad288549')
 
+#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
+
+noextract=("${_OPENJDK_CHANGESET}.tar.gz"
+           "${_CORBA_CHANGESET}.tar.gz"
+           "${_JAXP_CHANGESET}.tar.gz"
+           "${_JAXWS_CHANGESET}.tar.gz"
+           "${_JDK_CHANGESET}.tar.gz"
+           "${_LANGTOOLS_CHANGESET}.tar.gz"
+           "${_HOTSPOT_CHANGESET}.tar.gz")
+
   _jvmdir=/usr/lib/jvm/java-7-openjdk
   
   [ "$CARCH" = "x86_64" ] && _JARCH=amd64
@@ -144,16 +143,16 @@ package_jre7-openjdk-headless() {
   optdepends=('libcups: needed for Java Mauve support - libmawt.so'
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime=7')
-  conflicts=('java-runtime')
+  conflicts=('java-runtime' 'openjdk6')
   #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
   backup=(etc/profile.d/jre.sh
           etc/profile.d/jre.csh
           etc/java-7-openjdk/calendars.properties
-	  etc/java-7-openjdk/content-types.properties
+          etc/java-7-openjdk/content-types.properties
           etc/java-7-openjdk/cursors/cursors.properties
           etc/java-7-openjdk/flavormap.properties
           etc/java-7-openjdk/fontconfig.bfc
-	  etc/java-7-openjdk/fontconfig.properties
+          etc/java-7-openjdk/fontconfig.properties
           etc/java-7-openjdk/jvm.cfg
           etc/java-7-openjdk/logging.properties
           etc/java-7-openjdk/management/jmxremote.access
@@ -265,9 +264,10 @@ package_jre7-openjdk() {
              'alsa-lib: for basic sound support'
              'giflib: for gif format support'
              'libpulse: for advanced sound support'
-	     'gtk2: for the Gtk+ look and feel - desktop usage')
+             'gtk2: for the Gtk+ look and feel - desktop usage')
   install=jre7-openjdk.install
-
+  conflicts=('openjdk6')
+  
   mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
   # Link binaries into /usr/bin
   pushd ${pkgdir}/${_jvmdir}/jre/bin
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 0007c1aa5..07e7d24db 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147788 2012-01-28 10:33:01Z andrea $
+# $Id: PKGBUILD 148794 2012-02-05 11:50:50Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index 5f07c1c52..7786910e0 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147772 2012-01-28 10:32:30Z andrea $
+# $Id: PKGBUILD 148796 2012-02-05 11:50:53Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64')
 url="http://kde.org/applications/graphics/okular/"
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index 0ca0ef0c0..8d3dcf813 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147887 2012-01-28 10:36:13Z andrea $
+# $Id: PKGBUILD 148798 2012-02-05 11:50:57Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index a33b8ed25..4b1862b2f 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 123704 2011-05-12 16:07:27Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 148802 2012-02-05 11:51:08Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=11
+pkgrel=12
 pkgdesc='KDE3 Core Libraries'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
-         'bzip2' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf')
+         'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+makedepends=('cups' 'hspell')
+optdepends=('hspell: for Hebrew spell-checking support')
 options=('libtool')
-install='kdelibs3.install'
+install=kdelibs3.install
 source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2"
         'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
         'acinclude.patch'
         'kde3.profile'
         'kde4-compatibility.patch'
         'kconf_updaterc'
-        'openssl.patch')
-md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
-         'ca50d4515468cfda80946690c53073f3'
-         'a5aedcc9550809ce6672a7dddf9f5ad4'
-         'ab14ce2c40698e24e162284d50c6f466'
-         'f4e0735475b5de59d738d68a9f467b77'
-         '11e49bc6aca497f55610146afe217751'
-         '242f0e4750c019e62e285c0aad0c03b8')
+        'openssl.patch'
+        'kdelibs3-missing-include.patch')
+sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
+          'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
+          '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
+          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
+          '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
+          '35e56fe4c5f71685e64b13f448dcacc620166e06'
+          '50e92950498463defb9149ffcf8cbc2e8cd1063b'
+          'e5f5b8c060a2db9cedb82bf18caadfa869921779')
 
 build() {
 	cd "$srcdir"/kdelibs-${pkgver}
@@ -39,7 +42,8 @@ build() {
 	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
 	patch -p1 -i "$srcdir"/acinclude.patch
 	patch -p1 -i "$srcdir"/kde4-compatibility.patch
-    patch -p1 -i "${srcdir}"/openssl.patch
+	patch -p1 -i "${srcdir}"/openssl.patch
+	patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
 
 	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
 	make -f admin/Makefile.common cvs
diff --git a/extra/kdelibs3/kdelibs3-missing-include.patch b/extra/kdelibs3/kdelibs3-missing-include.patch
new file mode 100644
index 000000000..5b84ef746
--- /dev/null
+++ b/extra/kdelibs3/kdelibs3-missing-include.patch
@@ -0,0 +1,10 @@
+--- kdeprint/cups/cupsdconf2/cups-util.c.old	2012-01-19 01:30:26.000000000 -0500
++++ kdeprint/cups/cupsdconf2/cups-util.c	2012-01-19 01:31:33.000000000 -0500
+@@ -2,6 +2,7 @@
+ #include <cups/http.h>
+ #include <cups/cups.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index f0be52a61..8f5b25f43 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142654 2011-11-12 17:18:33Z ibiru $
+# $Id: PKGBUILD 148804 2012-02-05 11:51:14Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,7 +37,7 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=11
+pkgrel=12
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index baf833da8..c60fc2e76 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135692 2011-08-17 10:30:13Z tpowa $
+# $Id: PKGBUILD 148806 2012-02-05 11:51:19Z ibiru $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.14.2
-pkgrel=4
+pkgrel=5
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -11,6 +11,7 @@ url="http://lablgtk.forge.ocamlcore.org/"
 depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2')
 makedepends=('ocaml')
 optdepends=('ocaml: for using the tools')
+DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u')
 source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
 options=(!makeflags)
 md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
@@ -20,6 +21,10 @@ build() {
   ./configure --prefix=/usr
   make world
   make opt
+}
+
+package() {
+  cd "${srcdir}/lablgtk-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/"
 }
diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD
index fa036bb63..6e49b8df6 100644
--- a/extra/lbreakout2/PKGBUILD
+++ b/extra/lbreakout2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143790 2011-11-29 11:41:15Z giovanni $
+# $Id: PKGBUILD 148808 2012-02-05 11:51:24Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=lbreakout2
 pkgver=2.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A breakout game with nice effects, graphics, and sounds"
 arch=('i686' 'x86_64')
 url="http://lgames.sourceforge.net"
diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD
index effc73c13..a8706fe41 100644
--- a/extra/lcms/PKGBUILD
+++ b/extra/lcms/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 87526 2010-08-15 13:47:09Z ibiru $
+# $Id: PKGBUILD 148810 2012-02-05 11:51:27Z ibiru $
 # Maintainer: Tobias Kieslich <neri@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=lcms
 pkgver=1.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight color management development library/engine"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
-depends=('libtiff>=3.9.4')
+depends=('libtiff')
 url="http://www.littlecms.com"
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('8af94611baf20d9646c7c2c285859818')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
-  make DESTDIR=${pkgdir} install
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   install -Dm 644 COPYING \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index 0ac1474d8..e60188213 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145076 2011-12-16 15:20:33Z eric $
+# $Id: PKGBUILD 148812 2012-02-05 11:51:30Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=lcms2
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Small-footprint color management engine, version 2"
 arch=('i686' 'x86_64')
 license=('MIT')
diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD
index 8107c96b2..c2e9cebc4 100644
--- a/extra/libao/PKGBUILD
+++ b/extra/libao/PKGBUILD
@@ -1,42 +1,39 @@
-# $Id: PKGBUILD 110917 2011-02-23 07:11:30Z schiv $
-# Maintainer:
+# $Id: PKGBUILD 149069 2012-02-05 16:27:23Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libao
 pkgver=1.1.0
-pkgrel=1
-pkgdesc="A cross-platform audio output library and plugins"
-url="http://www.xiph.org/ao"
+pkgrel=2
+pkgdesc='Cross-platform audio output library and plugins'
+url='http://xiph.org/ao/'
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('glibc' 'alsa-lib')
+options=('!libtool')
+depends=('alsa-lib')
 makedepends=('libpulse')
 backup=('etc/libao.conf')
-options=('!libtool')
-conflicts=('libao-pulse')
-provides=('libao-pulse=$pkgver-$pkgrel')
-replaces=('libao-pulse')
 source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz"
         'libao.conf')
-md5sums=('2b2508c29bc97e4dc218fa162cf883c8'
-         '3ae8f3e3f1492210b3519af0f1f3c572')
+sha1sums=('9301bc4886f170c7122ab62677fb71cf001c04fd'
+          '558b3d297e0956af6959565db477023dbd492ca0')
+
+conflicts=('libao-pulse')
+provides=("libao-pulse=${pkgver}-${pkgrel}")
+replaces=('libao-pulse')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure \
+		--prefix=/usr \
+		--enable-alsa-mmap \
 
-  ./configure --prefix=/usr \
-              --enable-alsa09-mmap \
-              --enable-pulseaudio
-  make
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # Add conf file
-  install -Dm644 "$srcdir/libao.conf" "$pkgdir/etc/libao.conf"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 "${srcdir}"/libao.conf "${pkgdir}"/etc/libao.conf
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/libbonoboui/PKGBUILD b/extra/libbonoboui/PKGBUILD
index ef75ec844..149816cbd 100644
--- a/extra/libbonoboui/PKGBUILD
+++ b/extra/libbonoboui/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 117635 2011-04-04 14:22:52Z ibiru $
+# $Id: PKGBUILD 148814 2012-02-05 11:51:34Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonoboui
 pkgver=2.24.5
-pkgrel=1
+pkgrel=2
 pkgdesc="User Interface library for Bonobo"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('libgnomecanvas' 'libgnome')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool' 'pkg-config')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
@@ -19,6 +19,10 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop"
 }
diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD
index d1ee325e4..2a4fbb70a 100644
--- a/extra/libchewing/PKGBUILD
+++ b/extra/libchewing/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 111534 2011-02-27 15:03:24Z bisson $
+# $Id: PKGBUILD 149033 2012-02-05 15:05:03Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: whisky <archlinux.cle(at)gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libchewing
 pkgver=0.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Intelligent Zhuyin input method library for traditional Chinese'
 arch=('i686' 'x86_64')
 url='http://chewing.csie.net/'
diff --git a/extra/libcue/PKGBUILD b/extra/libcue/PKGBUILD
index 95e1c4d21..2802c53de 100644
--- a/extra/libcue/PKGBUILD
+++ b/extra/libcue/PKGBUILD
@@ -1,24 +1,26 @@
-# Maintainer: Gaetan Bisson <bisson@archlinux.org> 
+# $Id: PKGBUILD 149035 2012-02-05 15:06:24Z bisson $
 # Contributor: said <atvordhosbn[at]gmail[dot]com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org> 
 
 pkgname=libcue
 pkgver=1.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Parses so-called cue sheets and handles the parsed data'
-arch=('i686' 'x86_64')
 url='http://sourceforge.net/projects/libcue/'
+arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('glibc')
-source=("http://downloads.sourceforge.net/libcue/$pkgname-$pkgver.tar.bz2")
+options=('!libtool')
+source=("http://downloads.sourceforge.net/libcue/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('3fd31f2da7c0e3967d5f56363f3051a85a8fd50d')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./autogen.sh --prefix=/usr
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./autogen.sh --prefix=/usr --disable-static
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libdaemon/PKGBUILD b/extra/libdaemon/PKGBUILD
index c6bbc1c9c..f12c1fa55 100644
--- a/extra/libdaemon/PKGBUILD
+++ b/extra/libdaemon/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 67404 2010-02-06 18:19:24Z giovanni $
+# $Id: PKGBUILD 149075 2012-02-05 16:45:57Z bisson $
 # Contributor: Manolis Tzanidakis
-# Contributor: Mark Rosenstand &lt;mark@archlinux.org&gt;
-# Maintainer: Thayer Williams &lt;thayer@archlinux.org&gt;
+# Contributor: Mark Rosenstand <mark@archlinux.org>
+# Contributor: Thayer Williams <thayer@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libdaemon
 pkgver=0.14
-pkgrel=1
-pkgdesc="A lightweight C library which eases the writing of UNIX daemons"
-url="http://0pointer.de/lennart/projects/libdaemon/"
+pkgrel=2
+pkgdesc='Lightweight C library that eases the writing of UNIX daemons'
+url='http://0pointer.de/lennart/projects/libdaemon/'
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('glibc')
-source=(http://0pointer.de/lennart/projects/libdaemon/$pkgname-$pkgver.tar.gz)
+source=("http://0pointer.de/lennart/projects/libdaemon/${pkgname}-${pkgver}.tar.gz")
 options=('!libtool')
-md5sums=('509dc27107c21bcd9fbf2f95f5669563')
+sha1sums=('78a4db58cf3a7a8906c35592434e37680ca83b8f')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --localstatedir=/var --disable-lynx || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --localstatedir=/var --disable-lynx --disable-static
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
 
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index fb532e990..93cdb87d1 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 125725 2011-05-28 15:53:41Z ibiru $
+# $Id: PKGBUILD 148816 2012-02-05 11:51:38Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libdmapsharing
 pkgver=2.9.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that implements the DMAP family of protocols"
 arch=('i686' 'x86_64')
 url="http://www.flyn.org/projects/libdmapsharing/index.html"
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index f8d253881..84e3f4569 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111499 2011-02-27 11:15:27Z daniel $
+# $Id: PKGBUILD 148818 2012-02-05 11:51:42Z ibiru $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=libgdiplus
 pkgver=2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source Implementation of the GDI+ API"
 arch=(i686 x86_64)
 license=('MPL' 'LGPL')
@@ -11,12 +11,15 @@ url="http://www.mono-project.com"
 depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('451966e8f637e3a1f02d1d30f900255d')
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch)
+md5sums=('451966e8f637e3a1f02d1d30f900255d'
+         'a2d143676bbaceeb88b4c34069e93986')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 <../libpng15.patch
   ./configure --prefix=/usr --with-cairo=system || return 1
+  
   make || return 1
 }
 
diff --git a/extra/libgdiplus/libpng15.patch b/extra/libgdiplus/libpng15.patch
new file mode 100644
index 000000000..31a1c0162
--- /dev/null
+++ b/extra/libgdiplus/libpng15.patch
@@ -0,0 +1,164 @@
+$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/pngcodec.c.orig	2010-11-03 16:52:54.000000000 +0000
++++ src/pngcodec.c
+@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn
+ 	bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);
+ 	bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);
+ #elif defined(PNG_pHYs_SUPPORTED)
+-	if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {
+-		bitmap_data->image_flags |= ImageFlagsHasRealDPI;
+-		bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;
+-		bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;
++	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
++		png_uint_32 res_x, res_y;
++		int unit_type;
++		png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type);
++		if (unit_type == PNG_RESOLUTION_METER) {
++			bitmap_data->image_flags |= ImageFlagsHasRealDPI;
++			bitmap_data->dpi_horz = res_x * 0.0254;
++			bitmap_data->dpi_vert = res_y * 0.0254;
++		}
+ 	}
+ #endif
+ 	/* default to screen resolution (if nothing was provided or available) */
+@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn
+ #if defined(PNG_iCCP_SUPPORTED)
+ 	{
+ 		png_charp	name;
+-		png_charp	profile;
++		png_bytep	profile;
+ 		png_uint_32	proflen;
+ 		int		compression_type;
+ 
+@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream 
+ 		ImageFlags	colourspace_flag;
+ 		int		i;
+ 		int		j;
++		png_colorp	png_palette;
++		int		png_num_palette;
++		png_bytep	trans_alpha;
++		int		num_trans;
++		png_color_16p	trans_color;
+ 
+ 		width = png_get_image_width (png_ptr, info_ptr);
+ 		height = png_get_image_height (png_ptr, info_ptr);
+@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream 
+ 		}
+ 
+ 		/* Copy palette. */
++		png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
++
+ 		num_colours = 1 << bit_depth;
+ 
+ 		if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
+@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream 
+ 			colourspace_flag = ImageFlagsColorSpaceRGB;
+ 
+ 			palette_entries = num_colours;
+-			if (palette_entries > info_ptr->num_palette) {
+-				palette_entries = info_ptr->num_palette;
++			if (palette_entries > png_num_palette) {
++				palette_entries = png_num_palette;
+ 			}
+ 
+ 			palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB));
+@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream 
+ 
+ 			for (i=0; i < palette_entries; i++) {
+ 				set_pixel_bgra (&palette->Entries[i], 0,
+-						info_ptr->palette[i].blue,
+-						info_ptr->palette[i].green,
+-						info_ptr->palette[i].red,
++						png_palette[i].blue,
++						png_palette[i].green,
++						png_palette[i].red,
+ 						0xFF); /* alpha */
+ 			}
+ 		}
+ 
++		png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
+ 		/* Make sure transparency is respected. */
+-		if (info_ptr->num_trans > 0) {
++		if (num_trans > 0) {
+ 			palette->Flags |= PaletteFlagsHasAlpha;
+ 			colourspace_flag |= ImageFlagsHasAlpha;
+ 
+-			if (info_ptr->num_trans > info_ptr->num_palette) {
+-				info_ptr->num_trans = info_ptr->num_palette;
++			if (num_trans > png_num_palette) {
++				num_trans = png_num_palette;
+ 			}
+ 
+-			for (i=0; i < info_ptr->num_trans; i++) {
++			for (i=0; i < num_trans; i++) {
+ 				set_pixel_bgra(&palette->Entries[i], 0,
+-						info_ptr->palette[i].blue,
+-						info_ptr->palette[i].green,
+-						info_ptr->palette[i].red,
++						png_palette[i].blue,
++						png_palette[i].green,
++						png_palette[i].red,
+ #if PNG_LIBPNG_VER > 10399
+-						info_ptr->trans_alpha [i]); /* alpha */
++						trans_alpha [i]); /* alpha */
+ #else
+ 						info_ptr->trans[i]); /* alpha */
+ #endif
+@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream 
+ 		BYTE		bit_depth;
+ 		int		stride;
+ 		int		interlace;
++		png_colorp	png_palette;
++		int		png_num_palette;
+ 		png_bytep *row_pointers;
+ 		BYTE *rawptr;
+ 		int i, j;
+@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream 
+ 							png_byte palette = 0;
+ 							png_byte pix = *rowp++;
+ 
++							png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
+ 							palette = (pix >> 6) & 0x03;
+ 							set_pixel_bgra (rawptr, 0,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 
+ 							palette = (pix >> 4) & 0x03;
+ 							set_pixel_bgra (rawptr, 4,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 
+ 							palette = (pix >> 2) & 0x03;
+ 							set_pixel_bgra (rawptr, 8,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 
+ 							palette = pix & 0x03;
+ 							set_pixel_bgra (rawptr, 12,
+-								info_ptr->palette[palette].blue,
+-								info_ptr->palette[palette].green,
+-								info_ptr->palette[palette].red,
++								png_palette[palette].blue,
++								png_palette[palette].green,
++								png_palette[palette].red,
+ 								0xFF); /* alpha */
+ 							rawptr += 16;
+ 						}
diff --git a/extra/libgnome-media-profiles/PKGBUILD b/extra/libgnome-media-profiles/PKGBUILD
index 93472debf..9cb1b849c 100644
--- a/extra/libgnome-media-profiles/PKGBUILD
+++ b/extra/libgnome-media-profiles/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117708 2011-04-04 16:55:18Z ibiru $
+# $Id: PKGBUILD 148822 2012-02-05 11:51:50Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libgnome-media-profiles
 pkgver=3.0.0
-pkgrel=2
-pkgdesc=""
+pkgrel=3
+pkgdesc="Library for management of audio recording profiles"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=('GPL2')
@@ -20,6 +20,9 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
     --disable-static -disable-scrollkeeper \
     --disable-schemas-install
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
diff --git a/extra/libgnomecanvas/PKGBUILD b/extra/libgnomecanvas/PKGBUILD
index 6bc8b6893..0fc8f1391 100644
--- a/extra/libgnomecanvas/PKGBUILD
+++ b/extra/libgnomecanvas/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 108491 2011-01-31 15:14:46Z jgc $
+# $Id: PKGBUILD 148820 2012-02-05 11:51:45Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomecanvas
 pkgver=2.30.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Canvas library"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21')
-makedepends=('pkgconfig' 'intltool')
+makedepends=('pkg-config' 'intltool')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
@@ -19,5 +19,9 @@ build() {
   ./configure --prefix=/usr --disable-static \
       --enable-glade
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgnomeui/PKGBUILD b/extra/libgnomeui/PKGBUILD
index 7538c8acc..22afc28e6 100644
--- a/extra/libgnomeui/PKGBUILD
+++ b/extra/libgnomeui/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 91726 2010-09-27 18:45:46Z ibiru $
+# $Id: PKGBUILD 148824 2012-02-05 11:51:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomeui
-pkgver=2.24.4
+pkgver=2.24.5
 pkgrel=1
 pkgdesc="User Interface library for GNOME"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.31.92' 'libsm')
-makedepends=('intltool' 'pkgconfig')
+depends=('libbonoboui' 'libgnome-keyring' 'libsm')
+makedepends=('intltool' 'pkg-config')
 options=('!libtool')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2)
+sha256sums=('ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/libgnomeui
   make
-  make DESTDIR="${pkgdir}" install
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 18e28d3e2..d37438633 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138079 2011-09-16 07:31:23Z ibiru $
+# $Id: PKGBUILD 148826 2012-02-05 11:51:56Z ibiru $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libgpod
 pkgver=0.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A shared library to access the contents of an iPod"
 arch=(i686 x86_64)
 license=('LGPL')
diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD
index ff795d406..354ced8c4 100644
--- a/extra/libgtkhtml/PKGBUILD
+++ b/extra/libgtkhtml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121256 2011-04-29 21:48:54Z andyrtr $
+# $Id: PKGBUILD 148828 2012-02-05 11:51:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgtkhtml
 pkgver=2.11.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An HTML library for GTK"
 arch=(i686 x86_64)
 license=('LGPL')
diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD
index 85f758c52..14be6a2d6 100644
--- a/extra/libotf/PKGBUILD
+++ b/extra/libotf/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 100934 2010-11-26 17:51:11Z bisson $
+# $Id: PKGBUILD 149040 2012-02-05 15:14:11Z bisson $
 # Contributor: Ashish Shukla <wahjava.ml@gmail.com>
 
 pkgname=libotf
 pkgver=0.9.12
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenType Font library'
 url='http://www.m17n.org/libotf/'
-arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('libxaw' 'freetype2')
 options=('!libtool')
+arch=('i686' 'x86_64')
+depends=('libxaw' 'freetype2')
 source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('47872f696a62e8f111960143f3f36b5366398e20')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr
+	./configure --prefix=/usr --disable-static
 	make
 }
 
diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD
index 77e86cba1..2529987dd 100644
--- a/extra/libotr/PKGBUILD
+++ b/extra/libotr/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 121299 2011-04-30 13:17:51Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 149079 2012-02-05 16:55:15Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Bug <Bug2000@gmail.com>
 
 pkgname=libotr
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Off-the-Record Messaging Library and Toolkit'
-arch=('i686' 'x86_64')
 url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
 depends=('libgcrypt')
 options=('!libtool')
 source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz")
-md5sums=('faba02e60f64e492838929be2272f839')
+sha1sums=('e5e10b8ddaf59b0ada6046d156d0431cd2790db9')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --mandir=/usr/share/man
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --mandir=/usr/share/man --disable-static
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libots/PKGBUILD b/extra/libots/PKGBUILD
index cd749e574..42f7bcea8 100644
--- a/extra/libots/PKGBUILD
+++ b/extra/libots/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 88136 2010-08-19 19:25:04Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 149081 2012-02-05 16:59:38Z bisson $
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libots
 pkgver=0.5.0
-pkgrel=2
-pkgdesc="Open Text Summarizer"
+pkgrel=3
+pkgdesc='Open Text Summarizer'
+url='http://libots.sourceforge.net/'
 arch=('i686' 'x86_64')
-url="http://libots.sourceforge.net/"
 license=('GPL')
 depends=('libxml2' 'glib2')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/ots-${pkgver}.tar.gz)
-md5sums=('1e140a4bf9d720b4339a5c2bdf4976e8')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/ots-${pkgver}.tar.gz")
+sha1sums=('4468bc06470734848c2369a37c84f76ca4ac3f9a')
 
 
 build() {
-  cd "${srcdir}/ots-${pkgver}"
-  touch gtk-doc.make
-  sed -i -e 's/en.xml$//' dic/Makefile.am
-  libtoolize --force
-  aclocal
-  automake --add-missing --force
-  autoconf
-  ./configure --prefix=/usr --disable-static
-  make
-  make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/ots-${pkgver}"
+	touch gtk-doc.make
+	sed -i -e 's/en.xml$//' dic/Makefile.am
+	libtoolize --force
+	aclocal
+	automake --add-missing --force
+	autoconf
+	./configure --prefix=/usr --disable-static
+	make
+}
+
+package() {
+	cd "${srcdir}/ots-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD
index 472c52610..a2e8e594b 100644
--- a/extra/libpano13/PKGBUILD
+++ b/extra/libpano13/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126350 2011-06-05 00:52:37Z eric $
+# $Id: PKGBUILD 148830 2012-02-05 11:52:01Z ibiru $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libpano13
 pkgver=2.9.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools"
 arch=('i686' 'x86_64')
 url="http://panotools.sourceforge.net/"
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 531e9397e..7d26a676c 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 130820 2011-07-08 07:28:34Z andyrtr $
+# $Id: PKGBUILD 148832 2012-02-05 11:52:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.4.8
-_apngver=1.4.7
+pkgver=1.5.8
+_apngver=1.5.7
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
@@ -14,28 +14,28 @@ url="http://www.libpng.org/pub/png/libpng.html"
 license=('custom')
 depends=('zlib' 'sh')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
-md5sums=('2ce595d571f2b06a9403ed5bcfa4ecbd'
-         '4842a4cba3487a64084ca0a7417ff1c7')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
+        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
+md5sums=('0f7ae352beadaff78073733905613041'
+         '6c6a674048cec94db1bc35decf0d142c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   # Add animated PNG (apng) support
   # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
+  patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 
   cd contrib/pngminus
-  make PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-  install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/"
-  install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png
+  install -m755 png2pnm pnm2png "$pkgdir/usr/bin/"
+  install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 53a37e5c8..bf7c8472b 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146608 2012-01-14 08:15:18Z andyrtr $
+# $Id: PKGBUILD 148834 2012-02-05 11:52:15Z ibiru $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -37,7 +37,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.5.2
 pkgver=3.4.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
diff --git a/extra/libreoffice/PKGBUILD.next_stable b/extra/libreoffice/PKGBUILD.next_stable
index a25819863..a8cb4c5ad 100644
--- a/extra/libreoffice/PKGBUILD.next_stable
+++ b/extra/libreoffice/PKGBUILD.next_stable
@@ -18,9 +18,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder')
-_LOver=3.4.99.2
-pkgver=3.5.0beta2
-pkgrel=2
+_LOver=3.4.99.3
+pkgver=3.5.0beta3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -44,7 +44,8 @@ makedepends=( # makedepends
 _mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
+	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	${_additional_source_url}/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -73,8 +74,9 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	#${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
-	fix_menuicons.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=c3569696294bb264a0c645db12f027d44b4e033f)
-noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
+	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810)
+noextract=(053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
+	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -103,10 +105,11 @@ noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 #	cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 )
-md5sums=('e80d9d4b6c6b2a8be882a46bc8757e69'
-         '31471ad86996629a8c20f3a4d24ee03e'
-         '3146b8522605d24ce4a259fe73ec3519'
-         'a8b25a0bf696fd126a08319d88998492'
+md5sums=('3f223ec797a100e557f7138c8ab4a91b'
+         'bb08c856e5c9a7a8bcf22fefdb7cf13f'
+         '83bd4be3370840de3e535b2c974e8af5'
+         'f02578f5218f217a9f20e9c30e119c6a'
+         '053a35c244bf132f806e198ac4d960aa'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -134,7 +137,7 @@ md5sums=('e80d9d4b6c6b2a8be882a46bc8757e69'
          '7c2549f6b0a8bb604e6c4c729ffdcfe6'
          '185d60944ea767075d27247c3162b3bc'
          '60ce5dc9bd098f95c2e621a930c98dd9'
-         'f9bd737527dafd3eeb451cf0dd95d7d6')
+         '661a52a02a31b3afbe4b3b3146061afd')
 
 build() {
 
@@ -157,8 +160,8 @@ build() {
 	# buildfixes & bugfixes
 	# one late fix to solve make distro-pack-install issue
 	patch -Np1 -i ${srcdir}/gmake_install.diff
-	patch -Np1 -i ${srcdir}/fix_menuicons.diff
-
+	patch -Np1 -i ${srcdir}/smp_buildfix.diff
+	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 #	unset CFLAGS
@@ -180,7 +183,7 @@ build() {
 	# non-SMP test build
 #	export MAKEFLAGS="-j1"
 	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-	touch autogen.lastrun
+#	touch autogen.lastrun
 	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 		--with-unix-wrapper="libreoffice" \
 		--enable-split-app-modules \
@@ -232,7 +235,7 @@ build() {
 		--without-system-mozilla \
 		--without-system-mozilla-headers \
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--with-system-boost\
+		--without-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mythes\
@@ -258,8 +261,6 @@ build() {
 
 	touch src.downloaded
 	#./download
-#	unset MAKEFLAGS
-#	./bootstrap
 	make
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 77f71d413..6cd022366 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 142891 2011-11-17 18:34:59Z ibiru $
+# $Id: PKGBUILD 148836 2012-02-05 11:52:19Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
 pkgver=2.34.2
-pkgrel=1
+pkgrel=3
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gdk-pixbuf2' 'pango' 'libcroco')
+depends=('gdk-pixbuf2>=2.24.1-3' 'pango' 'libcroco')
 makedepends=('intltool' 'gtk2')
 optdepends=('gtk2: for rsvg-view support')
 options=('!libtool' '!emptydirs')
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index 1624b2a52..96058d1c0 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 119577 2011-04-12 14:21:49Z eric $
+# $Id: PKGBUILD 148838 2012-02-05 11:52:24Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libtiff
-pkgver=3.9.5
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64')
 url="http://www.remotesensing.org/libtiff/"
 license=('custom')
-depends=('libjpeg' 'zlib')
-makedepends=('libgl' 'freeglut' 'libxmu' 'libxi')
+depends=('libjpeg' 'zlib' 'xz')
+makedepends=('freeglut')
 optdepends=('freeglut: for using tiffgt')
 options=('!libtool')
 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-md5sums=('8fc7ce3b4e1d0cc8a319336967815084')
-sha1sums=('f40aab20fb2f609b5cbc1171c40b66a1445e3773')
+sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522')
 
 build() {
   cd "${srcdir}/tiff-${pkgver}"
@@ -22,6 +21,11 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/tiff-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/tiff-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/libunique3/PKGBUILD b/extra/libunique3/PKGBUILD
index cb9155eeb..13f57a335 100644
--- a/extra/libunique3/PKGBUILD
+++ b/extra/libunique3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 127496 2011-06-15 15:11:19Z ibiru $
+# $Id: PKGBUILD 148840 2012-02-05 11:52:26Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=libunique3
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for writing single instance applications for GTK3"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -10,11 +10,11 @@ depends=('gtk3')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 url="http://live.gnome.org/LibUnique"
-source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-${pkgver}.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz)
 sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038')
 
 build() {
-  cd "${srcdir}/libunique-${pkgver}"
+  cd "$srcdir/libunique-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --disable-dbus
@@ -22,6 +22,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/libunique-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/libunique-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD
index 82623f37a..eb3ee4e7d 100644
--- a/extra/libupnp/PKGBUILD
+++ b/extra/libupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143080 2011-11-22 13:19:50Z giovanni $
+# $Id: PKGBUILD 149147 2012-02-06 00:20:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org> 
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=libupnp
-pkgver=1.6.14
+pkgver=1.6.15
 pkgrel=1
 pkgdesc="Portable Open Source UPnP Development Kit"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a0497cf15b3e15f7e7ede88b3d04861b')
+md5sums=('1b21e5b5fb6185101c467aefd19f0bf7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD
index 604b8788e..dc652b890 100644
--- a/extra/libvisual-plugins/PKGBUILD
+++ b/extra/libvisual-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135107 2011-08-10 10:33:28Z jgc $
+# $Id: PKGBUILD 148842 2012-02-05 11:52:32Z ibiru $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=libvisual-plugins
 pkgver=0.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="plugins for libvisual"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -40,5 +40,9 @@ build() {
       --disable-gforce \
       --disable-esd
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
index 9cbac31f9..315690cfc 100644
--- a/extra/libwebkit/PKGBUILD
+++ b/extra/libwebkit/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 139389 2011-10-01 19:00:15Z ibiru $
+# $Id: PKGBUILD 148844 2012-02-05 11:52:38Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.6.1
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="An opensource web content engine"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('c11743694b1b71dad287b2e7a9e73b05')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3')
 
 build() {
-  cd "${srcdir}/webkit-${pkgver}"
+  cd "$srcdir/webkit-$pkgver"
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2 && _build --with-gtk=2.0 )
@@ -27,7 +27,7 @@ build() {
 _build() {
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
     --enable-introspection \
-    --with-font-backend=freetype --enable-gtk-doc \
+    --with-font-backend=freetype \
     --with-unicode-backend=icu \
     --enable-spellcheck "$@"
   make all stamp-po
@@ -39,14 +39,14 @@ package_libwebkit() {
 
   cd "$srcdir/webkit-$pkgver/build-gtk2"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
 }
 
 package_libwebkit3() {
   pkgdesc+=" (for GTK3)"
   depends+=(gtk3)
 
-  cd "${srcdir}/webkit-${pkgver}/build-gtk3"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
+  cd "$srcdir/webkit-$pkgver/build-gtk3"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
 }
diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD
index 12061510c..e6ac70a29 100644
--- a/extra/libwmf/PKGBUILD
+++ b/extra/libwmf/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 87507 2010-08-15 06:45:18Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: FJ <joostef@gmail.com>
+# $Id: PKGBUILD 148846 2012-02-05 11:52:43Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libwmf
 pkgver=0.2.8.4
-pkgrel=8
+pkgrel=9
 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
 arch=('i686' 'x86_64')
 url="http://wvware.sourceforge.net/libwmf.html"
-license=("LGPL")
-depends=('libpng' 'libx11' 'freetype2' 'libjpeg' 'gsfonts' 'expat')
-makedepends=('gtk2' 'libxt' 'pkg-config')
+license=('LGPL')
+depends=('libpng' 'libx11' 'libjpeg' 'gsfonts')
+makedepends=('gtk2' 'libxt')
+optdepends=('gdk-pixbuf2: for pixbuf loader')
 options=('!libtool' '!docs' '!emptydirs')
 install=libwmf.install
 source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz
-	libpng14.patch libwmf-0.2.8.4-useafterfree.patch)
-md5sums=('d1177739bf1ceb07f57421f0cee191e0' '33d3c07a1be9f99fd88de220930c5550'\
-         '0f02c1cb8a87bf7158634503bf0537e2')
-sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' '15edb94eec7c9cea988e83660b334e56bf1fe897'\
-         'ea6d28880840e86c96f9079bfd591da54dcffa5c')
+	libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch)
+sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89'
+          '42aa4c2a82e4e14044c875a7f439baea732a355a'
+          'ea6d28880840e86c96f9079bfd591da54dcffa5c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libpng14.patch"
-  patch -Np1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch"
+  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch"
+  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch"
   ./configure --prefix=/usr \
               --with-gsfontdir=/usr/share/fonts/Type1 \
 	      --with-fontdir=/usr/share/fonts/Type1 \
diff --git a/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch b/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
new file mode 100644
index 000000000..3528c74eb
--- /dev/null
+++ b/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
@@ -0,0 +1,12 @@
+diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h	2011-05-23 19:14:23.000000000 +0200
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2011-05-23 19:15:11.000000000 +0200
+@@ -66,7 +66,7 @@
+ 		return;
+ 	}
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
+ 		png_destroy_write_struct (&png_ptr,&info_ptr);
+ 		wmf_free (API,buffer);
diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD
index b89360ae7..cfed62154 100644
--- a/extra/libxfcegui4/PKGBUILD
+++ b/extra/libxfcegui4/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 124284 2011-05-18 17:58:51Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 148848 2012-02-05 11:52:45Z ibiru $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=libxfcegui4
 pkgver=4.8.1
-pkgrel=3
-pkgdesc="Various gtk widgets for Xfce"
-arch=(i686 x86_64)
-license=('GPL2')
+pkgrel=4
+pkgdesc="Various Gtk widgets for Xfce"
+arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
-depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' 'hicolor-icon-theme')
+license=('GPL2')
+depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm'
+         'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ca0cdeff99f1732307d0fc0672d382ef')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libxfcegui4/libxfcegui4.install b/extra/libxfcegui4/libxfcegui4.install
index fee9e5d11..abf924aa2 100644
--- a/extra/libxfcegui4/libxfcegui4.install
+++ b/extra/libxfcegui4/libxfcegui4.install
@@ -3,10 +3,12 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
 
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 242f0a1e3..bb0d6bff6 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148407 2012-01-31 13:31:47Z giovanni $
+# $Id: PKGBUILD 149149 2012-02-06 00:27:42Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.01.26
+pkgver=2012.02.04
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('db7f0658583b590fb3d4044935f48b8e')
+md5sums=('5c9753e027af08c065f156e2a0bec023')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD
index 3d028d55b..39f314b11 100644
--- a/extra/metacity/PKGBUILD
+++ b/extra/metacity/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 128306 2011-06-22 17:53:59Z ibiru $
+# $Id: PKGBUILD 148852 2012-02-05 11:52:53Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=metacity
 pkgver=2.34.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
+makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
@@ -29,6 +29,6 @@ package() {
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index f4a33c5cd..e12fecfbd 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 144422 2011-12-05 18:18:17Z jgc $
+# $Id: PKGBUILD 148854 2012-02-05 11:52:58Z ibiru $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Mantainer: Roberto Carvajal <roberto@archlinux.org>
+# Maintainer: Roberto Carvajal <roberto@archlinux.org>
 
 pkgname=mjpegtools
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://mjpeg.sourceforge.net/"
-depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo')
+depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv')
 makedepends=('gtk2' 'v4l-utils')
 optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
 install=mjpegtools.install
 source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
         mjpegtools-v4l-2.6.38.patch)
-md5sums=('903e1e3b967eebcc5fe5626d7517dc46')
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
+         '44006d6f844017fe57aa123aa43f4508')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -31,5 +32,3 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
 }
-md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
-         '44006d6f844017fe57aa123aa43f4508')
diff --git a/extra/mjpegtools/mjpegtools.install b/extra/mjpegtools/mjpegtools.install
index ef149c761..4d1231686 100644
--- a/extra/mjpegtools/mjpegtools.install
+++ b/extra/mjpegtools/mjpegtools.install
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 file=mjpeg-howto.info
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   install-info $infodir/$file.gz $infodir/dir 2> /dev/null
 }
 
@@ -10,5 +11,6 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
 }
diff --git a/extra/mod_mono/PKGBUILD b/extra/mod_mono/PKGBUILD
index 21e944d19..781714d14 100644
--- a/extra/mod_mono/PKGBUILD
+++ b/extra/mod_mono/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111519 2011-02-27 11:39:59Z daniel $
+# $Id: PKGBUILD 149083 2012-02-05 17:05:29Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=mod_mono
 pkgver=2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="The mono module to make ASP.NET running on top of apache"
 arch=(i686 x86_64)
 license=('APACHE')
diff --git a/extra/mono-addins/PKGBUILD b/extra/mono-addins/PKGBUILD
index 75de85ba0..ccaac768b 100644
--- a/extra/mono-addins/PKGBUILD
+++ b/extra/mono-addins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137544 2011-09-09 07:19:25Z daniel $
+# $Id: PKGBUILD 149085 2012-02-05 17:06:07Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: tardo <tardo@nagi-fanboi.net>
 
 pkgname=mono-addins
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic framework for creating extensible applications and for creating libraries which extend those applications"
 arch=('i686' 'x86_64')
 url="http://www.mono-project.com/Mono.Addins"
diff --git a/extra/mono-basic/PKGBUILD b/extra/mono-basic/PKGBUILD
index 0ffd93c05..b0552c5a1 100644
--- a/extra/mono-basic/PKGBUILD
+++ b/extra/mono-basic/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111509 2011-02-27 11:33:57Z daniel $
+# $Id: PKGBUILD 149087 2012-02-05 17:06:50Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=mono-basic
 pkgver=2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Mono Visual Basic.NET compiler"
 arch=(i686 x86_64)
 license=('GPL')
diff --git a/extra/mono-debugger/PKGBUILD b/extra/mono-debugger/PKGBUILD
index b9ba3b347..21946154d 100644
--- a/extra/mono-debugger/PKGBUILD
+++ b/extra/mono-debugger/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mono-debugger
 pkgver=2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="The Mono Debugger"
 arch=(i686 x86_64)
 license=('GPL')
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index d72219365..fb6bb316e 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=2.8.5
+pkgver=2.8.6.3
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64')
 url="http://monodevelop.com"
 license=('GPL')
-depends=('monodevelop>=2.8.5' 'gdb')
+depends=('monodevelop>=2.8.6.3' 'gdb')
 makedepends=('mono')
 source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('57e7c32ba204e69f7d0d3c56e202d0ed')
+md5sums=('fe3ffc78fdac028aece6cd2cde0bccc3')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 56d0b0861..c0e3aedc0 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=2.8.5
+pkgver=2.8.6.3
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1
 options=(!makeflags)
 install=monodevelop.install
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c1d6a32330b4c22980052009de702483')
+md5sums=('54f55372d856206244a1580a2ac70859')
 
 build() {
   export MONO_SHARED_DIR=$srcdir/src/.wabi
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 4710dcecb..312abfcdf 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144459 2011-12-06 06:52:26Z angvp $
+# $Id: PKGBUILD 148654 2012-02-05 10:51:32Z bisson $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
@@ -6,7 +6,7 @@
 
 pkgname=mpd
 pkgver=0.16.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD
index 6b92f5ef5..b447bee50 100644
--- a/extra/netpbm/PKGBUILD
+++ b/extra/netpbm/PKGBUILD
@@ -1,38 +1,35 @@
-# $Id: PKGBUILD 104760 2011-01-04 20:54:47Z eric $
+# $Id: PKGBUILD 148858 2012-02-05 11:53:06Z ibiru $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=netpbm
-pkgver=10.47.24
+pkgver=10.57.1
 pkgrel=1
 pkgdesc="A toolkit for manipulation of graphic images"
 arch=('i686' 'x86_64')
 license=('custom' 'BSD' 'GPL' 'LGPL')
 url="http://netpbm.sourceforge.net/"
-depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2')
+depends=('perl' 'libpng' 'libtiff' 'libxml2')
 makedepends=('python2')
 options=('!makeflags')
 # Releases after 10.34 are available via SVN only.
-# Get Stable tarball here: http://netpbm.sourceforge.net/release.html#tarball
-# Get version number in version.mk
+# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball
+# Get version number from version.mk
 # Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
 source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \
         ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \
-        libpng-1.4.patch netpbm-CAN-2005-2471.patch \
-        netpbm-security-code.patch netpbm-security-scripts.patch)
-md5sums=('debf962e9a5531fd3e57143d38165eac' '48efce0093c5f242bce3072958fe88c3'\
-         '6a8319e77f2d41881ee11c86b78c51d0' '07ee863e6f951250e8d0a08243c828c7'\
-         'fac4c9bedff9d90ac5a66e93d8c2eb33' 'cbb689129c82d16360d7f840b86789c7')
-sha1sums=('02a85bffb8d5771011c17067e07fded26a455ee9' 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'\
-         'ab2e67374871b8b6c0c8b69a24e3502e68487759' '456b76004622479f6ee81107c54b5211a1663a6a'\
-         '5af979e8fb7d3bbb7e731eed62326bb594bc91b3' '2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
+        netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
+sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e'
+          'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'
+          'b79cf9d42488fea065ba16262ed97694c47af08d'
+          '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5'
+          '2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
 
 build() {
-  cd "${srcdir}/stable"
-  patch -p1 < ../libpng-1.4.patch
+  cd "${srcdir}/advanced"
   patch -p1 < ../netpbm-CAN-2005-2471.patch
   patch -p1 < ../netpbm-security-code.patch
   patch -p1 < ../netpbm-security-scripts.patch
-  sed -i 's|#!/bin/env python|#!/bin/env python2|' buildtools/makeman
+  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman
   sed -i 's|@python|@python2|' buildtools/manpage.mk
 
   cp config.mk.in  config.mk
@@ -43,42 +40,33 @@ build() {
   echo 'PNGLIB = libpng.so' >> config.mk
   echo 'ZLIB = libz.so' >> config.mk
  
-  sed -i 's|PKGMANDIR = man|PKGMANDIR = share/man|' common.mk
   sed -i 's|misc|share/netpbm|' common.mk
   sed -i 's|/link|/lib|' lib/Makefile
   sed -i 's|install.manweb install.man|install.man|' GNUmakefile
-  sed -i '/MANUALS1 = $(BINARIES) $(SCRIPTS)/a\
-    MANUALS1 += bmptoppm faxformat gemtopbm jpegtopnm mrf netpbm pamtotiff pamx pgmedge \\\
-                pgmnorm pgmoil pgmslice pnmarith pnmcut pnmdepth pnmenlarge pnmfile \\\
-                pnminterp pnmnoraw pnmscale pnmsplit pnmtofits pnmtojpeg pnmtopnm pnmtops \\\
-                pnmtotiff pnmtotiffcmyk ppmnorm ppmsvgalib ppmtojpeg ppmtotga ppmtouil \\\
-                tifftopnm vidtoppm \
-    MANUALS3 += libnetpbm_image libnetpbm_ug libpbm libpgm libpm libpnm libppm libsystem libtmpfile \
-    MANUALS5 += extendedopacity pfm' common.mk
 
   make
 
   # Generating useful man pages with html doc
   cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/stable/buildtools/makeman" USERGUIDE=. \
-    -f "${srcdir}/stable/buildtools/manpage.mk" manpages
+  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \
+    -f "${srcdir}/advanced/buildtools/manpage.mk" manpages
 }
 
 package() {
-  cd "${srcdir}/stable"
-  make pkgdir="${pkgdir}/usr" install-run install-dev
+  cd "${srcdir}/advanced"
+  make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
 
 # Removing dummy man pages
   rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
 
   cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/stable/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
-    -f "${srcdir}/stable/buildtools/manpage.mk" installman
+  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
+    -f "${srcdir}/advanced/buildtools/manpage.mk" installman
 
 # Replace obsolete utility
   echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm"
 
 # Licensing.  Note that each program in the package has a separate license.
-  install -D -m644 "${srcdir}/stable/doc/copyright_summary" \
+  install -D -m644 "${srcdir}/advanced/doc/copyright_summary" \
     "${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt"
 }
diff --git a/extra/netpbm/netpbm-CAN-2005-2471.patch b/extra/netpbm/netpbm-CAN-2005-2471.patch
index 8cbbd6d40..3759d7ebe 100644
--- a/extra/netpbm/netpbm-CAN-2005-2471.patch
+++ b/extra/netpbm/netpbm-CAN-2005-2471.patch
@@ -1,9 +1,9 @@
 --- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
 +++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
 @@ -711,11 +711,11 @@
-                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
                     ghostscriptProg, arg0,
-                    deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", 
+                    deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
+                    "-q", "-dNOPAUSE", 
 -                   "-dSAFER", "-");
 +                   "-dPARANOIDSAFER", "-");
      }
diff --git a/extra/netpbm/netpbm-security-code.patch b/extra/netpbm/netpbm-security-code.patch
index e8fbc29c2..da67a8f92 100644
--- a/extra/netpbm/netpbm-security-code.patch
+++ b/extra/netpbm/netpbm-security-code.patch
@@ -22,15 +22,15 @@ diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer
      if (m == NULL)
          pm_error("Unable to allocate memory for a matrix.");
 @@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
-     m -= ncl;
+     assert (nch >= ncl);
  
      /* allocate rows and set pointers to them */
 +    if(nch < ncl)
 +        pm_error("assert: h < l");
 +    overflow_add(nch - ncl, 1);
-     for (i = nrl; i <= nrh; i++)
-     {
+     for (i = nrl; i <= nrh; ++i) {
          MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
+         if (m[i] == NULL)
 diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
 --- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
 +++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -118,46 +118,6 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co
    buffer = (*cinfo_p->mem->alloc_sarray)
      ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
       (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
-diff -up netpbm-10.47.04/converter/other/pnmtops.c.security netpbm-10.47.04/converter/other/pnmtops.c
---- netpbm-10.47.04/converter/other/pnmtops.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtops.c	2009-10-21 15:09:33.000000000 +0200
-@@ -186,16 +186,20 @@ parseCommandLine(int argc, char ** argv,
-     cmdlineP->canturn =  !noturn;
-     cmdlineP->showpage = !noshowpage;
-     
-+    overflow2(width, 72);
-     cmdlineP->width  = width * 72;
-+    overflow2(height, 72);
-     cmdlineP->height = height * 72;
- 
--    if (imagewidthSpec)
-+    if (imagewidthSpec) {
-+        overflow2(imagewidth, 72);
-         cmdlineP->imagewidth = imagewidth * 72;
--    else
-+    } else
-         cmdlineP->imagewidth = 0;
--    if (imageheightSpec)
-+    if (imageheightSpec) {
-+        overflow2(imageheight, 72);
-         cmdlineP->imageheight = imageheight * 72;
--    else
-+    } else
-         cmdlineP->imageheight = 0;
- 
-     if (!cmdlineP->psfilter &&
-diff -up netpbm-10.47.04/converter/other/pnmtorle.c.security netpbm-10.47.04/converter/other/pnmtorle.c
---- netpbm-10.47.04/converter/other/pnmtorle.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtorle.c	2009-10-21 15:09:33.000000000 +0200
-@@ -19,6 +19,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /*
-  * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
 diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
 --- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
 +++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
@@ -216,25 +176,22 @@ diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/con
 diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
 --- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
 +++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
- 
-     if (ochan < 0) {
-         maxchannel = (head->zsize < 3) ? head->zsize : 3;
+@@ -252,10 +252,14 @@ read_channels(ifp, head, table, func, oc
+         MALLOCARRAY_NOFAIL(image, head->ysize);
+     } else {
+         maxchannel = MIN(3, head->zsize);
 +        overflow2(head->ysize, maxchannel);
          MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
-     } else {
-         maxchannel = ochan + 1;
-         MALLOCARRAY_NOFAIL(image, head->ysize);
      }
--    if ( table ) 
-+    if ( table ) {
+-    if (table) 
++    if (table) {
 +        overflow2(head->xsize, 2);
 +        overflow_add(head->xsize*2, 2);
          MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
 +    }
  
-     for( channel = 0; channel < maxchannel;  channel++ ) {
- #ifdef DEBUG
+     for(channel = 0; channel < maxchannel; ++channel) {
+         unsigned int row;
 diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
 --- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
 +++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -282,9 +239,9 @@ diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/con
      *padrightP =
          h11FixedP->bytes_per_line * 8 -
          h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
-diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/converter/pbm/icontopbm.c
---- netpbm-10.47.04/converter/pbm/icontopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/icontopbm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.47.04/converter/other/sunicontopnm.c.security netpbm-10.47.04/converter/other/sunicontopnm.c
+--- netpbm-10.47.04/converter/other/sunicontopnm.c.security	2009-10-21 13:39:10.000000000 +0200
++++ netpbm-10.47.04/converter/other/sunicontopnm.c	2009-10-21 15:09:33.000000000 +0200
 @@ -11,6 +11,7 @@
  */
  
@@ -294,17 +251,17 @@ diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/conv
  #include "nstring.h"
  #include "pbm.h"
 @@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
-     if ( *heightP <= 0 )
-         pm_error( "invalid height (must be positive): %d", *heightP );
+     if (*heightP <= 0)
+         pm_error("invalid height (must be positive): %d", *heightP);
  
 +    if ( *widthP > INT_MAX - 16 || *widthP < 0)
 +        pm_error( "invalid width: %d", *widthP);
 +    
 +    overflow2(*widthP + 16, *heightP);
 +    
-     data_length = BitmapSize( *widthP, *heightP );
-     *dataP = (short unsigned int *) malloc( data_length );
-     if ( *dataP == NULL )
+ }
+ 
+  
 diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
 --- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -367,22 +324,6 @@ diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/conv
      if(vmap == NULL)
  	{
          pm_error( "Cannot allocate memory" );
-diff -up netpbm-10.47.04/converter/pbm/pbmtoascii.c.security netpbm-10.47.04/converter/pbm/pbmtoascii.c
---- netpbm-10.47.04/converter/pbm/pbmtoascii.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoascii.c	2009-10-21 15:09:33.000000000 +0200
-@@ -115,9 +115,11 @@ char* argv[];
-         pm_usage( usage );
- 
-     pbm_readpbminit( ifp, &cols, &rows, &format );
-+    overflow_add(cols, gridx);
-     ccols = ( cols + gridx - 1 ) / gridx;
-     bitrow = pbm_allocrow( cols );
-     sig = (int*) pm_allocrow( ccols, sizeof(int) );
-+    overflow_add(ccols, 1);
-     line = (char*) pm_allocrow( ccols + 1, sizeof(char) );
- 
-     for ( row = 0; row < rows; row += gridy )
-diff -up netpbm-10.47.04/converter/pbm/pbmtocmuwm.c.security netpbm-10.47.04/converter/pbm/pbmtocmuwm.c
 diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
 --- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
@@ -405,17 +346,6 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/conver
      rucols = ( cols + 7 ) / 8;
      bytesperrow = rucols;       /* GraphOn uses bytes */
      rucols = rucols * 8;
-diff -up netpbm-10.47.04/converter/pbm/pbmtoicon.c.security netpbm-10.47.04/converter/pbm/pbmtoicon.c
---- netpbm-10.47.04/converter/pbm/pbmtoicon.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoicon.c	2009-10-21 15:38:55.000000000 +0200
-@@ -114,6 +114,7 @@ writeIcon(FILE *       const ifP,
-     unsigned char * bitrow;
-     unsigned int row;
- 
-+    overflow_add(cols, 15);
-     bitbuffer = pbm_allocrow_packed(cols + wordintSize);
-     bitrow = &bitbuffer[1];
-     bitbuffer[0] = 0;
 diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
 --- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -511,13 +441,13 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/conve
 --- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
 @@ -45,6 +45,7 @@ main( argc, argv )
-     bitrow = pbm_allocrow( cols );
+     bitrow = pbm_allocrow(cols);
      
      /* Compute padding to round cols up to the nearest multiple of 16. */
 +    overflow_add(cols, 16);
-     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
+     padright = ((cols + 15) / 16) * 16 - cols;
  
-     putinit( cols, rows );
+     putinit(cols, rows);
 diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
 --- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
@@ -565,14 +495,14 @@ diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/
 diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
 --- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
- 	pm_error( "EOF / read error" );
+@@ -88,4 +88,5 @@ getinit( file, colsP, rowsP, depthP, pad
+ 	pm_error("EOF / read error");
  
      *depthP = 1;
 +    overflow_add(*colsP, 15);
-     *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP;
-     bitsperitem = 0;
-     }
+     *padrightP = ((*colsP + 15) / 16) * 16 - *colsP;
+}
+
 diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
 --- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
 +++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -707,7 +637,7 @@ diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/convert
  		leaftoppm mtvtoppm neotoppm \
 -		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
 +		pcxtoppm pc1toppm pi1toppm pjtoppm \
- 		ppmtoacad ppmtoarbtxt \
+ 		ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \
  		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
  		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
 diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
@@ -894,14 +824,14 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/conv
 --- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
 @@ -245,6 +245,8 @@ char *argv[];
- 	putShort(stdout, 0);			/* mode */
- 
- 	/* Finally, write out the data. */
-+	overflow_add(cols/MAX_COUNT, 1);
-+        overflow_add(cols, cols/MAX_COUNT+1);
- 	packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1));
- 	oc = 0;
- 	for (row = 0; row < rows; row++)
+     putShort(stdout, 0);			/* mode */
+ 
+     /* Finally, write out the data. */
++     overflow_add(cols/MAX_COUNT, 1);
++     overflow_add(cols, cols/MAX_COUNT+1);
+     packed = malloc((unsigned)(cols+cols/MAX_COUNT+1));
+     for (row = 0, oc = 0; row < rows; row++)
+         oc += putRow(stdout, row, cols, pixels[row], packed);
 diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
 --- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
 +++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
@@ -1106,17 +1036,6 @@ diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.
      outpam.width  = rightcol - leftcol + 1;
      outpam.height = bottomrow - toprow + 1;
  
-diff -up netpbm-10.47.04/editor/pbmpscale.c.security netpbm-10.47.04/editor/pbmpscale.c
---- netpbm-10.47.04/editor/pbmpscale.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pbmpscale.c	2009-10-21 15:27:21.000000000 +0200
-@@ -110,6 +110,7 @@ main(int argc, char ** argv) {
-     inrow[0] = inrow[1] = inrow[2] = NULL;
-     pbm_readpbminit(ifP, &columns, &rows, &format) ;
- 
-+    overflow2(columns, scale);
-     outrow = pbm_allocrow(columns*scale) ;
-     MALLOCARRAY(flags, columns);
-     if (flags == NULL) 
 diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
 --- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
 +++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
@@ -1249,29 +1168,6 @@ diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmsh
      newcols = rows * shearfac + cols + 0.999999;
  
      pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
-diff -up netpbm-10.47.04/editor/ppmdither.c.security netpbm-10.47.04/editor/ppmdither.c
---- netpbm-10.47.04/editor/ppmdither.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/ppmdither.c	2009-10-21 15:09:34.000000000 +0200
-@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
-             (dith_dim * sizeof(int *)) + /* pointers */
-             (dith_dim * dith_dim * sizeof(int)); /* data */
- 
-+        overflow2(dith_dim, sizeof(int *));
-+        overflow3(dith_dim, dith_dim, sizeof(int));
-+        overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int));
-         dith_mat = (unsigned int **) malloc(dith_mat_sz);
- 
-         if (dith_mat == NULL) 
-@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power
-     if (dith_nb < 2) 
-         pm_error("too few shades for blue, minimum of 2");
- 
--    MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb);
-+    overflow2(dith_nr, dith_ng);
-+    *colormapP = malloc3(dith_nr * dith_ng, dith_nb,  sizeof(pixel));
-     if (*colormapP == NULL) 
-         pm_error("Unable to allocate space for the color lookup table "
-                  "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
 diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
 --- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
 +++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
@@ -1283,19 +1179,6 @@ diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/edit
      MALLOCARRAY(hist, inpam.maxval + 1);
      if (hist == NULL)
          pm_error("Unable to allocate memory for histogram.");
-diff -up netpbm-10.47.04/generator/pbmpage.c.security netpbm-10.47.04/generator/pbmpage.c
---- netpbm-10.47.04/generator/pbmpage.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pbmpage.c	2009-10-21 15:09:34.000000000 +0200
-@@ -170,6 +170,9 @@ outputPbm(FILE *        const file,
-     /* We round the allocated row space up to a multiple of 8 so the ugly
-        fast code below can work.
-        */
-+    
-+    overflow_add(bitmap.Width, 7);
-+    
-     pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8);
-     
-     bitmap_cursor = 0;
 diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
 --- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
 +++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
@@ -1390,16 +1273,6 @@ diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
          pm_check(file, check_type, need_raster_size, retval_p);
      }
  }
-diff -up netpbm-10.47.04/lib/libpbmvms.c.security netpbm-10.47.04/lib/libpbmvms.c
---- netpbm-10.47.04/lib/libpbmvms.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpbmvms.c	2009-10-21 15:09:34.000000000 +0200
-@@ -1,3 +1,5 @@
-+#warning "NOT AUDITED"
-+
- /***************************************************************************
-   This file contains library routines needed to build Netpbm for VMS.
-   However, as of 2000.05.26, when these were split out of libpbm1.c
-diff -up netpbm-10.47.04/lib/libpm.c.security netpbm-10.47.04/lib/libpm.c
 --- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
 +++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
 @@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
@@ -1482,18 +1355,6 @@ diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmc
      }
      {
          unsigned int const intQuotient = colormap.size / pamP->width;
-diff -up netpbm-10.47.04/urt/README.security netpbm-10.47.04/urt/README
---- netpbm-10.47.04/urt/README.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/README	2009-10-21 15:09:34.000000000 +0200
-@@ -18,3 +18,8 @@ in its initializer in the original.  But
- defines stdout as a variable, so that wouldn't compile.  So I changed
- it to NULL and added a line to rle_hdr_init to set that field to
- 'stdout' dynamically.  2000.06.02 BJH.
-+
-+Redid the code to check for maths overflows and other crawly horrors.
-+Removed pipe through and compress support (unsafe)
-+
-+Alan Cox <alan@redhat.com>
 diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
 --- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
 +++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
@@ -1630,37 +1491,6 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
  	    size *= sizeof(char *);
  	    to_hdr->comments = (CONST_DECL char **)malloc( size );
  	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
-diff -up netpbm-10.47.04/urt/rle.h.security netpbm-10.47.04/urt/rle.h
---- netpbm-10.47.04/urt/rle.h.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle.h	2009-10-21 15:09:34.000000000 +0200
-@@ -14,6 +14,9 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-+ *  Header declarations needed
-  */
- /* 
-  * rle.h - Global declarations for Utah Raster Toolkit RLE programs.
-@@ -166,6 +169,17 @@ rle_hdr             /* End of typedef. *
-  */
- extern rle_hdr rle_dflt_hdr;
- 
-+/* 
-+ * Provided by pm library
-+ */
-+ 
-+extern void overflow_add(int, int);
-+#define overflow2(a,b) __overflow2(a,b)
-+extern void __overflow2(int, int);
-+extern void overflow3(int, int, int);
-+extern void *malloc2(int, int);
-+extern void *malloc3(int, int, int);
-+extern void *realloc2(void *, int, int);
- 
- /* Declare RLE library routines. */
- 
 diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
 --- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
 +++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
@@ -1704,11 +1534,11 @@ diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_
 -        *noSubprocessP = FALSE;
 -        
 -        if (*mode == 'w')
--            asprintfN(&command, "compress > %s", file_name);
+-            pm_asprintf(&command, "compress > %s", file_name);
 -        else if (*mode == 'a')
--            asprintfN(&command, "compress >> %s", file_name);
+-            pm_asprintf(&command, "compress >> %s", file_name);
 -        else
--            asprintfN(&command, "compress -d < %s", file_name);
+-            pm_asprintf(&command, "compress -d < %s", file_name);
 -        
 -        *fpP = my_popen(command, mode, &thepid);
 -
@@ -1720,7 +1550,7 @@ diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_
 -            if (*catchingChildrenP < MAX_CHILDREN)
 -                pids[(*catchingChildrenP)++] = thepid;
 -        }
--        strfree(command);
+-        pm_strfree(command);
 -    } else {
 -        *noSubprocessP = TRUE;
 -        *errorP = NULL;
@@ -1815,3 +1645,24 @@ diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
  
  #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
  #define USE_PROTOTYPES
+--- advanced/urt/rle_hdr.c.old	2012-01-21 05:57:25.000000000 -0500
++++ advanced/urt/rle_hdr.c	2012-01-21 05:57:50.000000000 -0500
+@@ -29,6 +29,18 @@
+ 
+ #include <string.h>
+ 
++/* 
++ * Provided by pm library
++ */
++ 
++extern void overflow_add(int, int);
++#define overflow2(a,b) __overflow2(a,b)
++extern void __overflow2(int, int);
++extern void overflow3(int, int, int);
++extern void *malloc2(int, int);
++/*extern void *malloc3(int, int, int);*/
++extern void *realloc2(void *, int, int);
++
+ /*****************************************************************
+  * TAG( rle_names )
+  *
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index cd9c5a79b..1b6dd8a5f 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 124594 2011-05-23 08:40:29Z eric $
+# $Id: PKGBUILD 148860 2012-02-05 11:53:11Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=neverball
 pkgver=1.5.4
-pkgrel=3
+pkgrel=4
 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
 arch=('i686' 'x86_64')
 url="http://neverball.org/"
 license=('GPL')
 depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
 makedepends=('mesa')
-source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c523b0f72c2035831310e821162f7bd7')
-sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7')
+source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch)
+sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
+          'f71982b7187d569c57b30c4c40fedd6c0e72baca')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
+  patch -p0 -i ../neverball-1.5.4-underlink.patch
 
   if [ "${CARCH}" = "i686" ] ;then
     make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
diff --git a/extra/neverball/neverball-1.5.4-underlink.patch b/extra/neverball/neverball-1.5.4-underlink.patch
new file mode 100644
index 000000000..1a848cad3
--- /dev/null
+++ b/extra/neverball/neverball-1.5.4-underlink.patch
@@ -0,0 +1,22 @@
+--- Makefile.old	2011-06-22 06:30:52.441788160 +0200
++++ Makefile	2011-06-22 06:31:59.754087534 +0200
+@@ -138,7 +138,7 @@
+ endif
+ 
+ ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
+-    -lvorbisfile $(OGL_LIBS)
++    -lvorbisfile $(OGL_LIBS) -lX11
+ 
+ #------------------------------------------------------------------------------
+ 
+--- Makefile.old	2012-01-18 21:28:23.000000000 -0500
++++ Makefile	2012-01-18 21:28:55.000000000 -0500
+@@ -131,7 +131,7 @@
+     OGL_LIBS  := -framework OpenGL
+ endif
+ 
+-BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
++BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
+ 
+ ifdef DARWIN
+     BASE_LIBS += -L/opt/local/lib
diff --git a/extra/normalize/PKGBUILD b/extra/normalize/PKGBUILD
index 1657800d7..0d3ce5867 100644
--- a/extra/normalize/PKGBUILD
+++ b/extra/normalize/PKGBUILD
@@ -1,21 +1,35 @@
-# $Id: PKGBUILD 143917 2011-11-30 20:41:17Z giovanni $
+# $Id: PKGBUILD 149021 2012-02-05 14:18:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=normalize
 pkgver=0.7.7
-pkgrel=5
+pkgrel=6
 pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
 arch=('i686' 'x86_64')
 url="http://normalize.nongnu.org"
 license=('GPL')
 depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123')
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436')
+makedepends=('pkg-config' 'intltool')
+source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'normalize-0.7.7-audiofile-pkgconfig.patch'
+        'normalize-0.7.7-m4.patch')
+md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436'
+         '77d565e29bef11837e80347adfd42b58'
+         '0b4bca7bf183275b9f939576ebad4233')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/normalize-0.7.7-audiofile-pkgconfig.patch"
+  patch -Np0 -i "${srcdir}/normalize-0.7.7-m4.patch"
+
+  touch AUTHORS NEWS ChangeLog
+  libtoolize --force --copy
+  aclocal -I m4
+  autoreconf
+  automake --add-missing
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --with-audiofile \
diff --git a/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch b/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch
new file mode 100644
index 000000000..09f211cdf
--- /dev/null
+++ b/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch
@@ -0,0 +1,55 @@
+Use pkgconfig to check for audiofile since the audiofile-config script was
+removed from >=audiofile-0.3.0.
+
+--- normalize-0.7.7/configure.ac.orig
++++ normalize-0.7.7/configure.ac
+@@ -248,33 +248,16 @@
+ 
+ 
+ dnl *** Stuff for audiofile library ***
+-dnl v0.2.1 and before have bugs with 24-bit LE files
+-AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
+-dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
++AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile],
++		   [use the audiofile library (default yes)]))
+ AH_TEMPLATE([USE_AUDIOFILE],
+ 	    [Define if you want to use the audiofile library.])
+-AC_ARG_WITH(audiofile,
+-    AC_HELP_STRING([--with-audiofile],
+-		   [use the audiofile library (default yes)]),
+-    [ case "$withval" in
+-	  no) with_audiofile=false ;;
+-	  *) with_audiofile=true ;;
+-      esac ])
+ 
+-use_audiofile=false
+-if test x$with_audiofile != xfalse; then
+-    if test x$have_audiofile = xtrue; then
+-	AC_DEFINE(USE_AUDIOFILE)
+-	use_audiofile=true
+-dnl	AUDIOFILELIBS="-laudiofile"
+-    elif test x$with_audiofile = xtrue; then
+-	AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found])
+-    fi
+-fi
+-dnl AC_SUBST(AUDIOFILELIBS)
+-test x$use_audiofile = xfalse && AUDIOFILE_LIBS=
+-test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS=
+-AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue)
++AS_IF([test "x$with_audiofile" = "xyes"], [
++    PKG_CHECK_MODULES([AUDIOFILE], [audiofile])
++    AC_DEFINE(USE_AUDIOFILE)
++])
++AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes)
+ 
+ 
+ dnl *** Stuff for mad mpeg audio decoder library ***
+@@ -330,7 +313,7 @@
+ 
+ echo
+ echo "Configuration:"
+-echo "    audiofile library:         $use_audiofile"
++echo "    audiofile library:         $with_audiofile"
+ echo "    mpeg audio support:        $use_mad"
+ echo "    xmms volume adjust plugin: $use_xmms"
+ echo
diff --git a/extra/normalize/normalize-0.7.7-m4.patch b/extra/normalize/normalize-0.7.7-m4.patch
new file mode 100644
index 000000000..2aeb3e451
--- /dev/null
+++ b/extra/normalize/normalize-0.7.7-m4.patch
@@ -0,0 +1,553 @@
+--- m4/extra.m4
++++ m4/extra.m4
+@@ -0,0 +1,550 @@
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005  Free Software Foundation, Inc.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++# Configure paths for GLIB
++# Owen Taylor     97-11-3
++
++dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
++dnl gthread is specified in MODULES, pass to glib-config
++dnl
++AC_DEFUN(AM_PATH_GLIB,
++[dnl 
++dnl Get the cflags and libraries from the glib-config script
++dnl
++AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
++            glib_config_prefix="$withval", glib_config_prefix="")
++AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
++            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
++AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
++		    , enable_glibtest=yes)
++
++  if test x$glib_config_exec_prefix != x ; then
++     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
++     if test x${GLIB_CONFIG+set} != xset ; then
++        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
++     fi
++  fi
++  if test x$glib_config_prefix != x ; then
++     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
++     if test x${GLIB_CONFIG+set} != xset ; then
++        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
++     fi
++  fi
++
++  for module in . $4
++  do
++      case "$module" in
++         gmodule) 
++             glib_config_args="$glib_config_args gmodule"
++         ;;
++         gthread) 
++             glib_config_args="$glib_config_args gthread"
++         ;;
++      esac
++  done
++
++  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
++  min_glib_version=ifelse([$1], ,0.99.7,$1)
++  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
++  no_glib=""
++  if test "$GLIB_CONFIG" = "no" ; then
++    no_glib=yes
++  else
++    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
++    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
++    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_glibtest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GLIB_CFLAGS"
++      LIBS="$GLIB_LIBS $LIBS"
++dnl
++dnl Now check if the installed GLIB is sufficiently new. (Also sanity
++dnl checks the results of glib-config to some extent
++dnl
++      rm -f conf.glibtest
++      AC_TRY_RUN([
++#include <glib.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int 
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  system ("touch conf.glibtest");
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_glib_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_glib_version");
++     exit(1);
++   }
++
++  if ((glib_major_version != $glib_config_major_version) ||
++      (glib_minor_version != $glib_config_minor_version) ||
++      (glib_micro_version != $glib_config_micro_version))
++    {
++      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
++             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
++             glib_major_version, glib_minor_version, glib_micro_version);
++      printf ("*** was found! If glib-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
++      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
++      printf("*** before re-running configure\n");
++    } 
++  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
++	   (glib_minor_version != GLIB_MINOR_VERSION) ||
++           (glib_micro_version != GLIB_MICRO_VERSION))
++    {
++      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
++	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     glib_major_version, glib_minor_version, glib_micro_version);
++    }
++  else
++    {
++      if ((glib_major_version > major) ||
++        ((glib_major_version == major) && (glib_minor_version > minor)) ||
++        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
++               glib_major_version, glib_minor_version, glib_micro_version);
++        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
++        printf("*** correct copy of glib-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_glib" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$GLIB_CONFIG" = "no" ; then
++       echo "*** The glib-config script installed by GLIB could not be found"
++       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
++       echo "*** full path to glib-config."
++     else
++       if test -f conf.glibtest ; then
++        :
++       else
++          echo "*** Could not run GLIB test program, checking why..."
++          CFLAGS="$CFLAGS $GLIB_CFLAGS"
++          LIBS="$LIBS $GLIB_LIBS"
++          AC_TRY_LINK([
++#include <glib.h>
++#include <stdio.h>
++],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
++          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++          echo "***"
++          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
++          echo "*** came with the system with the command"
++          echo "***"
++          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
++          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
++          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GLIB_CFLAGS=""
++     GLIB_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GLIB_CFLAGS)
++  AC_SUBST(GLIB_LIBS)
++  rm -f conf.glibtest
++])
++
++# Configure paths for GTK+
++# Owen Taylor     97-11-3
++
++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
++dnl
++AC_DEFUN(AM_PATH_GTK,
++[dnl 
++dnl Get the cflags and libraries from the gtk-config script
++dnl
++AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
++            gtk_config_prefix="$withval", gtk_config_prefix="")
++AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
++            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
++AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
++		    , enable_gtktest=yes)
++
++  for module in . $4
++  do
++      case "$module" in
++         gthread) 
++             gtk_config_args="$gtk_config_args gthread"
++         ;;
++      esac
++  done
++
++  if test x$gtk_config_exec_prefix != x ; then
++     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
++     if test x${GTK_CONFIG+set} != xset ; then
++        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++     fi
++  fi
++  if test x$gtk_config_prefix != x ; then
++     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
++     if test x${GTK_CONFIG+set} != xset ; then
++        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++     fi
++  fi
++
++  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
++  min_gtk_version=ifelse([$1], ,0.99.7,$1)
++  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
++  no_gtk=""
++  if test "$GTK_CONFIG" = "no" ; then
++    no_gtk=yes
++  else
++    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
++    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
++    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_gtktest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GTK_CFLAGS"
++      LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK is sufficiently new. (Also sanity
++dnl checks the results of gtk-config to some extent
++dnl
++      rm -f conf.gtktest
++      AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int 
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  system ("touch conf.gtktest");
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gtk_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gtk_version");
++     exit(1);
++   }
++
++  if ((gtk_major_version != $gtk_config_major_version) ||
++      (gtk_minor_version != $gtk_config_minor_version) ||
++      (gtk_micro_version != $gtk_config_micro_version))
++    {
++      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++             gtk_major_version, gtk_minor_version, gtk_micro_version);
++      printf ("*** was found! If gtk-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
++      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++      printf("*** before re-running configure\n");
++    } 
++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
++  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++	   (gtk_minor_version != GTK_MINOR_VERSION) ||
++           (gtk_micro_version != GTK_MICRO_VERSION))
++    {
++      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     gtk_major_version, gtk_minor_version, gtk_micro_version);
++    }
++#endif /* defined (GTK_MAJOR_VERSION) ... */
++  else
++    {
++      if ((gtk_major_version > major) ||
++        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++               gtk_major_version, gtk_minor_version, gtk_micro_version);
++        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
++        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gtk" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$GTK_CONFIG" = "no" ; then
++       echo "*** The gtk-config script installed by GTK could not be found"
++       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the GTK_CONFIG environment variable to the"
++       echo "*** full path to gtk-config."
++     else
++       if test -f conf.gtktest ; then
++        :
++       else
++          echo "*** Could not run GTK test program, checking why..."
++          CFLAGS="$CFLAGS $GTK_CFLAGS"
++          LIBS="$LIBS $GTK_LIBS"
++          AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GTK or finding the wrong"
++          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++          echo "***"
++          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
++          echo "*** came with the system with the command"
++          echo "***"
++          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
++          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
++          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GTK_CFLAGS=""
++     GTK_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GTK_CFLAGS)
++  AC_SUBST(GTK_LIBS)
++  rm -f conf.gtktest
++])
++
++# CFLAGS and library paths for XMMS
++# written 15 December 1999 by Ben Gertzfield <che@debian.org>
++
++dnl Usage:
++dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl
++dnl Example:
++dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***]))
++dnl
++dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, 
++dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, 
++dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR,
++dnl and XMMS_VERSION for your plugin pleasure.
++dnl
++
++dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
++AC_DEFUN(XMMS_TEST_VERSION, [
++
++# Determine which version number is greater. Prints 2 to stdout if	
++# the second number is greater, 1 if the first number is greater,	
++# 0 if the numbers are equal.						
++									
++# Written 15 December 1999 by Ben Gertzfield <che@debian.org>		
++# Revised 15 December 1999 by Jim Monty <monty@primenet.com>		
++									
++    AC_PROG_AWK
++    xmms_got_version=[` $AWK '						\
++BEGIN {									\
++    print vercmp(ARGV[1], ARGV[2]);					\
++}									\
++									\
++function vercmp(ver1, ver2,    ver1arr, ver2arr,			\
++                               ver1len, ver2len,			\
++                               ver1int, ver2int, len, i, p) {		\
++									\
++    ver1len = split(ver1, ver1arr, /\./);				\
++    ver2len = split(ver2, ver2arr, /\./);				\
++									\
++    len = ver1len > ver2len ? ver1len : ver2len;			\
++									\
++    for (i = 1; i <= len; i++) {					\
++        p = 1000 ^ (len - i);						\
++        ver1int += ver1arr[i] * p;					\
++        ver2int += ver2arr[i] * p;					\
++    }									\
++									\
++    if (ver1int < ver2int)						\
++        return 2;							\
++    else if (ver1int > ver2int)						\
++        return 1;							\
++    else								\
++        return 0;							\
++}' $1 $2`]								
++
++    if test $xmms_got_version -eq 2; then 	# failure
++	ifelse([$4], , :, $4)			
++    else  					# success!
++	ifelse([$3], , :, $3)
++    fi
++])
++
++AC_DEFUN(AM_PATH_XMMS,
++[
++AC_ARG_WITH(xmms-prefix,[  --with-xmms-prefix=PFX  Prefix where XMMS is installed (optional)],
++	xmms_config_prefix="$withval", xmms_config_prefix="")
++AC_ARG_WITH(xmms-exec-prefix,[  --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)],
++	xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
++
++if test x$xmms_config_exec_prefix != x; then
++    xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix"
++    if test x${XMMS_CONFIG+set} != xset; then
++	XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config
++    fi
++fi
++
++if test x$xmms_config_prefix != x; then
++    xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix"
++    if test x${XMMS_CONFIG+set} != xset; then
++  	XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config
++    fi
++fi
++
++AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
++min_xmms_version=ifelse([$1], ,0.9.5.1, $1)
++
++if test "$XMMS_CONFIG" = "no"; then
++    no_xmms=yes
++else
++    XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags`
++    XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs`
++    XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version`
++    XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir`
++    XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir`
++    XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \
++					--visualization-plugin-dir`
++    XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir`
++    XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir`
++    XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir`
++    XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir`
++
++    XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version)
++fi
++
++AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version)
++
++if test "x$no_xmms" = x; then
++    AC_MSG_RESULT(yes)
++    ifelse([$2], , :, [$2])
++else
++    AC_MSG_RESULT(no)
++
++    if test "$XMMS_CONFIG" = "no" ; then
++	echo "*** The xmms-config script installed by XMMS could not be found."
++      	echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in"
++	echo "*** your path, or set the XMMS_CONFIG environment variable to the"
++	echo "*** full path to xmms-config."
++    else
++	if test "$no_xmms" = "version"; then
++	    echo "*** An old version of XMMS, $XMMS_VERSION, was found."
++	    echo "*** You need a version of XMMS newer than $min_xmms_version."
++	    echo "*** The latest version of XMMS is always available from"
++	    echo "*** http://www.xmms.org/"
++	    echo "***"
++
++            echo "*** If you have already installed a sufficiently new version, this error"
++            echo "*** probably means that the wrong copy of the xmms-config shell script is"
++            echo "*** being found. The easiest way to fix this is to remove the old version"
++            echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the"
++            echo "*** correct copy of xmms-config. (In this case, you will have to"
++            echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf"
++            echo "*** so that the correct libraries are found at run-time)"
++	fi
++    fi
++    XMMS_CFLAGS=""
++    XMMS_LIBS=""
++    ifelse([$3], , :, [$3])
++fi
++AC_SUBST(XMMS_CFLAGS)
++AC_SUBST(XMMS_LIBS)
++AC_SUBST(XMMS_VERSION)
++AC_SUBST(XMMS_DATA_DIR)
++AC_SUBST(XMMS_PLUGIN_DIR)
++AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
++AC_SUBST(XMMS_INPUT_PLUGIN_DIR)
++AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR)
++AC_SUBST(XMMS_GENERAL_PLUGIN_DIR)
++AC_SUBST(XMMS_EFFECT_PLUGIN_DIR)
++])
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
index 6140cb6dc..3d247b376 100644
--- a/extra/ntrack/PKGBUILD
+++ b/extra/ntrack/PKGBUILD
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 125701 2011-05-28 10:48:55Z andrea $
+# $Id: PKGBUILD 149014 2012-02-05 14:07:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=ntrack
-pkgver=13
-pkgrel=2
+pkgver=16
+pkgrel=1
 epoch=1
 pkgdesc="A network connectivity tracking library"
 arch=('i686' 'x86_64')
 url="http://launchpad.net/ntrack/"
 license=('LGPL')
-depends=('qt' 'libnl' 'gcc-libs')
+depends=('qt' 'libnl')
 makedepends=('python2')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
-        'dead-loop-fix.patch')
-md5sums=('90596b924a108f8b4eea52239ba64369'
-         '02bda6ae15ef04b6a7d9273c37752681')
 options=('!libtool' '!emptydirs')
+source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz")
+md5sums=('21691dac43460a6791cba3decbc68242')
 
 build() {
   cd "${srcdir}/${pkgname}-0${pkgver}"
 
-  patch -p0 -i "${srcdir}"/dead-loop-fix.patch
-
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var
diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD
index 7ee8cac19..aa9cb84b6 100644
--- a/extra/nx-common/PKGBUILD
+++ b/extra/nx-common/PKGBUILD
@@ -1,35 +1,40 @@
-# $Id: PKGBUILD 128326 2011-06-22 20:29:20Z andyrtr $
+# $Id: PKGBUILD 148862 2012-02-05 11:53:15Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="NoMachine NX common package for client and server"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://nomachine.com/"
-depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash')
+depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs' 'bash')
 makedepends=('xorg-server-devel')
 source=( #Compression libs and proxy sources
 	http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
 	http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
 	http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
-	nxcompsh-gcc43.patch)
+	nxcompsh-gcc43.patch
+	nx-3.5.0-libpng15.patch)
 options=(!libtool)
 md5sums=('ad8c0f133122c6d07732ca69c8759410'
          '84ade443b79ea079380b754aba9d392e'
          'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         'b6c279654dac421fc3dd1a27d66ff53c')
+         'b6c279654dac421fc3dd1a27d66ff53c'
+         '2966353cabb96829eab291212ef078dc')
 
 build() {
   # nxcomp
   cd ${srcdir}/nxcomp
+  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
+
   ./configure --prefix=/opt/NX
   make
   # nxcompsh
   cd ${srcdir}/nxcompsh
   patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
+ 
   ./configure --prefix=/opt/NX
   make
   # nxssh
diff --git a/extra/nx-common/nx-3.5.0-libpng15.patch b/extra/nx-common/nx-3.5.0-libpng15.patch
new file mode 100644
index 000000000..c8f2a9559
--- /dev/null
+++ b/extra/nx-common/nx-3.5.0-libpng15.patch
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp	2010-03-01 19:18:59.000000000 +0200
++++ nxcomp/Pgn.cpp	2011-09-13 16:35:12.000000000 +0300
+@@ -414,7 +414,7 @@
+ 
+   png_read_info(pngPtr, infoPtr);
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -565,7 +565,7 @@
+ 
+   png_read_info( pngPtr, infoPtr ) ;
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -709,7 +709,7 @@
+   png_read_info(pngPtr, infoPtr) ;
+ 
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD
index de2ce2e34..242c5f08b 100644
--- a/extra/nxserver/PKGBUILD
+++ b/extra/nxserver/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 141571 2011-10-31 07:33:57Z andyrtr $
+# $Id: PKGBUILD 148864 2012-02-05 11:53:19Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
 
 pkgname=nxserver
 pkgver=3.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
 arch=(i686 x86_64)
 url="http://nomachine.com/"
 license=('GPL')
 depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
-	 'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
+	 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
          'xorg-sessreg')
 makedepends=('imake')
 source=(
@@ -27,7 +27,8 @@ http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
 # gcc 43 fix
-nxcompsh-gcc43.patch)
+nxcompsh-gcc43.patch
+nx-3.5.0-libpng15.patch)
 options=(!libtool) 
 md5sums=('12060433a74ac61a1c776d1d6d136117'
          '84c7f1575d9a1506370125ed050514ab'
@@ -38,13 +39,15 @@ md5sums=('12060433a74ac61a1c776d1d6d136117'
          '488bb4d9b8e9f82dc272b4e6e9c57d30'
          'abde2ccc33e31fc695031c2cfb60f3dd'
          '90a762dd9eb19c8c97876ad837923857'
-         'b6c279654dac421fc3dd1a27d66ff53c')
+         'b6c279654dac421fc3dd1a27d66ff53c'
+         '2966353cabb96829eab291212ef078dc')
 
 build() {
   cd ${srcdir}
 
   # nxcomp   
   cd ${srcdir}/nxcomp
+  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
   ./configure --prefix=/opt/NX
   make
   # nxcompshad
diff --git a/extra/nxserver/nx-3.5.0-libpng15.patch b/extra/nxserver/nx-3.5.0-libpng15.patch
new file mode 100644
index 000000000..c8f2a9559
--- /dev/null
+++ b/extra/nxserver/nx-3.5.0-libpng15.patch
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp	2010-03-01 19:18:59.000000000 +0200
++++ nxcomp/Pgn.cpp	2011-09-13 16:35:12.000000000 +0300
+@@ -414,7 +414,7 @@
+ 
+   png_read_info(pngPtr, infoPtr);
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -565,7 +565,7 @@
+ 
+   png_read_info( pngPtr, infoPtr ) ;
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -709,7 +709,7 @@
+   png_read_info(pngPtr, infoPtr) ;
+ 
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index b4265766c..5ae5b7ba7 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146424 2012-01-10 23:37:44Z eric $
+# $Id: PKGBUILD 148866 2012-02-05 11:53:22Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -7,7 +7,7 @@ pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.3.1_a
 _realver=2.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index a5c7d41c6..48dd55c34 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 120658 2011-04-25 21:17:33Z eric $
+# $Id: PKGBUILD 148868 2012-02-05 11:53:26Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0@live.it>
 
 pkgname=opengtl
-pkgver=0.9.15.1
+pkgver=0.9.16
 pkgrel=1
 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
 url="http://www.opengtl.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gcc-libs')
-makedepends=('cmake' 'llvm' 'libpng')
+depends=('gcc-libs' 'llvm')
+makedepends=('cmake' 'libpng')
 optdepends=('libpng: for using the png extension')
 source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-md5sums=('052fc8504ced601e356e4d20621699f7')
-sha1sums=('ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a')
+sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 79d5bba98..b4b4e9cca 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,50 +1,48 @@
-# $Id: PKGBUILD 146547 2012-01-12 21:46:06Z andyrtr $
+# $Id: PKGBUILD 148870 2012-02-05 11:53:35Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
 _javaver=6
-_icedteaver=1.10.5
-_openjdk_version=b22
-_openjdk_date=28_feb_2011
+_icedteaver=1.11
+_openjdk_version=b24
+_openjdk_date=14_nov_2011
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
 pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('custom')
 makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'libxt' 'nss'
+	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java' 
 	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6')
 options=('!emptydirs') # 'force') # force needed for hg shots
 source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/drops/jaxp144_01.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
+	http://icedtea.classpath.org/download/drops/jaxp144_03.zip
+	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
 	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
 	fontconfig-paths.diff
 	nonreparenting-wm.diff
 	openjdk6.profile
-	openjdk6.profile.csh
-    glibc2_15.diff)
+	openjdk6.profile.csh)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	jaxp144_01.zip
-	jdk6-jaxws-b20.zip
+	jaxp144_03.zip
+	jdk6-jaxws2_1_6-2011_06_13.zip
 	jdk6-jaf-b20.zip)
-md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a'
-         '2d2bbbb0f9b81f1fec41ec730da8a933'
-         'ef7a8b3624ea904bf584bc46d79b5e75'
-         '91adfd41e6f001add4f92ae31216b1e3'
+md5sums=('10c1cea1d24c064572abfe9687567948'
+         '0eabdd360169144336e50081b8d01001'
+         '9eea471ad474040265c688858fcf09aa'
+         '8fd91b09b643a19a912b8a75e7a7a9d5'
          'bc95c133620bd68c161cac9891592901'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
          'ee1afda124d5927345014ab382ef581e'
          '9b4d368f5ee08de248eaf029303a446c'
          '74c4a7adc782edd087802bf92ae3d6d0'
-         'fdf295e2f186dfa4d308691a3d7ac8c5'
-         '0c8f0a398c88f85e0db44b4417562cf3')
+         'fdf295e2f186dfa4d308691a3d7ac8c5')
 
 build() {
 
@@ -64,18 +62,17 @@ build() {
 
   autoreconf -i
 
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/glibc2_15.diff"
+  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
   unset MAKEFLAGS
 
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-ant-home=/usr/share/java/apache-ant \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
-	--with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
-  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+	--with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
+  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
 	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
 	--disable-bootstrap
   LD_PRELOAD="" make 
@@ -84,7 +81,7 @@ build() {
 package_openjdk6() {
  pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
  backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
  optdepends=('icedtea-web: web browser plugin + Java Web Start'
             'alsa-lib: for sound'
             'giflib: for gif format support')
diff --git a/extra/pekwm/PKGBUILD b/extra/pekwm/PKGBUILD
index bfcdb908d..5ead4972a 100644
--- a/extra/pekwm/PKGBUILD
+++ b/extra/pekwm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131942 2011-07-18 00:09:21Z kevin $
+# $Id: PKGBUILD 148872 2012-02-05 11:53:39Z ibiru $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Eddie Lozon <almostlucky@attbi.com>
 
 pkgname=pekwm
 pkgver=0.1.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A small, fast, functional, and flexible window manager"
 arch=(i686 x86_64)
 license=('GPL')
@@ -24,7 +24,7 @@ md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5'
          '075bf1b9d32bf94780329499e4fa40e3')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 #  patch -p1 < ../libpng-1.4.patch || return 1
   # Default settings:
   #    --enable-shape --enable-xinerama --enable-menus \
@@ -37,10 +37,9 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/${pkgname}.desktop \
-                   ${pkgdir}/usr/share/xsessions/${pkgname}.desktop
-#                   ${pkgdir}/etc/X11/sessions/${pkgname}.desktop
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/${pkgname}.desktop" \
+                   "${pkgdir}/usr/share/xsessions/${pkgname}.desktop"
 }
 # vim: ts=2 sw=2 et ft=sh
diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD
index 5cba2c5c0..d719fd468 100644
--- a/extra/perl-time-hires/PKGBUILD
+++ b/extra/perl-time-hires/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143950 2011-11-30 22:03:46Z giovanni $
+# $Id: PKGBUILD 149153 2012-02-06 00:45:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: mezcal <fila at pruda dot com>
 
 pkgname=perl-time-hires
-pkgver=1.9724
-pkgrel=2
+pkgver=1.9725
+pkgrel=1
 pkgdesc="Perl module: high resolution time, sleep, and alarm"
 arch=('i686' 'x86_64')
 license=('PerlArtistic')
@@ -12,7 +12,7 @@ url="http://search.cpan.org/dist/Time-HiRes/"
 depends=('perl')
 options=(!emptydirs)
 source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz")
-md5sums=('6467b001de9ba5c01785ebbb8ea247cb')
+md5sums=('cb1108c076d26f3d2fed0bb91313135a')
 
 build() {
   cd "${srcdir}/Time-HiRes-${pkgver}"
diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD
index 51e4c5126..b49b5d983 100644
--- a/extra/perl-tk/PKGBUILD
+++ b/extra/perl-tk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142966 2011-11-19 08:36:20Z eric $
+# $Id: PKGBUILD 148874 2012-02-05 11:53:42Z ibiru $
 # Maintainer: François Charette <francois ατ archlinux δοτ org>
 # Contributor: Jason Chu <jchu@xentac.net>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=perl-tk
 _cpanname=Tk
 pkgver=804.030
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical user interface toolkit for Perl"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/${_cpanname}"
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index adafb826c..da0430b2d 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148505 2012-02-02 21:11:43Z pierre $
+# $Id: PKGBUILD 148876 2012-02-05 11:53:48Z ibiru $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -23,7 +23,7 @@ pkgname=('php'
          'php-xsl')
 pkgver=5.3.10
 _suhosinver=5.3.9-0.9.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
diff --git a/extra/pilot-link/PKGBUILD b/extra/pilot-link/PKGBUILD
index b9b8f20b4..d55ceb9bf 100644
--- a/extra/pilot-link/PKGBUILD
+++ b/extra/pilot-link/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101454 2010-11-29 09:58:17Z allan $
+# $Id: PKGBUILD 148878 2012-02-05 11:53:52Z ibiru $
 # Maintainer: dale <dale@archlinux.org>
 
 # todo: add perl support, DESTDIR has no affect on perl
@@ -6,13 +6,13 @@
 
 pkgname=pilot-link
 pkgver=0.12.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A suite of tools for connecting to PalmOS handheld devices"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('readline>=6.0' 'libpng>=1.4.0' 'libusb-compat' 'popt' 'bluez>=4.59')
+depends=('readline>=6.0' 'libpng>=1.5.0' 'libusb-compat' 'popt' 'bluez>=4.59')
 options=('!libtool')
-url=http://www.pilot-link.org/
+url="http://www.pilot-link.org/"
 source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2
         pilot-link-png14.patch)
 md5sums=('568c55bf504b044f6fbd50baa407c990'
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index cd8d4f347..91e2c7775 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64564 2010-01-21 06:02:58Z eric $
+# $Id: PKGBUILD 148880 2012-02-05 11:53:57Z ibiru $
 # Maintainer: damir <damir@archlinux.org>
 # Packager: Maksim Sipos (maxsipos at gmail dot com)
 
 pkgname=plotutils
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686')
 pkgdesc="Set of utilities and libraries for plotting."
 url="http://directory.fsf.org/graphics/plotutils.html"
@@ -12,16 +12,21 @@ license=("GPL")
 depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
 options=('!libtool')
 install=plotutils.install
-source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz)
-md5sums=('c08a424bd2438c80a786a7f4b5bb6a40')
-sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838')
+source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch)
+sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
+          '426f6ee04186af5059ab54322efaf0a6a976682b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../plotutils-2.6-libpng-1.5.patch
   ./configure --prefix=/usr \
 	--with-gnu-ld \
 	--with-x \
-	--enable-libplotter || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+	--enable-libplotter
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/plotutils/plotutils-2.6-libpng-1.5.patch b/extra/plotutils/plotutils-2.6-libpng-1.5.patch
new file mode 100644
index 000000000..b86d9f457
--- /dev/null
+++ b/extra/plotutils/plotutils-2.6-libpng-1.5.patch
@@ -0,0 +1,31 @@
+fix building with libpng-1.5
+
+--- libplot/z_write.c
++++ libplot/z_write.c
+@@ -164,7 +164,7 @@
+     }
+ 
+   /* cleanup after libpng errors (error handler does a longjmp) */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (png_jmpbuf (png_ptr))
+     {
+       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+       return -1;
+@@ -444,7 +444,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf (png_ptr), 1);
+ }
+ 
+ static void 
+@@ -515,7 +515,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf (png_ptr), 1);
+ }
+ 
+ static void 
diff --git a/extra/plotutils/plotutils.install b/extra/plotutils/plotutils.install
index dd3ffb74f..d3d033e0c 100644
--- a/extra/plotutils/plotutils.install
+++ b/extra/plotutils/plotutils.install
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 
 post_install() {
-  install-info $infodir/plotutils.info $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null
 }
 
 post_upgrade() {
@@ -9,5 +10,6 @@ post_upgrade() {
 }
 
 pre_remove() {
-  install-info --delete $infodir/plotutils.info $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null
 }
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index bda699447..5a79cd246 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147127 2012-01-22 11:06:04Z andyrtr $
+# $Id: PKGBUILD 148882 2012-02-05 11:54:01Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.18.3
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD
index da57d172a..e82fdbe4d 100644
--- a/extra/pygtk/PKGBUILD
+++ b/extra/pygtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138082 2011-09-16 07:34:35Z ibiru $
+# $Id: PKGBUILD 148886 2012-02-05 11:54:15Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=pygtk
 pkgver=2.24.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for the GTK widget set"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -24,7 +24,7 @@ build() {
   #https://bugzilla.gnome.org/show_bug.cgi?id=623965
   patch -Np1 -i "${srcdir}/python27.patch"
 
-  PYTHON=python2 ./configure --prefix=/usr
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/pygtksourceview2/PKGBUILD b/extra/pygtksourceview2/PKGBUILD
index b5e11dcdf..df1db1d63 100644
--- a/extra/pygtksourceview2/PKGBUILD
+++ b/extra/pygtksourceview2/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 101307 2010-11-28 20:57:19Z ibiru $
+# $Id: PKGBUILD 148888 2012-02-05 11:54:18Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pygtksourceview2
 pkgver=2.10.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for gtksourceview2"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool' 'pkg-config')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2)
@@ -19,5 +19,9 @@ build() {
   PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static --disable-docs
   make
+}
+
+package() {
+  cd "${srcdir}/pygtksourceview-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD
index 83019f82e..f1038ce59 100644
--- a/extra/python-iwscan/PKGBUILD
+++ b/extra/python-iwscan/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=python-iwscan
 pkgver=20090609
-pkgrel=2
+pkgrel=3
 pkgdesc="A Python interface to iwlist, using the iwlib library"
 arch=('i686' 'x86_64')
 url="http://projects.otaku42.de/browser/python-iwscan"
diff --git a/extra/python-notify/PKGBUILD b/extra/python-notify/PKGBUILD
index efb98fd88..ad9a615fa 100644
--- a/extra/python-notify/PKGBUILD
+++ b/extra/python-notify/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113112 2011-03-08 08:49:12Z ibiru $
+# $Id: PKGBUILD 148890 2012-02-05 11:54:24Z ibiru $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 pkgname=python-notify
 pkgver=0.1.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Python bindings for libnotify"
 arch=('i686' 'x86_64')
 url="http://www.galago-project.org/"
diff --git a/extra/python-pygame/ChangeLog b/extra/python-pygame/ChangeLog
index ddfd90fe8..566be3f65 100644
--- a/extra/python-pygame/ChangeLog
+++ b/extra/python-pygame/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-24  Angel Velasquez <angvp@archlinux.org>
+
+	* Rebuilt against libpng 1.5
+
 2010-08-24  Eric Belanger  <eric@archlinux.org>
 
 	* Rebuilt for python2
diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD
index a3447b7ce..ef664c8cd 100644
--- a/extra/python-pygame/PKGBUILD
+++ b/extra/python-pygame/PKGBUILD
@@ -1,38 +1,40 @@
-# $Id: PKGBUILD 88496 2010-08-24 05:39:06Z eric $
+# $Id: PKGBUILD 148892 2012-02-05 11:54:30Z ibiru $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: john(?)
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 pkgname=python-pygame
 pkgver=1.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Python game library"
 arch=('i686' 'x86_64')
 url="http://www.pygame.org/"
 license=('LGPL')
-depends=('python2' 'sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
+depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
+makedepends=('python2' 'portmidi') 
 replaces=('pygame')
 provides=('pygame')
 changelog=ChangeLog
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch')
-md5sums=('1c4cdc708d17c8250a2d78ef997222fc' 'aaa668f3cd710d8604114501ea6a6f48')
-sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa' '285815e28705d5a2aea53c9d952d35fddf10dd13')
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch'
+'pygame-v4l.patch')
+md5sums=('1c4cdc708d17c8250a2d78ef997222fc'
+         'aaa668f3cd710d8604114501ea6a6f48'
+         '9915b63865c16519e80007909beed876')
 
 build() {
 	cd "${srcdir}/pygame-${pkgver}release"
 	patch -Np0 -i "${srcdir}/config.patch"
-	python2 config.py -auto
+    patch -Np1 -i "${srcdir}/pygame-v4l.patch"
 }
 
 package() {
 	cd "${srcdir}/pygame-${pkgver}release"
+	python2 config.py -auto
 	python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
 	# Copying the examples and tests
 	cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
 	cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
-
 	# Fixing permissions
 	chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
 }
diff --git a/extra/python-pygame/pygame-v4l.patch b/extra/python-pygame/pygame-v4l.patch
new file mode 100644
index 000000000..3b5a2b9d2
--- /dev/null
+++ b/extra/python-pygame/pygame-v4l.patch
@@ -0,0 +1,88 @@
+diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
+*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
+--- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
+***************
+*** 34,40 ****
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+--- 34,40 ----
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
+*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
+--- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
+***************
+*** 160,179 ****
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+!         if (v4l_open_device(self) == 0) {
+!             v4l2_close_device(self);
+!             return NULL;
+!         } else {
+!             self->camera_type = CAM_V4L;
+!             if (v4l_init_device(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!             if (v4l_start_capturing(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!         }
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+--- 160,167 ----
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+! 	v4l2_close_device(self);
+!         return NULL;
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
+*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
+--- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
+***************
+*** 39,45 ****
+  
+      #include <asm/types.h>          /* for videodev2.h */
+  
+-     #include <linux/videodev.h>
+      #include <linux/videodev2.h>
+  #endif
+  
+--- 39,44 ----
+***************
+*** 51,57 ****
+  #define RGB_OUT 1
+  #define YUV_OUT 2
+  #define HSV_OUT 4
+- #define CAM_V4L 1
+  #define CAM_V4L2 2
+  
+  struct buffer 
+--- 50,55 ----
+***************
+*** 111,118 ****
+  int v4l2_close_device (PyCameraObject* self);
+  int v4l2_open_device (PyCameraObject* self);
+  
+- /* internal functions specific to v4l */
+- int v4l_open_device (PyCameraObject* self);
+- int v4l_init_device(PyCameraObject* self);
+- int v4l_start_capturing(PyCameraObject* self);
+  #endif
+--- 109,112 ----
diff --git a/extra/python-wpactrl/PKGBUILD b/extra/python-wpactrl/PKGBUILD
index 0f3f9b84c..d77c859c4 100644
--- a/extra/python-wpactrl/PKGBUILD
+++ b/extra/python-wpactrl/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=python-wpactrl
 pkgver=20090609
-pkgrel=2
+pkgrel=3
 pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access"
 arch=('i686' 'x86_64')
 url="http://projects.otaku42.de/wiki/PythonWpaCtrl"
diff --git a/extra/pywebkitgtk/PKGBUILD b/extra/pywebkitgtk/PKGBUILD
index df78ea739..9fec0ff5d 100644
--- a/extra/pywebkitgtk/PKGBUILD
+++ b/extra/pywebkitgtk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132031 2011-07-19 09:51:13Z angvp $
+# $Id: PKGBUILD 148894 2012-02-05 11:54:35Z ibiru $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: kasa <biuta.jr@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=pywebkitgtk
 pkgver=1.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings to the WebKit GTK+ port"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/pywebkitgtk/"
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index f1d7baaae..aa0f8e916 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 146639 2012-01-15 08:31:08Z tpowa $
+# $Id: PKGBUILD 148898 2012-02-05 11:54:47Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2.1')
@@ -20,7 +20,7 @@ options=(!strip)
 
 build()
 {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd "${srcdir}/${pkgname}-${pkgver}"
     # fix esound building
     ./configure --prefix=/usr \
                 --python=/usr/bin/python2 \
@@ -32,7 +32,7 @@ build()
 
     # Use latest seabios version
     # https://bugs.archlinux.org/task/27616
-    cd ${srcdir}/
+    cd "${srcdir}/"
     git clone git://git.seabios.org/seabios.git
     cd seabios
     find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
@@ -42,27 +42,27 @@ build()
 
 package()
 {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
     
     # Use latest seabios version
     # https://bugs.archlinux.org/task/27616
-    cp ${srcdir}/seabios/out/bios.bin ${pkgdir}/usr/share/qemu/bios.bin
+    cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
 
     # symbolic link for backwards compatibility
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
     # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu"
     # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm"
     # fix man page
-    mv ${pkgdir}/usr/share/man/man1/qemu.1 \
-                     ${pkgdir}/usr/share/man/man1/qemu-kvm.1
+    mv "${pkgdir}/usr/share/man/man1/qemu.1" \
+                     "${pkgdir}/usr/share/man/man1/qemu-kvm.1"
     # install udev rules
-    install -D -m644 ${srcdir}/65-kvm.rules \
-                     ${pkgdir}/lib/udev/rules.d/65-kvm.rules
+    install -D -m644 "${srcdir}/65-kvm.rules" \
+                     "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
     # strip scripts directory
-    find ${pkgdir}/usr/bin  -type f -perm -u+w 2>/dev/null | while read binary ; do
+    find "${pkgdir}/usr/bin"  -type f -perm -u+w 2>/dev/null | while read binary ; do
       case "$(file -bi "$binary")" in
         *application/x-executable*) # Binaries
         /usr/bin/strip $STRIP_BINARIES "$binary";;
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index f82f81201..87ae4ea37 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 146673 2012-01-16 08:01:45Z tpowa $
+# $Id: PKGBUILD 148896 2012-02-05 11:54:40Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -17,7 +17,7 @@ options=(!strip)
 
 build()
 {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's/lib64/lib/g' x86_64.ld
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
               --python=/usr/bin/python2 \
@@ -26,7 +26,7 @@ build()
               make
   # Use latest seabios version
   # https://bugs.archlinux.org/task/27616
-  cd ${srcdir}/
+  cd "${srcdir}/"
   git clone git://git.seabios.org/seabios.git
   cd seabios
   find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
@@ -35,16 +35,16 @@ build()
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   # Use latest seabios version
   # https://bugs.archlinux.org/task/27616
-  cp ${srcdir}/seabios/out/bios.bin ${pkgdir}/usr/share/qemu/bios.bin
+  cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
 
-  install -D -m644 ${srcdir}/65-kvm.rules \
-                   ${pkgdir}/lib/udev/rules.d/65-kvm.rules
+  install -D -m644 "${srcdir}/65-kvm.rules" \
+                   "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
   # strip scripts directory
-    find ${pkgdir}/usr/src/linux-${_kernver}/scripts  -type f -perm -u+w 2>/dev/null | while read binary ; do
+    find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
       case "$(file -bi "$binary")" in
         *application/x-executable*) # Binaries
         /usr/bin/strip $STRIP_BINARIES "$binary";;
diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD
index fc98e1dc2..42b84139a 100644
--- a/extra/qiv/PKGBUILD
+++ b/extra/qiv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134996 2011-08-09 20:30:46Z eric $
+# $Id: PKGBUILD 148900 2012-02-05 11:54:52Z ibiru $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=qiv
 pkgver=2.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
 arch=('i686' 'x86_64')
 url="http://spiegl.de/qiv/"
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index a57ce304e..909bd3e9e 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 143784 2011-11-29 10:37:04Z bluewind $
+# $Id: PKGBUILD 148902 2012-02-05 11:54:55Z ibiru $
 # Maintainer: Florian Pritz< flo@xinu.at>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=qrencode
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="C library for encoding data in a QR Code symbol."
 arch=(i686 x86_64)
-depends=('libpng>=1.4.0')
+depends=('libpng>=1.5.0')
 makedepends=(sdl)
 url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
 license=('GPL')
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 2edcd2cea..97f3cac36 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145319 2011-12-21 20:46:53Z andrea $
+# $Id: PKGBUILD 148904 2012-02-05 11:55:04Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.0
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -17,20 +17,25 @@ options=('!libtool')
 _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
 source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop')
+        'qtconfig.desktop'
+        'fix-qurl.patch')
 md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd')
+         '6b771c8a81dd90b45e8a79afa0e5bbfd'
+         '7bc255a36733d0fbc80c1902ade4beca')
 
 build() {
   cd "${srcdir}"/${_pkgfqn}
 
+  # (FS#27757)
+  patch -p1 -i "${srcdir}"/fix-qurl.patch
+
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
+  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
   sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
   sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
 
diff --git a/extra/qt/fix-qurl.patch b/extra/qt/fix-qurl.patch
new file mode 100644
index 000000000..1c666dba4
--- /dev/null
+++ b/extra/qt/fix-qurl.patch
@@ -0,0 +1,13 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
+--- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile	2011-10-03 22:44:32.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp	2011-10-27 12:58:35.706815049 -0500
+@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
+ QString QUrl::toLocalFile() const
+ {
+     // the call to isLocalFile() also ensures that we're parsed
+-    if (!isLocalFile())
++    // Treat URLs with no scheme as local for backward compatibility
++    if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
+         return QString();
+ 
+     QString tmp;
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index c0e85d265..0145907e8 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145341 2011-12-21 20:47:33Z andrea $
+# $Id: PKGBUILD 148906 2012-02-05 11:55:17Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
 pkgver=3.3.8
-pkgrel=21
+pkgrel=22
 pkgdesc="The QT3 gui toolkit"
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt/index.html"
@@ -15,12 +15,12 @@ optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 options=('!libtool')
 install=qt.install
 source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
-        qt.profile qt3-png14.patch qt-copy-kde-patches.tar.bz2
+        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2
         qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff
         mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
 sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
           'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
-          'c8ea644266f4d6d6be9adf894f03138b8eca3fc2'
+          '3d19510c46016a1a211d97bf8f82b01498b1b33c'
           '9cb2e5bec782069692ee337cfa171539d9d73753'
           '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
           'ca5ecb29c7f1c826d48703339a3371038e306bb7'
@@ -61,7 +61,7 @@ build() {
   # fix build with gcc 4.6.0
   patch -p1 -i "${srcdir}"/gcc-4.6.patch
 
-  patch -p0 -i "${srcdir}"/qt3-png14.patch 
+  patch -p0 -i "${srcdir}"/qt3-png15.patch 
   # start compiling qt
   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
   rm -rf doc/html examples tutorial
diff --git a/extra/qt3/qt3-png15.patch b/extra/qt3/qt3-png15.patch
new file mode 100644
index 000000000..e64fea36a
--- /dev/null
+++ b/extra/qt3/qt3-png15.patch
@@ -0,0 +1,212 @@
+$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $
+
+--- src/kernel/qpngio.cpp.orig	2007-02-02 10:01:15.000000000 -0400
++++ src/kernel/qpngio.cpp
+@@ -43,6 +43,7 @@
+ #include "qiodevice.h"
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ 
+ #ifdef Q_OS_TEMP
+@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct
+     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+ 	0, 0, 0);
+ 
++    png_colorp info_ptr_palette = NULL;
++    int info_ptr_num_palette = 0;
++    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
++	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
++    }
++
++    png_bytep info_ptr_trans_alpha = NULL;
++    int info_ptr_num_trans = 0;
++    png_color_16p info_ptr_trans_color = NULL;
++
++    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
++	png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
++    }
++
++
+     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
+ 	// Black & White or 8-bit grayscale
+-	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
++	if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
+ 	    png_set_invert_mono( png_ptr );
+ 	    png_read_update_info( png_ptr, info_ptr );
+ 	    if (!image.create( width, height, 1, 2, QImage::BigEndian ))
+@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+-		const int g = info_ptr->trans_values.gray;
++		const int g = info_ptr_trans_color->gray;
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(TRUE);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct
+ 	}
+     } else if ( color_type == PNG_COLOR_TYPE_PALETTE
+      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
+-     && info_ptr->num_palette <= 256 )
++     && info_ptr_num_palette <= 256 )
+     {
+ 	// 1-bit and 8-bit color
+ 	if ( bit_depth != 1 )
+@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct
+ 	png_read_update_info( png_ptr, info_ptr );
+ 	png_get_IHDR(png_ptr, info_ptr,
+ 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
+-	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
++	if (!image.create(width, height, bit_depth, info_ptr_num_palette,
+ 	    QImage::BigEndian))
+ 	    return;
+ 	int i = 0;
+ 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+ 	    image.setAlphaBuffer( TRUE );
+-	    while ( i < info_ptr->num_trans ) {
++	    while ( i < info_ptr_num_trans ) {
+ 		image.setColor(i, qRgba(
+-		    info_ptr->palette[i].red,
+-		    info_ptr->palette[i].green,
+-		    info_ptr->palette[i].blue,
+-		    info_ptr->trans[i]
++		    info_ptr_palette[i].red,
++		    info_ptr_palette[i].green,
++		    info_ptr_palette[i].blue,
++		    info_ptr_trans_alpha[i]
+ 		    )
+ 		);
+ 		i++;
+ 	    }
+ 	}
+-	while ( i < info_ptr->num_palette ) {
++	while ( i < info_ptr_num_palette ) {
+ 	    image.setColor(i, qRgba(
+-		info_ptr->palette[i].red,
+-		info_ptr->palette[i].green,
+-		info_ptr->palette[i].blue,
++		info_ptr_palette[i].red,
++		info_ptr_palette[i].green,
++		info_ptr_palette[i].blue,
+ 		0xff
+ 		)
+ 	    );
+@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio)
+ 	return;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ 	iio->setStatus(-4);
+ 	return;
+@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q
+ 	return FALSE;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	png_destroy_write_struct(&png_ptr, &info_ptr);
+ 	return FALSE;
+     }
+@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q
+ 
+     png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
+ 
++#warning XXXtnn not too sure about this
++/* 
++according to png.h, channels is only used on read, not writes, so we
++should be able to comment this out.
++
+     info_ptr->channels =
+ 	(image.depth() == 32)
+ 	    ? (image.hasAlphaBuffer() ? 4 : 3)
+ 	    : 1;
++*/
+ 
+     png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
+ 	image.depth() == 1 ? 1 : 8 /* per channel */,
+@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q
+ 		: PNG_COLOR_TYPE_RGB
+ 	    : PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
+ 
++    png_color_8 sig_bit;
++    sig_bit.red = 8;
++    sig_bit.green = 8;
++    sig_bit.blue = 8;
++    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+ 
+-    //png_set_sBIT(png_ptr, info_ptr, 8);
+-    info_ptr->sig_bit.red = 8;
+-    info_ptr->sig_bit.green = 8;
+-    info_ptr->sig_bit.blue = 8;
+ 
+     if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian)
+        png_set_packswap(png_ptr);
+@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q
+ 	png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
+ 	int* trans = new int[num_palette];
+ 	int num_trans = 0;
++	png_colorp info_ptr_palette = NULL;
++	int tmp;
++	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
+ 	for (int i=0; i<num_palette; i++) {
+ 	    QRgb rgb=image.color(i);
+-	    info_ptr->palette[i].red = qRed(rgb);
+-	    info_ptr->palette[i].green = qGreen(rgb);
+-	    info_ptr->palette[i].blue = qBlue(rgb);
++	    info_ptr_palette[i].red = qRed(rgb);
++	    info_ptr_palette[i].green = qGreen(rgb);
++	    info_ptr_palette[i].blue = qBlue(rgb);
+ 	    if (image.hasAlphaBuffer()) {
+ 		trans[i] = rgb >> 24;
+ 		if (trans[i] < 255) {
+@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q
+ 		}
+ 	    }
+ 	}
++	png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
+ 	if (num_trans) {
+ 	    copy_trans = new png_byte[num_trans];
+ 	    for (int i=0; i<num_trans; i++)
+@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q
+     }
+ 
+     if ( image.hasAlphaBuffer() ) {
+-	info_ptr->sig_bit.alpha = 8;
++        png_color_8p sig_bit;
++        png_get_sBIT(png_ptr, info_ptr, &sig_bit);
++        sig_bit->alpha = 8;
++        png_set_sBIT(png_ptr, info_ptr, sig_bit);
+     }
+ 
+     // Swap ARGB to RGBA (normal PNG format) before saving on
+@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma
+ 	    return -1;
+ 	}
+ 
+-	if (setjmp((png_ptr)->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ 	    image = 0;
+ 	    return -1;
+@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma
+ 
+     if ( !png_ptr ) return 0;
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ 	image = 0;
+ 	state = MovieStart;
+@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn
+     consumer->frameDone(QPoint(offx,offy),r);
+     consumer->end();
+     state = FrameStart;
+-    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
++    unused_data = png_process_data_pause(png, 0);
+ }
+ 
+ #ifdef PNG_USER_CHUNKS_SUPPORTED
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index 41c84d82a..1689779ab 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136909 2011-09-02 18:19:47Z ronald $
+# $Id: PKGBUILD 148908 2012-02-05 11:55:28Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir.archlinux.org>
 # Contributor: Gergely Imreh <imrehg@gmail.com>
 
 pkgname=qtiplot
 pkgver=0.9.8.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/qtiplot.html"
 pkgdesc="Data analysis and scientific plotting - free clone of Origin"
@@ -24,16 +24,20 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
         qtiplot.xml
 	qtiplot-0.9.8.6-gold.patch
 	qtiplot-0.9.8.6-kde.patch
-	qtiplot-0.9.8.6-tamuanova.patch)
+	qtiplot-0.9.8.6-tamuanova.patch
+        qwtplot3d-qt-4.8.0.patch
+        qwtplot3d-libpng15.patch)
 sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
           '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
           '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          'b3af6c866b3e63b537b418b6d00e57ef468f8f2b'
+          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
           '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
           '285f57d865956d93250ec548288c5bface096b6b'
           'b534a609f317cf3117d6495909854cdacea20124'
           'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0')
+          '830b518e3ef63625df84363a8047417124f243b0'
+          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
+          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -58,6 +62,8 @@ build() {
 
   # Make qwtplot3d
   cd ../qwtplot3d
+  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
+  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
   qmake
   make
 
diff --git a/extra/qtiplot/build.conf.archlinux b/extra/qtiplot/build.conf.archlinux
index 342377578..7ccded7fa 100644
--- a/extra/qtiplot/build.conf.archlinux
+++ b/extra/qtiplot/build.conf.archlinux
@@ -3,7 +3,7 @@ isEmpty( QTI_ROOT ) {
 }
 
 SYS_INCLUDEPATH = /usr/include
-SYS_LIBS = -L/usr/lib
+SYS_LIBS = -L/usr/lib -lGLU
 
 MUPARSER_LIBS = -lmuparser 
 GSL_LIBS = -lgsl -lgslcblas
@@ -18,6 +18,7 @@ LIB_ORIGIN_LIBS = -lorigin2
 QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
 TAMUANOVA_LIBS = -ltamuanova
 TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
+LIBPNG_LIBS = -lpng
 
 PYTHON = python2
 LUPDATE = lupdate
diff --git a/extra/qtiplot/qwtplot3d-libpng15.patch b/extra/qtiplot/qwtplot3d-libpng15.patch
new file mode 100644
index 000000000..828f0c6d8
--- /dev/null
+++ b/extra/qtiplot/qwtplot3d-libpng15.patch
@@ -0,0 +1,10 @@
+--- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
++++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
+@@ -47,6 +47,7 @@
+ #endif
+ 
+ #if defined(GL2PS_HAVE_LIBPNG)
++#include <zlib.h>
+ #include <png.h>
+ #endif
+ 
diff --git a/extra/qtiplot/qwtplot3d-qt-4.8.0.patch b/extra/qtiplot/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000..9d30f6b7b
--- /dev/null
+++ b/extra/qtiplot/qwtplot3d-qt-4.8.0.patch
@@ -0,0 +1,34 @@
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:58:30.000000000 -0500
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+ 
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+ 
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:57:21.000000000 -0500
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__
+ 
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+ 
+ namespace Qwt3D
+ {
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 6848e5354..7f2401e01 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147988 2012-01-29 11:59:55Z ronald $
+# $Id: PKGBUILD 148910 2012-02-05 11:55:33Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
 pkgver=2.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 9e5a9dc9d..7d3c2f1e2 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135894 2011-08-20 03:53:06Z eric $
+# $Id: PKGBUILD 148912 2012-02-05 11:55:38Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
@@ -16,7 +16,6 @@ optdepends=('tcl: to use corresponding binding' \
             'lua: to use corresponding binding')
 options=('!libtool' '!emptydirs' '!makeflags')
 source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-md5sums=('4d116dba9a0888d8aaac179e35d3980a')
 sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
 
 build() {
diff --git a/extra/rssh/PKGBUILD b/extra/rssh/PKGBUILD
index 131c0ed16..c1d9e08f7 100644
--- a/extra/rssh/PKGBUILD
+++ b/extra/rssh/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 100737 2010-11-25 18:27:36Z bisson $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 149042 2012-02-05 15:15:17Z bisson $
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
 pkgname=rssh
 pkgver=2.3.3
-pkgrel=2
-pkgdesc='A restricted shell for use with OpenSSH, allowing only scp and/or sftp'
-arch=('i686' 'x86_64')
+pkgrel=3
+pkgdesc='Restricted shell for use with OpenSSH, allowing only scp and/or sftp'
 url='http://www.pizzashack.org/rssh/'
-depends=('openssh' 'glibc')
-backup=('etc/rssh.conf')
 license=('custom:rssh')
-source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-$pkgver.tar.gz"
+arch=('i686' 'x86_64')
+backup=('etc/rssh.conf')
+depends=('openssh')
+source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-${pkgver}.tar.gz"
         'destdir.patch'
         'rsync.patch')
 sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a'
@@ -17,18 +19,22 @@ sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a'
           '41f32f8a77b3a2b924ede6044ab67846e06b5d20')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../destdir.patch
+	patch -p1 -i ../rsync.patch # FS#21783, debian patch
 
-	patch -p1 < ../destdir.patch
-	patch -p1 < ../rsync.patch # FS#21783, debian patch
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/rssh \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
 
-	./configure --prefix=/usr --libexecdir=/usr/lib/rssh \
-		--mandir=/usr/share/man --sysconfdir=/etc
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/rssh/LICENSE
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/rssh/LICENSE
 }
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 6d0d26c57..10a12a174 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140036 2011-10-05 21:49:29Z ibiru $
+# $Id: PKGBUILD 148914 2012-02-05 11:55:45Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=4
+pkgrel=5
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
+depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
 makedepends=('texlive-latexextra')
 install=$pkgname.install
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
@@ -19,6 +19,10 @@ source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-
         'sane.xinetd'
         'libv4l-0.8.3.patch'
         'xerox_mfp_fix_usb_devices.patch')
+md5sums=('fadf56a60f4776bfb24491f66b617cf5'
+         'da946cc36fb83612162cf9505986d4b2'
+         'e645a8921cff9f18ffbdabb2ed885060'
+         'cfef73e7db7c28308914d3db6767d852')
 options=(!libtool)
 
 build() {
@@ -46,12 +50,8 @@ package () {
   install -D -m0644 tools/udev/libsane.rules \
     "${pkgdir}/lib/udev/rules.d/53-sane.rules"
   # fix udev rules
-  sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
+  sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules"
   
   # install xinetd file
   install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
 }
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
-         'da946cc36fb83612162cf9505986d4b2'
-         'e645a8921cff9f18ffbdabb2ed885060'
-         'cfef73e7db7c28308914d3db6767d852')
diff --git a/extra/sane/sane.install b/extra/sane/sane.install
index cbecf7b2e..5ec361eea 100644
--- a/extra/sane/sane.install
+++ b/extra/sane/sane.install
@@ -1,14 +1,7 @@
 post_install() {
-    getent group scanner >/dev/null 2>&1 || groupadd -g 96 scanner &>/dev/null
 	/bin/cat <<THEEND
 NOTE
 ----
 Add your user to group 'scanner' to use scanner devices.
 THEEND
 }
-
-post_remove() {
-    if getent group scanner >/dev/null 2>&1; then
-        groupdel scanner
-    fi
-}
diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD
index ba47b28a5..08dfac7cc 100644
--- a/extra/scim-anthy/PKGBUILD
+++ b/extra/scim-anthy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110875 2011-02-22 20:13:47Z bisson $
+# $Id: PKGBUILD 148916 2012-02-05 11:55:48Z ibiru $
 # Contributor: damir <damir@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-anthy
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 _filecode=37309
 pkgdesc='Japanese input method module for SCIM'
 arch=('i686' 'x86_64')
diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD
index d9e6451b5..c9e01f6f7 100644
--- a/extra/scim-chewing/PKGBUILD
+++ b/extra/scim-chewing/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 111539 2011-02-27 15:04:14Z bisson $
+# $Id: PKGBUILD 149044 2012-02-05 15:19:54Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: whisky <archlinux.cle(at)gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-chewing
 pkgver=0.3.4
-pkgrel=1
+pkgrel=3
 pkgdesc='Traditional Chinese input method module for SCIM'
-arch=('i686' 'x86_64')
 url='http://chewing.csie.net/'
 license=('GPL')
-depends=('scim' 'libchewing')
-makedepends=('intltool')
 options=('!libtool')
+arch=('i686' 'x86_64')
+makedepends=('intltool')
+depends=('scim' 'libchewing')
 source=("http://chewing.csie.net/download/scim/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05')
 
diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD
index 4fcb26155..7938e7768 100644
--- a/extra/scim-m17n/PKGBUILD
+++ b/extra/scim-m17n/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 110890 2011-02-22 20:14:59Z bisson $
+# $Id: PKGBUILD 149048 2012-02-05 15:25:52Z bisson $
 # Contributor: Camille Moncelier <pix@devlife.org>
 # Contributor: damir <damir@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-m17n
 pkgver=0.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Multilingual input method module for SCIM'
-arch=('i686' 'x86_64')
 url='http://www.scim-im.org/'
 license=('GPL')
-depends=('scim' 'm17n-lib')
 options=('!libtool')
+arch=('i686' 'x86_64')
+depends=('scim' 'm17n-lib')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea')
 
diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD
index 3f8e1e149..abf1fe1d8 100644
--- a/extra/scim-pinyin/PKGBUILD
+++ b/extra/scim-pinyin/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 77980 2010-04-19 08:02:17Z allan $
-# Maintainer: 
+# $Id: PKGBUILD 149097 2012-02-05 17:19:20Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributer: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim-pinyin
 pkgver=0.5.91
-pkgrel=5
-pkgdesc="Chinese 拼音 (PinYin) input for SCIM"
+pkgrel=6
+pkgdesc='Chinese pinyin input for SCIM'
+url='http://www.scim-im.org/'
 arch=('i686' 'x86_64')
-url="http://www.scim-im.org/"
-license=GPL
-depends=('scim>=1.4.7')
+license=('GPL')
+depends=('scim')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz
-        scim-pinyin-0.5.91-gcc43.patch)
-md5sums=('fb96d3545090d7681ea03edaced4eccb'
-         'ef84582d9bac7ac250d2d64cf260ad39')
+source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
+        'gcc43.patch')
+sha1sums=('58bea437a211b7af8420057541a38933a41841c7'
+          'b78ecec237ee0e04ec43604fcc344ff43ccfb7b3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/scim-pinyin-0.5.91-gcc43.patch
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --disable-static
-  make || return 1
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../gcc43.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+
+	make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
-
-
diff --git a/extra/scim-pinyin/gcc43.patch b/extra/scim-pinyin/gcc43.patch
new file mode 100644
index 000000000..91a948d5d
--- /dev/null
+++ b/extra/scim-pinyin/gcc43.patch
@@ -0,0 +1,44 @@
+diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp
+--- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43	2008-02-25 16:27:05.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-02-25 16:26:41.000000000 +0800
+@@ -28,6 +28,7 @@
+ #define SCIM_PHRASE_MAX_RELATION 1000
+ 
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin_private.h"
+ #include "scim_phrase.h"
+ 
+diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp
+--- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43	2008-02-25 16:27:55.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-02-25 16:28:08.000000000 +0800
+@@ -22,6 +22,7 @@
+ 
+ #include <time.h>
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin_private.h"
+ #include "scim_special_table.h"
+ 
+diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp
+--- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43	2008-02-25 16:26:10.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-02-25 16:26:26.000000000 +0800
+@@ -29,6 +29,7 @@
+ #define Uses_SCIM_LOOKUP_TABLE
+ 
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin.h"
+ 
+ // Internal functions
+diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
+--- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43	2008-02-25 16:27:15.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-02-25 16:27:28.000000000 +0800
+@@ -27,6 +27,7 @@
+ #define Uses_SCIM_LOOKUP_TABLE
+ 
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin_private.h"
+ #include "scim_phrase.h"
+ #include "scim_pinyin.h"
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index ca35f2882..e702643b6 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 134848 2011-08-07 23:21:19Z bisson $
+# $Id: PKGBUILD 148920 2012-02-05 11:55:57Z ibiru $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-tables
 pkgver=0.5.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Generic table input method module for SCIM'
-arch=('i686' 'x86_64')
 url='http://www.scim-im.org/'
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('scim')
 options=('!libtool')
diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD
index b93293cf4..8d87455fa 100644
--- a/extra/scim-uim/PKGBUILD
+++ b/extra/scim-uim/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 92903 2010-10-01 19:04:42Z bisson $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 149050 2012-02-05 15:34:14Z bisson $
+# Contributor: damir <damir@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org
 
 pkgname=scim-uim
 pkgver=0.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc='UIM bridging input engine for SCIM'
-arch=('i686' 'x86_64')
 url='http://www.scim-im.org/'
 license=('GPL')
-depends=('scim>=1.4.8' 'uim>=1.5.5')
-options=(!libtool)
-source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz"
+options=('!libtool')
+depends=('scim' 'uim')
+arch=('i686' 'x86_64')
+source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
         'scim-uim-0.2.0-fix-gcc43-build.patch'
-        'uim-1.5.5-header.diff')
+        'uim-1.5.5-header.patch')
 sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a'
           'a9d67946f956d0572c73065e2b4b268bfdf149e3'
           '3b083260910f7855b5446960ab1203c052f4b56c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 < ../scim-uim-0.2.0-fix-gcc43-build.patch
-  patch -p1 < ../uim-1.5.5-header.diff
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../scim-uim-0.2.0-fix-gcc43-build.patch
+	patch -p1 -i ../uim-1.5.5-header.patch
+	./configure --prefix=/usr --sysconfdir=/etc --disable-static
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/scim-uim/uim-1.5.5-header.patch b/extra/scim-uim/uim-1.5.5-header.patch
new file mode 100644
index 000000000..0e6565827
--- /dev/null
+++ b/extra/scim-uim/uim-1.5.5-header.patch
@@ -0,0 +1,13 @@
+--- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp
++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp
+@@ -34,7 +34,8 @@
+
+ #include <scim.h>
+ #include "scim_uim_imengine.h"
+-#include <uim/uim-compat-scm.h>
++#include <uim/uim-scm.h>
++#include <uim/uim-util.h>
+
+ #define scim_module_init uim_LTX_scim_module_init
+ #define scim_module_exit uim_LTX_scim_module_exit
+
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 5af43d7ed..3ad378912 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146995 2012-01-20 06:04:00Z remy $
+# $Id: PKGBUILD 148922 2012-02-05 11:56:01Z ibiru $
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
@@ -6,7 +6,7 @@
 
 pkgname=scribus
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net"
@@ -23,7 +23,9 @@ sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
 
 build() {
 	cd "${srcdir}"
-	sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/scripts/ColorChart.py
+	sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+	       -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+               ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD
index 7643e2ba8..3f5fefb58 100644
--- a/extra/sdl_image/PKGBUILD
+++ b/extra/sdl_image/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147083 2012-01-21 17:53:25Z heftig $
+# $Id: PKGBUILD 148924 2012-02-05 11:56:07Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_image
 pkgver=1.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple library to load images of various formats as SDL surfaces"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD
index 269f9b724..2e9e27742 100644
--- a/extra/skanlite/PKGBUILD
+++ b/extra/skanlite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145180 2011-12-19 08:38:09Z andrea $
+# $Id: PKGBUILD 148928 2012-02-05 11:56:16Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=skanlite
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Image Scanning Application for KDE"
 arch=('i686' 'x86_64')
 url='http://kde-apps.org/content/show.php?content=109803'
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 6dea30917..fc74689a8 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141487 2011-10-30 22:51:16Z bisson $
+# $Id: PKGBUILD 148930 2012-02-05 11:56:28Z ibiru $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
 
 pkgname=slim
 pkgver=1.3.2
-pkgrel=6
+pkgrel=7
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
@@ -17,38 +17,38 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rc.d'
         'pam.d'
         'logrotate'
-        'gcc44.patch'
         'ptr_pam.patch'
         'no-host.patch'
         'restart.patch'
         'sigterm.patch'
         'session-name.patch'
-        'tty-slowness.patch')
+        'tty-slowness.patch'
+        'slim-1.3.2-libpng15.patch')
 sha1sums=('e421d5487732c8317f8f591906661e014b036358'
           '6fe0ba83509af634bce47be34e30995965bffc79'
           'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
           'b969cc902c1d9915a5609141a652c77b2732407b'
-          '51121d451116c768d0fc027ff1ea70aaaef036e7'
           '640668c984a13593a1bfba8d3b503c005d5f401e'
           'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
           '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
           '0b35048723c527fb824c5e0f9b9064f751871785'
           'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
-          '213fefe8533c845ea8c40585b6a8097820d5e5d2')
+          '213fefe8533c845ea8c40585b6a8097820d5e5d2'
+          '3cd674e548f4e0aadbbd32a67b4efd1ed263afef')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	sed -i -e 's/png12/png14/g' Makefile
-	patch -p1 -i ../gcc44.patch   # FS#14815: lacks include for gcc-4.4
+	sed -i -e 's/png12/png15/g' Makefile
 	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
 	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
 	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
 	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
 	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
+	patch -p0 -i ../slim-1.3.2-libpng15.patch
 
 	make USE_PAM=1
 }
diff --git a/extra/slim/slim-1.3.2-libpng15.patch b/extra/slim/slim-1.3.2-libpng15.patch
new file mode 100644
index 000000000..720608567
--- /dev/null
+++ b/extra/slim/slim-1.3.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- png.c
++++ png.c
+@@ -57,7 +57,7 @@
+         return(0);
+     }
+   
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+         png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+         fclose(infile);
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 774654feb..5973fa422 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142642 2011-11-12 17:15:40Z ibiru $
+# $Id: PKGBUILD 148932 2012-02-05 11:56:32Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/"
@@ -25,7 +25,7 @@ sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
-  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
+  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
   make
diff --git a/extra/streamtuner/PKGBUILD b/extra/streamtuner/PKGBUILD
index f449a3f89..ea344e218 100644
--- a/extra/streamtuner/PKGBUILD
+++ b/extra/streamtuner/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94130 2010-10-04 18:10:32Z andyrtr $
+# $Id: PKGBUILD 148934 2012-02-05 11:56:39Z ibiru $
 # Contributor: Greg Grabinski <greg@grabinski.ch>
 # Maintainer: ndreas Radke <andyrtr@archlinux.org>
 
 pkgname=streamtuner
 pkgver=0.99.99
-pkgrel=11
+pkgrel=12
 pkgdesc="A stream directory browser"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/streamtuner/"
@@ -26,12 +26,12 @@ md5sums=('2027b7c34e85b594524b0b4351c14362'
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff || return 1
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff || return 1
+  patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff
+  patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff
   # fix http://bugs.archlinux.org/task/10308
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff || return 1
+  patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff
   # fix http://bugs.archlinux.org/task/11463
-  patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff || return 1
+  patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff
   
   # python2 fixes
   sed -i "s:^for ac_prog in python:for ac_prog in python2:" ${srcdir}/${pkgname}-${pkgver}/configure
diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD
index bde9d495e..e36a4a057 100644
--- a/extra/taglib-sharp/PKGBUILD
+++ b/extra/taglib-sharp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75153 2010-03-31 23:10:28Z giovanni $
+# $Id: PKGBUILD 149091 2012-02-05 17:08:11Z daniel $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Carlos Ruiz <cailovirtual@gmail.com>
 
 pkgname=taglib-sharp
 pkgver=2.0.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Free and Open Source library for the .NET 2.0 and Mono frameworks which will let you tag your software with as much or as little detail as you like without slowing you down."
 arch=('i686' 'x86_64')
 url="http://www.taglib-sharp.com/Main_Page"
diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD
index 82ced473c..bbfec5b5a 100644
--- a/extra/timidity++/PKGBUILD
+++ b/extra/timidity++/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 89194 2010-08-30 06:14:52Z eric $
+# $Id: PKGBUILD 148660 2012-02-05 11:45:59Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=timidity++
 pkgver=2.13.2
-pkgrel=10
+pkgrel=11
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('i686' 'x86_64')
 url="http://timidity.sourceforge.net"
 license=('GPL')
 depends=('libao' 'libvorbis' 'jack' 'ncurses')
-makedepends=('xaw3d' 'gtk2' 'tk' 'libxaw')
+makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw')
 optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
             'xaw3d: for using the Xaw interface')
 backup=('etc/timidity++/timidity.cfg')
@@ -18,14 +18,22 @@ source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.bz2 \
         timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \
         timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch \
         timidity++-2.13.2-polling.patch)
-md5sums=('a82ceeb2245e22f4de2b41da21eaee32' '3fcc8f065c959205113fa7e9ab2be3c6'\
-         '35606c12af9c6be9361d64fc536f046f' '0868926c5290817cacb9a1849bc043c2'\
-         'fcbd27ff83066f69a3f8bd2442a3b3e2' '31bdaea612f18e2c3d45a8a73ab44c81'\
-         '16a4adec164836d4390dc6b0f9a69ce9' '3f0034ead451cdd1078868e9e9b0494c')
-sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e' '660b3afbb720d26e8f008034cee66dd8da082d6e'\
-         '9f3e732a7ca1e97119a76df62ecf154df04d4f77' '8d50618a2379c078b07e8d0fc59457855c16106c'\
-         '59b0dbe3cde8f7b41d83676d8c37809255d3fb36' '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60'\
-         'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4' '6abaedaecdecabf9dc76c062f7157571aed53984')
+md5sums=('a82ceeb2245e22f4de2b41da21eaee32'
+         '3fcc8f065c959205113fa7e9ab2be3c6'
+         '35606c12af9c6be9361d64fc536f046f'
+         '0868926c5290817cacb9a1849bc043c2'
+         'fcbd27ff83066f69a3f8bd2442a3b3e2'
+         '31bdaea612f18e2c3d45a8a73ab44c81'
+         '16a4adec164836d4390dc6b0f9a69ce9'
+         '3f0034ead451cdd1078868e9e9b0494c')
+sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e'
+          '660b3afbb720d26e8f008034cee66dd8da082d6e'
+          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
+          '8d50618a2379c078b07e8d0fc59457855c16106c'
+          '59b0dbe3cde8f7b41d83676d8c37809255d3fb36'
+          '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60'
+          'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4'
+          '6abaedaecdecabf9dc76c062f7157571aed53984')
 
 build() {
   cd "${srcdir}/TiMidity++-${pkgver}"
@@ -39,7 +47,7 @@ build() {
 
   ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
 	--enable-server --enable-alsaseq --enable-spectrogram \
-	--enable-audio=alsa,oss,ao,vorbis,flac,esd,jack \
+	--enable-audio=alsa,oss,ao,vorbis,flac,jack \
 	--enable-dynamic=ncurses,tcltk,vt100,xaw,gtk \
 	--disable-gtktest
   make
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index e5c25695b..e1db1dc7d 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145110 2011-12-17 04:30:48Z heftig $
+# $Id: PKGBUILD 148940 2012-02-05 11:56:59Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,7 +7,7 @@ pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
 pkgver=0.12.9
 _tver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -33,6 +33,8 @@ build() {
     --enable-libflac \
     --enable-libvorbis
 
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index a74dbfd64..82cb5c8de 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147746 2012-01-27 20:01:33Z ibiru $
+# $Id: PKGBUILD 148942 2012-02-05 11:57:05Z ibiru $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64')
 url="http://tcforge.berlios.de/"
diff --git a/extra/transfig/PKGBUILD b/extra/transfig/PKGBUILD
index 6a223da76..a17e6047f 100644
--- a/extra/transfig/PKGBUILD
+++ b/extra/transfig/PKGBUILD
@@ -1,36 +1,37 @@
-# $Id: PKGBUILD 81063 2010-05-26 10:19:14Z jgc $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 148944 2012-02-05 11:57:10Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=transfig
-pkgver=3.2.5c
-pkgrel=3
+pkgver=3.2.5d
+pkgrel=1
 pkgdesc="Format conversion utility that can be used with xfig"
 arch=('i686' 'x86_64')
 url="http://www.xfig.org"
 license=('custom')
 depends=('libpng' 'libxpm')
 makedepends=('imake')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE)
-md5sums=('0cc55ed6b4ae67a3e610e501acd694f9' 'a0b2ea903821c46dbc77afefc06d1aa4')
-sha1sums=('20013b350e81400943cd91744173445d7bd4d98e' 'b8b712871615308b8b6add92f86d218437d652f2')
+source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \
+        transfig-3.2.5d-libpng-1.5.patch)
+sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc'
+          'b8b712871615308b8b6add92f86d218437d652f2'
+          '9f9f332b0b31e58e59542bc1568df9617b71710a')
 
 build() {
-	cd ${srcdir}/${pkgname}.${pkgver}
-	sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile || return 1
-	sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile || return 1
+  cd "${srcdir}/${pkgname}.${pkgver}"
+  sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile
+  sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile
+  patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch
 
-	xmkmf || return 1
-	make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles || return 1
-	make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig || return 1
+  xmkmf
+  make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles
+  make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig
 }
 
 package() {
-	cd ${srcdir}/${pkgname}.${pkgver}
+  cd "${srcdir}/${pkgname}.${pkgver}"
 
-	make DESTDIR=${pkgdir} XFIGLIBDIR=/usr/share/xfig \
-	    FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
-	    install install.man || return 1
-	install -Dm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \
+    FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
+    install install.man
+  install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/transfig/transfig-3.2.5d-libpng-1.5.patch b/extra/transfig/transfig-3.2.5d-libpng-1.5.patch
new file mode 100644
index 000000000..e6f15e43e
--- /dev/null
+++ b/extra/transfig/transfig-3.2.5d-libpng-1.5.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/show_bug.cgi?id=356751
+
+Index: transfig.3.2.5d/fig2dev/dev/readpng.c
+===================================================================
+--- transfig.3.2.5d.orig/fig2dev/dev/readpng.c
++++ transfig.3.2.5d/fig2dev/dev/readpng.c
+@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly)
+     }
+ 
+     /* set long jump here */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* if we get here there was a problem reading the file */
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ 	return 0;
+@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly)
+     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+ 	&interlace_type, &compression_type, &filter_type);
+ 
+-    if (info_ptr->valid & PNG_INFO_gAMA)
+-	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
+-    else
+-	png_set_gamma(png_ptr, 2.2, 0.45);
++    png_fixed_point gamma = 0.45;
++    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
++    png_set_gamma(png_ptr, 2.2, gamma);
+ 
+-    if (info_ptr->valid & PNG_INFO_bKGD)
++    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
+ 	/* set the background to the one supplied */
+-	png_set_background(png_ptr, &info_ptr->background,
++    	png_color_16p background;
++	png_get_bKGD(png_ptr,info_ptr,&background);
++	png_set_background(png_ptr, background,
+ 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
++    }
+     else {
+ 	/* blend the canvas background using the alpha channel */
+ 	if (bgspec) {
diff --git a/extra/tsocks/PKGBUILD b/extra/tsocks/PKGBUILD
index 0c65f8794..ae03265d3 100644
--- a/extra/tsocks/PKGBUILD
+++ b/extra/tsocks/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 111127 2011-02-24 08:00:08Z bisson $
+# $Id: PKGBUILD 149054 2012-02-05 15:38:18Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=tsocks
 pkgver=1.8beta5
-pkgrel=4
+pkgrel=5
 pkgdesc='Transparent SOCKS proxying library'
-arch=('i686' 'x86_64')
 url='http://tsocks.sourceforge.net/'
 license=('GPL')
+arch=('i686' 'x86_64')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('489f88c5df999ba21b27cdaa7836d9426d062aec')
 
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 69f4609af..c7f54c6bf 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 146987 2012-01-19 22:31:36Z foutrelis $
+# $Id: PKGBUILD 148946 2012-02-05 11:57:15Z ibiru $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
 pkgver=0.1.23
-pkgrel=3
+pkgrel=4
 pkgdesc="D-Bus service for applications to request thumbnails"
 arch=('i686' 'x86_64')
 url="http://git.xfce.org/xfce/tumbler/"
diff --git a/extra/tuxpuck/PKGBUILD b/extra/tuxpuck/PKGBUILD
index bbd316b5d..aecbcdaa6 100644
--- a/extra/tuxpuck/PKGBUILD
+++ b/extra/tuxpuck/PKGBUILD
@@ -1,22 +1,41 @@
-# $Id: PKGBUILD 63695 2010-01-18 10:38:26Z andrea $
+# $Id: PKGBUILD 148948 2012-02-05 11:57:19Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=tuxpuck
 pkgver=0.8.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Airhockey with tux"
 arch=('i686' 'x86_64')
 url="http://home.no.net/munsuun/tuxpuck/"
 license=('GPL2')
-depends=('libjpeg>=8' 'sdl' 'libpng>=1.4.0' 'libvorbis')
+depends=('libjpeg' 'sdl' 'libpng' 'libvorbis')
 makedepends=('freetype2')
 options=('!makeflags')
-source=(http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz)
-md5sums=('fc839abc2b1f3eafae397e1ed6487079')
+source=("http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz"
+        'tuxpuck-0.8.2-ldflags.patch'
+        'tuxpuck-0.8.2-libpng15.patch')
+md5sums=('fc839abc2b1f3eafae397e1ed6487079'
+         'cb914d211bf3f519b7700fda180612b0'
+         'a4da530d670a0c30ac0840aab1db0dca')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  sed -i 's|usr/man|usr/share/man|' Makefile || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+
+  sed -i 's|usr/man|usr/share/man|' Makefile
+  sed -i -e 's/-Werror//' \
+         -e '/^CC/d' \
+         Makefile \
+         utils/Makefile \
+         data/Makefile
+
+  patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-ldflags.patch"
+  patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-libpng15.patch"
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
 }
diff --git a/extra/tuxpuck/tuxpuck-0.8.2-ldflags.patch b/extra/tuxpuck/tuxpuck-0.8.2-ldflags.patch
new file mode 100644
index 000000000..28fcef48a
--- /dev/null
+++ b/extra/tuxpuck/tuxpuck-0.8.2-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2010-10-05 10:34:57.000000000 +0200
++++ Makefile	2010-10-05 10:35:28.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ $(NAME) : $(OBJS)
+ 	cd data; $(MAKE)
+-	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
++	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
+ 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
+ 
+ w32icon.o : data/icons/tuxpuck.ico
diff --git a/extra/tuxpuck/tuxpuck-0.8.2-libpng15.patch b/extra/tuxpuck/tuxpuck-0.8.2-libpng15.patch
new file mode 100644
index 000000000..ca9539f39
--- /dev/null
+++ b/extra/tuxpuck/tuxpuck-0.8.2-libpng15.patch
@@ -0,0 +1,63 @@
+--- png.c.old	2011-09-14 16:25:54.415338149 +0200
++++ png.c	2011-09-14 17:41:02.190803110 +0200
+@@ -38,6 +38,8 @@
+   png_color_16 *transv;
+   SDL_RWops *src = NULL;
+   Uint32 size;
++  int num_palette;
++  png_colorp png_palette;
+ 
+   memcpy(&size, data, sizeof(Uint32));
+   if (memcounter)
+@@ -74,7 +76,7 @@
+    * the normal method of doing things with libpng).  REQUIRED unless you
+    * set up your own error handlers in png_create_read_struct() earlier.
+    */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     SDL_SetError("Error reading the PNG file.");
+     goto done;
+   }
+@@ -142,9 +144,9 @@
+       Rmask = 0x000000FF;
+       Gmask = 0x0000FF00;
+       Bmask = 0x00FF0000;
+-      Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++      Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+     } else {
+-      int s = (info_ptr->channels == 4) ? 0 : 8;
++      int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+       Rmask = 0xFF000000 >> s;
+       Gmask = 0x00FF0000 >> s;
+       Bmask = 0x0000FF00 >> s;
+@@ -152,7 +154,7 @@
+     }
+   }
+   surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			     bit_depth * info_ptr->channels, Rmask, Gmask,
++			     bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask,
+ 			     Bmask, Amask);
+   if (surface == NULL) {
+     SDL_SetError("Out of memory");
+@@ -197,12 +199,15 @@
+ 	palette->colors[i].g = i;
+ 	palette->colors[i].b = i;
+       }
+-    } else if (info_ptr->num_palette > 0) {
+-      palette->ncolors = info_ptr->num_palette;
+-      for (i = 0; i < info_ptr->num_palette; ++i) {
+-	palette->colors[i].b = info_ptr->palette[i].blue;
+-	palette->colors[i].g = info_ptr->palette[i].green;
+-	palette->colors[i].r = info_ptr->palette[i].red;
++    } else {
++      png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
++      if (num_palette > 0) {
++        palette->ncolors = num_palette;
++	for (i = 0; i < num_palette; ++i) {
++	  palette->colors[i].b = png_palette[i].blue;
++	  palette->colors[i].g = png_palette[i].green;
++	  palette->colors[i].r = png_palette[i].red;
++	}
+       }
+     }
+   }
diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD
index 059ab98a2..6227a9041 100644
--- a/extra/unison/PKGBUILD
+++ b/extra/unison/PKGBUILD
@@ -1,46 +1,51 @@
-# $Id: PKGBUILD 126943 2011-06-08 20:05:25Z tpowa $
+# $Id: PKGBUILD 148950 2012-02-05 11:57:26Z ibiru $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=unison
 pkgver=2.40.63
-pkgrel=2
+pkgrel=3
 pkgdesc="Unison is a file-synchronization tool"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.cis.upenn.edu/~bcpierce/unison"
 depends=('glibc')
 makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+optdepends=('gtk2: for gtk2 support')
 source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
         $pkgname.desktop)
+md5sums=('3281207850cf6f0a17fe73f371893bd3'
+         '2daecba7705455a8e4b769e48b059872')
 options=(!makeflags)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   CFLAGS=""
   make clean
   make mkProjectInfo 
   make UISTYLE=text DEBUGGING=false THREADS=true 
-  mkdir -p $startdir/pkg/usr/bin 
-  install -Dm755 unison $startdir/pkg/usr/bin/unison
+  mv unison unison-text
  
  # clean the builddir and rebuild with gtk support
   # broken at the moment!
   # make clean
   # make mkProjectInfo
   # make UISTYLE=gtk DEBUGGING=false THREADS=true
-  # install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk
+  # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
  # clean the builddir and rebuild with gtk2 support
   make clean
   make mkProjectInfo
   make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-  install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -Dm755 unison-text "$pkgdir"/usr/bin/unison
+  install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
  # install a .desktop file; create a compliant icon from ico file and install the png
-  install -Dm644 ../$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop
+  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
   convert win32rc/U.ico unison.png
-  install -Dm644 ${pkgname}-1.png  $startdir/pkg/usr/share/pixmaps/$pkgname.png
+  install -Dm644 ${pkgname}-1.png  "$pkgdir"/usr/share/pixmaps/$pkgname.png
  # make symlink for .desktop file
-  cd $startdir/pkg//usr/bin
+  cd "$pkgdir"/usr/bin
   ln -s unison-gtk2 unison-x11
 }
-md5sums=('3281207850cf6f0a17fe73f371893bd3'
-         '2daecba7705455a8e4b769e48b059872')
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 316933b34..3d3762728 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143992 2011-12-01 15:40:19Z giovanni $
+# $Id: PKGBUILD 148952 2012-02-05 11:57:30Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vice
 pkgver=2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A Versatile Commodore Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 6bc34f5fe..fe4b87cda 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 144876 2011-12-08 20:54:22Z andyrtr $
+# $Id: PKGBUILD 148954 2012-02-05 11:57:34Z ibiru $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
 makedepends=(# runtime deps
-             'libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
+             'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
 	     # additional makedeps
              'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
 options=('!libtool')
@@ -38,7 +38,7 @@ check() {
 
 package_vigra() {
   pkgdesc="Computer vision library"
-  depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
+  depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
   optdepends=('python2: for python bindings'
               'boost-libs: for python bindings')
 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 09a939f80..21fdca9d7 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147739 2012-01-27 19:27:41Z ibiru $
+# $Id: PKGBUILD 148956 2012-02-05 11:57:41Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.13
-pkgrel=3
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -39,12 +39,18 @@ backup=('usr/share/vlc/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9678fb7a04808b6e0de63746d35e4bb1')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'vlc-1.1.13-skin2_theme_loader.patch'
+        'vlc-1.1.13-youtube.patch')
+md5sums=('9678fb7a04808b6e0de63746d35e4bb1'
+         'f7c2ea18da9570d633f5fd834a1f72c8'
+         '26dbd3574219daf4babc2f127a3229bc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/vlc-1.1.13-skin2_theme_loader.patch"
+  patch -Np1 -i "${srcdir}/vlc-1.1.13-youtube.patch"
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
   ./configure --prefix=/usr \
diff --git a/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch b/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch
new file mode 100644
index 000000000..5230b6485
--- /dev/null
+++ b/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch
@@ -0,0 +1,29 @@
+--- a/modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:07.000000000 +0100
++++ b/modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:19.000000000 +0100
+@@ -768,7 +768,7 @@
+     {
+         void *toClose = currentGzVp;
+         currentGzVp = NULL;  currentGzFd = -1;
+-        return gzclose( toClose );
++        return gzclose( (gzFile) toClose );
+     }
+     return -1;
+ }
+@@ -777,7 +777,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzread( currentGzVp, p_buffer, i_length );
++        return gzread( (gzFile) currentGzVp, p_buffer, i_length );
+     }
+     return -1;
+ }
+@@ -786,7 +786,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length );
++        return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length );
+     }
+     return -1;
+ }
diff --git a/extra/vlc/vlc-1.1.13-youtube.patch b/extra/vlc/vlc-1.1.13-youtube.patch
new file mode 100644
index 000000000..e1a0f49b4
--- /dev/null
+++ b/extra/vlc/vlc-1.1.13-youtube.patch
@@ -0,0 +1,221 @@
+--- a/share/lua/playlist/youtube.lua	2011-08-06 11:30:49.000000000 +0200
++++ b/share/lua/playlist/youtube.lua	2012-02-02 16:05:32.000000000 +0100
+@@ -1,7 +1,7 @@
+ --[[
+  $Id$
+ 
+- Copyright © 2007-2009 the VideoLAN team
++ Copyright © 2007-2011 the VideoLAN team
+ 
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+@@ -24,13 +24,27 @@
+     return res
+ end
+ 
+-function get_arturl( path, video_id )
+-    if string.match( vlc.path, "iurl=" ) then
+-        return vlc.strings( get_url_param( vlc.path, "iurl" ) )
++function get_arturl()
++    local iurl = get_url_param( vlc.path, "iurl" )
++    if iurl then
++        return iurl
+     end
+-    if not arturl then
+-        return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
++    local video_id = get_url_param( vlc.path, "v" )
++    if not video_id then
++        return nil
++    end
++    return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
++end
++
++function get_prefres()
++    local prefres = -1
++    if vlc.var and vlc.var.inherit then
++        prefres = vlc.var.inherit(nil, "preferred-resolution")
++        if prefres == nil then
++            prefres = -1
++        end
+     end
++    return prefres
+ end
+ 
+ -- Probe function.
+@@ -47,18 +61,17 @@
+             return false
+         end
+     end
+-    return (  string.match( vlc.path, "watch%?v=" ) -- the html page
+-            or string.match( vlc.path, "watch_fullscreen%?video_id=" ) -- the fullscreen page
+-            or string.match( vlc.path, "p.swf" ) -- the (old?) player url
+-            or string.match( vlc.path, "jp.swf" ) -- the (new?) player url (as of 24/08/2007)
+-            or string.match( vlc.path, "player2.swf" ) ) -- another player url
++    return (  string.match( vlc.path, "/watch%?" ) -- the html page
++            or string.match( vlc.path, "/v/" ) -- video in swf player
++            or string.match( vlc.path, "/player2.swf" ) ) -- another player url
+ end
+ 
+ -- Parse function.
+ function parse()
+-    if string.match( vlc.path, "watch%?v=" )
++    if string.match( vlc.path, "/watch%?" )
+     then -- This is the HTML page's URL
+-        -- fmt is the format of the video: 18 is HQ (mp4)
++        -- fmt is the format of the video
++        -- (cf. http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs)
+         fmt = get_url_param( vlc.path, "fmt" )
+         while true do
+             -- Try to find the video's title
+@@ -71,27 +84,42 @@
+             end
+             if string.match( line, "<meta name=\"description\"" ) then
+                -- Don't ask me why they double encode ...
+-                _,_,description = vlc.strings.resolve_xml_special_chars(vlc.strings.resolve_xml_special_chars(string.find( line, "content=\"(.-)\"" )))
++                _,_,description = string.find( line, "content=\"(.-)\"" )
++                description = vlc.strings.resolve_xml_special_chars( description )
++                description = vlc.strings.resolve_xml_special_chars( description )
+             end
+-            if string.match( line, "subscribe_to_user=" ) then
+-                _,_,artist = string.find( line, "subscribe_to_user=([^&]*)" )
++            if string.match( line, "<meta property=\"og:image\"" ) then
++                _,_,arturl = string.find( line, "content=\"(.-)\"" )
+             end
+-            -- CURRENT: var swfConfig = { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
+-            -- OLD 1: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
+-            -- OLD 2: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="};
+-            -- OLD 3: 'SWF_ARGS': { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
+-            if ( string.match( line, "PLAYER_CONFIG" ) or string.match( line, "swfConfig" ) or string.match( line, "SWF_ARGS" ) or string.match( line, "swfArgs" ) ) and string.match( line, "video_id" ) then
+-                if string.match( line, "BASE_YT_URL" ) then
+-                    _,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" )
++            if string.match( line, " rel=\"author\"" ) then
++                _,_,artist = string.find( line, "href=\"/user/([^\"]*)\"" )
++            end
++            -- JSON parameters, also formerly known as "swfConfig",
++            -- "SWF_ARGS", "swfArgs", "PLAYER_CONFIG" ...
++            if string.match( line, "playerConfig" ) then
++                if not fmt then
++                    prefres = get_prefres()
++                    if prefres >= 0 then
++                        fmt_list = string.match( line, "\"fmt_list\": \"(.-)\"" )
++                        if fmt_list then
++                            for itag,height in string.gmatch( fmt_list, "(%d+)\\/%d+x(%d+)\\/[^,]+" ) do
++                                -- Apparently formats are listed in quality
++                                -- order, so we take the first one that works,
++                                -- or fallback to the lowest quality
++                                fmt = itag
++                                if tonumber(height) <= prefres then
++                                    break
++                                end
++                            end
++                        end
++                    end
+                 end
+-                _,_,t = string.find( line, "\"t\": \"(.-)\"" )
+-                -- vlc.msg.err( t )
+-                -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" )
+-                fmt_url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
+-                if fmt_url_map then
++
++                url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
++                if url_map then
+                     -- FIXME: do this properly
+-                    fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" )
+-                    for url,itag in string.gmatch( fmt_url_map, "url=([^&,]+).-&itag=(%d+)" ) do
++                    url_map = string.gsub( url_map, "\\u0026", "&" )
++                    for url,itag in string.gmatch( url_map, "url=([^&,]+)[^,]*&itag=(%d+)" ) do
+                         -- Apparently formats are listed in quality order,
+                         -- so we can afford to simply take the first one
+                         if not fmt or tonumber( itag ) == tonumber( fmt ) then
+@@ -101,75 +129,37 @@
+                         end
+                     end
+                 end
+-            -- Also available on non-HTML5 pages: var swfHTML = (isIE) ? "<object [...]><param name=\"flashvars\" value=\"rv.2.thumbnailUrl=http%3A%2F%2Fi4.ytimg.com%2Fvi%2F3MLp7YNTznE%2Fdefault.jpg&rv.7.length_seconds=384 [...] &video_id=OHVvVmUNBFc [...] &t=OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp [...]
+-            elseif string.match( line, "swfHTML" ) and string.match( line, "video_id" ) then
+-                _,_,t = string.find( line, "&t=(.-)&" )
+-            -- Also available in HTML5 pages: videoPlayer.setAvailableFormat("http://v6.lscache4.c.youtube.com/videoplayback?ip=82.0.0.0&sparams=id%2Cexpire%2Cip%2Cipbits%2Citag%2Calgorithm%2Cburst%2Cfactor&algorithm=throttle-factor&itag=45&ipbits=8&burst=40&sver=3&expire=1275688800&key=yt1&signature=6ED860441298D1157FF3013A5D72727F25831F09.4C196BEA9F8F9B83CE678D79AD918B83D5E98B46&factor=1.25&id=7117715cf57d18d4", "video/webm; codecs=&quot;vp8.0, vorbis&quot;", "hd720");
+-            elseif string.match( line, "videoPlayer%.setAvailableFormat" ) then
+-                url,itag = string.match( line, "videoPlayer%.setAvailableFormat%(\"(.-itag=(%d+).-)\",.+%)" )
+-                if url then
+-                    -- For now, WebM formats are listed only in the HTML5
+-                    -- section, that is also only when HTML5 is enabled.
+-                    -- Format 45 is 720p, and 43 is lower resolution.
+-                    if tonumber( itag ) == 45  or ( tonumber( itag ) == 43 and not webm_path ) then
+-                        webm_path = url
+-                    end
+-                    -- Grab something if fmt_url_map failed
+-                    if not path and ( not fmt or tonumber( itag ) == tonumber( fmt ) ) then
+-                        path = url
+-                    end
+-                end
++            -- There is also another version of the parameters, encoded
++            -- differently, as an HTML attribute of an <object> or <embed>
++            -- tag; but we don't need it now
+             end
+         end
+ 
+-        if not video_id then
+-            video_id = get_url_param( vlc.path, "v" )
++        if not path then
++            vlc.msg.err( "Couldn't extract youtube video URL, please check for updates to this script" )
++            return { }
+         end
+-        arturl = get_arturl( vlc.path, video_id )
+ 
+-        if not fmt then
+-            -- Prefer WebM formats if this is an &html5=True URL
+-            html5 = get_url_param( vlc.path, "html5" )
+-            if html5 == "True" and webm_path then
+-                path = webm_path
+-            end
++        if not arturl then
++            arturl = get_arturl()
+         end
+ 
+-        if not path then
+-            if not base_yt_url then
+-                base_yt_url = "http://youtube.com/"
+-            end
+-            if fmt then
+-                format = "&fmt=" .. fmt
+-            else
+-                format = ""
+-            end
+-
+-            if t then
+-                path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t..format
+-            else
+-                -- This shouldn't happen ... but keep it as a backup.
+-                path = "http://www.youtube.com/v/"..video_id
+-            end
+-        end
+         return { { path = path; name = name; description = description; artist = artist; arturl = arturl } }
+     else -- This is the flash player's URL
+-        if string.match( vlc.path, "title=" ) then
+-            name = vlc.strings.decode_uri(get_url_param( vlc.path, "title" ))
+-        end
+         video_id = get_url_param( vlc.path, "video_id" )
+-        arturl = get_arturl( vlc.path, video_id )
++        if not video_id then
++            _,_,video_id = string.find( vlc.path, "/v/([^?]*)" )
++        end
++        if not video_id then
++            vlc.msg.err( "Couldn't extract youtube video URL" )
++            return { }
++        end
+         fmt = get_url_param( vlc.path, "fmt" )
+         if fmt then
+             format = "&fmt=" .. fmt
+         else
+             format = ""
+         end
+-        if not string.match( vlc.path, "t=" ) then
+-            -- This sucks, we're missing "t" which is now mandatory. Let's
+-            -- try using another url
+-            return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl } }
+-        end
+-        return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl } }
++        return { { path = "http://www.youtube.com/watch?v="..video_id..format } }
+     end
+ end
diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD
index 80e79e08b..6b6976e42 100644
--- a/extra/w3m/PKGBUILD
+++ b/extra/w3m/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 106210 2011-01-15 11:51:10Z bisson $
+# $Id: PKGBUILD 149052 2012-02-05 15:37:14Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=w3m
 pkgver=0.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Text-based Web browser, as well as pager'
-arch=('i686' 'x86_64')
 url='http://w3m.sourceforge.net/'
 license=('custom')
-depends=('openssl' 'gc' 'ncurses' 'zlib')
+arch=('i686' 'x86_64')
 makedepends=('imlib2')
 optdepends=('imlib2: for graphics support') 
-source=("http://downloads.sourceforge.net/sourceforge/w3m/$pkgname-$pkgver.tar.gz")
+depends=('openssl' 'gc' 'ncurses')
+source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	sed 's/file_handle/file_handle_rofl/g' -i istream.*
+
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
@@ -23,15 +27,16 @@ build() {
 		--with-imagelib=imlib2 \
 		--with-termlib=ncurses \
 		--disable-w3mmailer \
-		--disable-mouse
+		--disable-mouse \
+
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
-	install -d "$pkgdir"/usr/share/{doc,licenses}/"$pkgname"
-	find doc/* | grep -v CVS | xargs -i install "{}" "$pkgdir/usr/share/doc/$pkgname/"
-	ln -s "../../doc/$pkgname/README" "$pkgdir/usr/share/licenses/$pkgname/"
-}
\ No newline at end of file
+	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
+	find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}"
+	ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}"
+}
diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD
index 9d3179e53..3bb034776 100644
--- a/extra/webkit-sharp/PKGBUILD
+++ b/extra/webkit-sharp/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=webkit-sharp
 pkgver=0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Mono/.NET bindings for the WebKit rendering engine"
 arch=('i686' 'x86_64')
 url="http://www.mono-project.com/"
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
index 6631575b6..c3ec48db6 100644
--- a/extra/wesnoth/PKGBUILD
+++ b/extra/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144065 2011-12-02 20:54:51Z ibiru $
+# $Id: PKGBUILD 148958 2012-02-05 11:57:49Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Jacobo Arvelo <unix4all@ya.com>
@@ -6,12 +6,12 @@
 
 pkgname=wesnoth
 pkgver=1.8.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core')
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2')
 makedepends=('boost')
 install=wesnoth.install
 options=(!emptydirs)
@@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
         wesnoth-1.8.6-boost-foreach.patch
         wesnoth.tmpfiles.conf)
 md5sums=('f1c3179869b01b61e253e74aeb241034'
-         'ca7412ffc4682ef55ddf82d56b0e2f08'
+         '3b0d2edcb45e8ecc8c790f92bdcb0087'
          'dc414ab7e1334941548e9db6db9c2460'
          'b8122f5054e3895c9c054e87460869dc')
 
@@ -31,6 +31,7 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr --localstatedir=/var --enable-tools \
       --enable-editor --enable-server --with-fifodir=/run/wesnothd
+  make
 }
 
 package() {
diff --git a/extra/wesnoth/wesnoth-libpng-1.4.0.patch b/extra/wesnoth/wesnoth-libpng-1.4.0.patch
index be8adfcaa..338f467af 100644
--- a/extra/wesnoth/wesnoth-libpng-1.4.0.patch
+++ b/extra/wesnoth/wesnoth-libpng-1.4.0.patch
@@ -12,3 +12,13 @@ diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/ex
  	if(!png_ptr)
  		throw exploder_failure("Unable to initialize the png write structure");
  
+--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600
++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600
+@@ -15,6 +15,7 @@
+ #include "exploder_utils.hpp"
+ #include "game_config.hpp"
+ #include "serialization/string_utils.hpp"
++#include <zlib.h>
+ #include <png.h>
+
+ exploder_point::exploder_point(const std::string &s)
diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD
index 4037626f8..8cc7010f9 100644
--- a/extra/windowmaker-crm-git/PKGBUILD
+++ b/extra/windowmaker-crm-git/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146365 2012-01-09 19:01:56Z daniel $
+# $Id: PKGBUILD 148962 2012-02-05 11:58:02Z ibiru $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=windowmaker-crm-git
 pkgver=20120109
-pkgrel=1
+pkgrel=2
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra"
 arch=(i686 x86_64)
 url="http://www.windowmaker.org"
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index ecda30c8f..3d2af63f9 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146321 2012-01-09 18:41:18Z daniel $
+# $Id: PKGBUILD 148960 2012-02-05 11:57:55Z ibiru $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=windowmaker
 pkgver=0.95.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=(i686 x86_64)
 url="http://www.windowmaker.org/"
diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD
index 0e8208ae6..678a75878 100644
--- a/extra/wv/PKGBUILD
+++ b/extra/wv/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 82057 2010-06-08 10:05:16Z jgc $
+# $Id: PKGBUILD 148964 2012-02-05 11:58:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 pkgname=wv
-pkgver=1.2.7
+pkgver=1.2.9
 pkgrel=1
 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/wvware"
-license=(GPL)
-depends=('libgsf>=1.14.18' 'libpng>=1.4.2' 'sh')
+license=('GPL')
+depends=('libgsf' 'libpng' 'sh')
 makedepends=('pkg-config')
 options=('!libtool')
-source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        fix-soname.patch)
-sha256sums=('a3a367062e894770fc3ef63bbf7e285cb025253f972fa899c16931f741e856ea'
-            '0fccf12cc5db8481dfcd5cffa987545e060f8bb526c9c910fd76a18468bd7ce1')
+source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-soname.patch" || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index 8ecf8e479..62dfb906d 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144988 2011-12-13 14:41:40Z eric $
+# $Id: PKGBUILD 148966 2012-02-05 11:58:12Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
@@ -18,7 +18,7 @@ build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
 #  cd "${srcdir}/wxGTK-${pkgver}"
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=sys \
+    --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
     --disable-precomp-headers
   make
diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD
index 3d3a5b31b..0daa23321 100644
--- a/extra/xaos/PKGBUILD
+++ b/extra/xaos/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137880 2011-09-12 06:35:34Z eric $
+# $Id: PKGBUILD 148968 2012-02-05 11:58:17Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xaos
 pkgver=3.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A fast portable real-time interactive fractal zoomer"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/xaos/"
@@ -11,12 +11,13 @@ license=('GPL')
 depends=('gsl' 'libpng' 'aalib')
 options=('!makeflags')
 install=xaos.install
-source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz)
-md5sums=('465d1469b276501a58bf325e493ea591')
-sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801')
+source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch)
+sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801'
+          '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../xaos-3.5-libpng15.patch
   ./configure --prefix=/usr --with-gsl --with-aa-driver
   make
 }
diff --git a/extra/xaos/xaos-3.5-libpng15.patch b/extra/xaos/xaos-3.5-libpng15.patch
new file mode 100644
index 000000000..beece8339
--- /dev/null
+++ b/extra/xaos/xaos-3.5-libpng15.patch
@@ -0,0 +1,131 @@
+http://code.google.com/p/gnuxaos/issues/detail?id=55
+
+--- src/util/png.c
++++ src/util/png.c
+@@ -3,6 +3,7 @@
+ #include <aconfig.h>
+ #ifdef USE_PNG
+ #include <png.h>
++#include <zlib.h>
+ #endif
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -31,6 +32,9 @@
+     png_structp png_ptr;
+     png_infop info_ptr;
+     png_color palette[256];
++    png_color_8 sig_bit;
++    int color_type;
++    int bit_depth;
+     volatile unsigned short a = 255;
+     volatile unsigned char *b = (volatile unsigned char *) &a;
+ #ifdef _undefined_
+@@ -59,7 +63,7 @@
+ 	png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ 	return "No memory to create png info structure";
+     }
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	png_destroy_write_struct(&png_ptr, &info_ptr);
+ 	fclose(file);
+ 	return strerror(errno);
+@@ -78,57 +82,70 @@
+     png_set_compression_window_bits(png_ptr, 15);
+     png_set_compression_method(png_ptr, 8);
+ 
+-    info_ptr->width = image->width;
+-    info_ptr->height = image->height;
+-    /*info_ptr->gamma=1.0; */
+-    info_ptr->gamma = 0.5;
+-    info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
+-    info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
+-    info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
++    switch (image->palette->type)
++    {
++    case C256:
++	color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth = image->bytesperpixel * 8;
++	break;
++    case SMALLITER:
++    case LARGEITER:
++    case GRAYSCALE:
++	color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth = image->bytesperpixel * 8;
++	break;
++    case TRUECOLOR:
++    case TRUECOLOR24:
++    case TRUECOLOR16:
++	color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth = 8;
++	break;
++    }
+ 
++    png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
++		  color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
++		  PNG_FILTER_TYPE_BASE);
+ 
+     switch (image->palette->type) {
+     case C256:
+ 	{
+ 	    int i;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+-	    info_ptr->bit_depth = image->bytesperpixel * 8;
+-	    info_ptr->palette = palette;
+-	    info_ptr->valid |= PNG_INFO_PLTE;
++	    png_color png_palette[257];
++	    int png_num_palette;
+ 	    for (i = 0; i < image->palette->end; i++)
+-		info_ptr->palette[i].red = image->palette->rgb[i][0],
+-		    info_ptr->palette[i].green = image->palette->rgb[i][1],
+-		    info_ptr->palette[i].blue = image->palette->rgb[i][2],
+-		    info_ptr->num_palette = image->palette->end;
++		png_palette[i].red = image->palette->rgb[i][0],
++		    png_palette[i].green = image->palette->rgb[i][1],
++		    png_palette[i].blue = image->palette->rgb[i][2],
++		    png_num_palette = image->palette->end;
++	    png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
+ 	}
+ 	break;
+-    case SMALLITER:
+-    case LARGEITER:
+-    case GRAYSCALE:
+-	info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
+-	info_ptr->bit_depth = image->bytesperpixel * 8;
+-	break;
+     case TRUECOLOR:
+     case TRUECOLOR24:
+     case TRUECOLOR16:
+-	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-	info_ptr->bit_depth = 8;
+-	info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
+-	info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
+-	info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
++	sig_bit.red = 8 - image->palette->info.truec.rprec;
++	sig_bit.green = 8 - image->palette->info.truec.gprec;
++	sig_bit.blue = 8 - image->palette->info.truec.bprec;
++	png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+ 	break;
+     }
+-    info_ptr->interlace_type = 0;
++
++    png_write_info (png_ptr, info_ptr);
++
+ #ifdef _undefined_
+     png_set_text(png_ptr, info_ptr, comments,
+ 		 sizeof(comments) / sizeof(png_text));
+ #endif
+ 
+-    png_write_info(png_ptr, info_ptr);
++    png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
++    png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
++		 (png_uint_32) (100 / image->pixelheight),
++		 PNG_RESOLUTION_UNKNOWN);
++
+     /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
+     png_set_packing(png_ptr);
+     if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
+-	png_set_shift(png_ptr, &(info_ptr->sig_bit));
++	png_set_shift (png_ptr, &sig_bit);
+     if (*b == 255)
+ 	png_set_swap(png_ptr);
+     png_set_bgr(png_ptr);
diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD
index 8854d9e98..84992447c 100644
--- a/extra/xaw3d/PKGBUILD
+++ b/extra/xaw3d/PKGBUILD
@@ -1,51 +1,29 @@
-# $Id: PKGBUILD 124576 2011-05-23 03:13:29Z eric $
+# $Id: PKGBUILD 148656 2012-02-05 11:45:47Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xaw3d
-pkgver=1.5E
-pkgrel=3
+pkgver=1.6
+pkgrel=1
 pkgdesc="Three-D Athena widgets"
 arch=('i686' 'x86_64')
 url="http://directory.fsf.org/project/xaw3d/"
 license=('MIT')
-depends=('libxmu' 'libxpm')
-makedepends=('imake')
-options=('!makeflags')
-source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-${pkgver}.tar.gz
-        Xaw3d-1.5E-xorg-imake.patch
-	Xaw3d-1.5-i18n.patch
-        Xaw3d-1.5-box.c.patch
-       	Xaw3d-1.5-debian-fixes.patch
-        xaw3d.patch
-	Xaw3d-1.5E-warnings.patch
-	Xaw3d-ia64.patch
-	LICENSE)
-md5sums=('29ecfdcd6bcf47f62ecfd672d31269a1'
-         '2cca7950cf7d270609bc810b8996f0a9'
-         'e7105bc1452f0c5f5d0bcdcf212aac0c'
-         'c061ab65467766f5817752ef216e3cc2'
-         '33bf0f1b52822b7293a3f45474178dfe'
-         '5acb23e5a52c75e62a22aef59882df14'
-         'c3aa4cbf95442081e7af810c13306cc9'
-         'f766e8eb6371cbb1f68af4f2932dc118'
-         '5b6b0242b3f53b7fe308e702abe28561')
+depends=('libxmu')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-${pkgver}.tar.bz2)
+md5sums=('db88f0c5afc5f285e046d84e15ad30de')
 
 build() {
-  cd "${srcdir}/xc/lib/Xaw3d"
-  patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch"
-  patch -Np4 -i "${srcdir}/xaw3d.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch"
-  ln -s .. X11
-  xmkmf
-  make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR"
+  cd "${srcdir}/libXaw3d-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
 }
 
 package() {
-  cd "${srcdir}/xc/lib/Xaw3d"
-  make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "${srcdir}/libXaw3d-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/xawtv/PKGBUILD b/extra/xawtv/PKGBUILD
index e9876a82e..1b382052c 100644
--- a/extra/xawtv/PKGBUILD
+++ b/extra/xawtv/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 130228 2011-07-04 14:14:56Z jgc $
+# $Id: PKGBUILD 148970 2012-02-05 11:58:22Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=xawtv
 pkgver=3.101
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux"
 arch=('i686' 'x86_64')
 url="http://git.linuxtv.org/xawtv3.git"
 license=('GPL')
-depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc')
+depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm')
 makedepends=('mesa')
 source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
 md5sums=('330ce1789595e370be34ad4cae3dc3fa')
@@ -21,5 +21,9 @@ build() {
   autoheader
   ./configure --prefix=/usr --disable-motif --disable-quicktime
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xbill/03_fix_ftbfs_binutils_gold.diff b/extra/xbill/03_fix_ftbfs_binutils_gold.diff
new file mode 100644
index 000000000..09436cd79
--- /dev/null
+++ b/extra/xbill/03_fix_ftbfs_binutils_gold.diff
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with binutils-gold
+Author: Vincent Legout <vincent@legout.info>
+Bug-Debian: http://bugs.debian.org/556690
+Last-Update: 2009-12-08
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,7 +21,7 @@
+ VPATH = @srcdir@
+ 
+ ALL_CFLAGS =	$(CFLAGS) $(CPPFLAGS) -I$(srcdir)
+-ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS)
++ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS) -lXpm
+ IMAGE_DEFINES=-DIMAGES=\"${datadir}/xbill\"
+ SCORE_DEFINES=-DSCOREFILE=\"${localstatedir}/xbill.scores\"
+ 
diff --git a/extra/xbill/PKGBUILD b/extra/xbill/PKGBUILD
index 98054c7eb..6e696a388 100644
--- a/extra/xbill/PKGBUILD
+++ b/extra/xbill/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 122895 2011-05-07 05:36:47Z eric $
+# $Id: PKGBUILD 148662 2012-02-05 11:46:02Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xbill
 pkgver=2.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
 arch=('i686' 'x86_64')
 url="http://www.xbill.org/"
 license=('GPL')
-depends=('xaw3d')
+depends=('xaw3d>=1.6')
 makedepends=('libxaw')
 install=xbill.install
-source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('585e4866b15255a24203db9959407b2f')
+source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz
+        03_fix_ftbfs_binutils_gold.diff)
+md5sums=('585e4866b15255a24203db9959407b2f'
+         'e260a6cd4f9af003d249961cb60e2d01')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # taken from Debian
+  patch -Np1 -i ${srcdir}/03_fix_ftbfs_binutils_gold.diff
+  autoconf -v -f
   ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
     --disable-motif  --enable-athena --disable-gtk
   make
diff --git a/extra/xclip/PKGBUILD b/extra/xclip/PKGBUILD
index 57834cdc0..0e5d405e5 100644
--- a/extra/xclip/PKGBUILD
+++ b/extra/xclip/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 110900 2011-02-22 20:16:09Z bisson $
+# $Id: PKGBUILD 149046 2012-02-05 15:20:59Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Committer: Manolis Tzanidakis <manolis@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xclip
 pkgver=0.12
-pkgrel=2
+pkgrel=3
 pkgdesc='Command line interface to the X11 clipboard'
-arch=('i686' 'x86_64')
 url='http://sourceforge.net/projects/xclip'
 license=('GPL')
 depends=('libxmu')
+arch=('i686' 'x86_64')
 source=("http://downloads.sourceforge.net/sourceforge/xclip/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('aed2cff18b9aecfe3377ad064c6a67518bbec211')
 
diff --git a/extra/xfce4-datetime-plugin/PKGBUILD b/extra/xfce4-datetime-plugin/PKGBUILD
index 3d9e2a532..3db483abe 100644
--- a/extra/xfce4-datetime-plugin/PKGBUILD
+++ b/extra/xfce4-datetime-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104742 2011-01-04 20:29:21Z andyrtr $
+# $Id: PKGBUILD 148972 2012-02-05 11:58:26Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-datetime-plugin
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A date and time display plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-notes-plugin/PKGBUILD b/extra/xfce4-notes-plugin/PKGBUILD
index 889e1ac02..ddb4568f4 100644
--- a/extra/xfce4-notes-plugin/PKGBUILD
+++ b/extra/xfce4-notes-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104757 2011-01-04 20:53:16Z andyrtr $
+# $Id: PKGBUILD 148974 2012-02-05 11:58:30Z ibiru $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Ben Mazer <contrasutra@myrealbox.com>
 
 pkgname=xfce4-notes-plugin
 pkgver=1.7.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A notes plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-quicklauncher-plugin/PKGBUILD b/extra/xfce4-quicklauncher-plugin/PKGBUILD
index d783ecf24..29a0615e6 100644
--- a/extra/xfce4-quicklauncher-plugin/PKGBUILD
+++ b/extra/xfce4-quicklauncher-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104771 2011-01-04 21:40:42Z andyrtr $
+# $Id: PKGBUILD 148976 2012-02-05 11:58:38Z ibiru $
 # Maintainer: 
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-quicklauncher-plugin
 pkgver=1.9.4
-pkgrel=5
+pkgrel=6
 pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index d2e465791..6ab299b08 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136067 2011-08-22 12:16:31Z andyrtr $
+# $Id: PKGBUILD 148978 2012-02-05 11:58:42Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD
index 45c07d0dc..0527c33ee 100644
--- a/extra/xfig/PKGBUILD
+++ b/extra/xfig/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 101110 2010-11-28 02:40:08Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 148664 2012-02-05 11:46:09Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xfig
 pkgver=3.2.5b
-pkgrel=5
+pkgrel=7
 pkgdesc="An interactive drawing tool"
 arch=('i686' 'x86_64')
 url="http://www.xfig.org/userman/"
 license=('custom')
-depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'desktop-file-utils' 'gsfonts')
+depends=('libpng' 'libjpeg' 'xaw3d>=1.6' 'libxi' 'desktop-file-utils' 'gsfonts' 'libxpm')
 makedepends=('imake')
 optdepends=('transfig: to use the frontend to convert fig files')
 options=('!makeflags' '!emptydirs')
@@ -17,19 +17,20 @@ source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \
 	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \
         xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \
         xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \
-        xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch LICENSE xfig.desktop)
-md5sums=('499b0ce103a6b353453bf7e327f9a3b9' '5c2bc208c8ee852bc9ffa00dcbfd8241'\
-         'a4b91e4aaf48ed07f4a579a1f692ef82' '46c6fb15d26c9fe03e558bdacc0b0a53'\
-         'c5b7dc054063f02c6bfcd132dae82b6f' 'b532871c792716465e3b05967bcfba10'\
-         'de059a6b8ce287942c7da35d19ee46f3' '7347389f7fdecd582579845df0c0b664'\
-         'fa14e85b5365d07ca8deca9ea47d4e6a' 'f405b7a96f3401c12153fe6170a7d8f1'\
-         '8ac2de637c9148aa4a32978910822230')
-sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' '926ad99c7221baa4aa9e9737722958860b2700fc'\
-         'b7c03fb70066ff476a4039a8c0f8930c15edef68' '33bff26b42ce164e79de11808b5b34b363f0d59f'\
-         'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' '39bec6bac9746b643b05fd1286826113ede07ff6'\
-         'bd76cd50be6a5789cfd6f182309cfd7056be04f3' 'a1285f4e61ad2eec040460ab03e8022098e7f78e'\
-         '12a64ddaf65a73e23ef74f31483515a0e262768c' '31edf4cfab708820ea3f114d095dfef5aa88e5aa'\
-         '9011b8fa6143e37525b28cc9800a3bf2d6b008d2')
+        xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \
+        xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop)
+sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542'
+          '926ad99c7221baa4aa9e9737722958860b2700fc'
+          'b7c03fb70066ff476a4039a8c0f8930c15edef68'
+          '33bff26b42ce164e79de11808b5b34b363f0d59f'
+          'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
+          '39bec6bac9746b643b05fd1286826113ede07ff6'
+          'bd76cd50be6a5789cfd6f182309cfd7056be04f3'
+          'a1285f4e61ad2eec040460ab03e8022098e7f78e'
+          '12a64ddaf65a73e23ef74f31483515a0e262768c'
+          '83032eb61c8dc96d5fc509a1ce632528457d4598'
+          '31edf4cfab708820ea3f114d095dfef5aa88e5aa'
+          '9011b8fa6143e37525b28cc9800a3bf2d6b008d2')
 
 build() {
   cd "${srcdir}/${pkgname}.${pkgver}"
@@ -41,6 +42,7 @@ build() {
   patch -p1 < ../xfig-3.2.5-urwfonts.patch
   patch -p1 < ../xfig-3.2.5-missing-protos.patch
   patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch
+  patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch
   chmod 755 Libraries
 
   xmkmf
diff --git a/extra/xfig/xfig-3.2.5b-libpng-1.5.patch b/extra/xfig/xfig-3.2.5b-libpng-1.5.patch
new file mode 100644
index 000000000..7d9c3f15e
--- /dev/null
+++ b/extra/xfig/xfig-3.2.5b-libpng-1.5.patch
@@ -0,0 +1,70 @@
+Index: xfig.3.2.5b/f_readpng.c
+===================================================================
+--- xfig.3.2.5b.orig/f_readpng.c
++++ xfig.3.2.5b/f_readpng.c
+@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic
+     }
+ 
+     /* set long jump recovery here */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* if we get here there was a problem reading the file */
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ 	close_picfile(file,filetype);
+@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic
+     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
+ 	&interlace_type, &compression_type, &filter_type);
+ 
+-    if (info_ptr->valid & PNG_INFO_gAMA)
+-	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
+-    else
+-	png_set_gamma(png_ptr, 2.2, 0.45);
++    png_fixed_point gamma = 0.45;
++    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
++    png_set_gamma(png_ptr, 2.2, gamma);
+ 
+-    if (info_ptr->valid & PNG_INFO_bKGD)
++    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
+ 	/* set the background to the one supplied */
+-	png_set_background(png_ptr, &info_ptr->background,
++	png_color_16p background;
++	png_get_bKGD(png_ptr,info_ptr,&background);
++	png_set_background(png_ptr, background,
+ 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
++    }
+     else {
+ 	/* blend the canvas background using the alpha channel */
+ 	background.red   = x_bg_color.red >> 8;
+@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic
+ 
+ 	if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
+ 	    png_get_hIST(png_ptr, info_ptr, &histogram);
++#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5
+ 	    png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
++#else
++	    png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
++#endif
+ 	}
+     }
+     if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+Index: xfig.3.2.5b/f_wrpng.c
+===================================================================
+--- xfig.3.2.5b.orig/f_wrpng.c
++++ xfig.3.2.5b/f_wrpng.c
+@@ -20,6 +20,7 @@
+ #include "w_msgpanel.h"
+ #include "w_setup.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ /*
+  * Write PNG file from rgb data
+@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat
+     }
+ 
+     /* set long jump recovery here */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* if we get here there was a problem reading the file */
+ 	png_destroy_write_struct(&png_ptr, &info_ptr);
+ 	return False;
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index d5ca4e7ee..15e2b70d1 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146430 2012-01-10 23:37:56Z eric $
+# $Id: PKGBUILD 148980 2012-02-05 11:58:50Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-ui
 pkgver=0.99.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,12 +16,13 @@ options=('!strip')
 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 xine-ui-xdg.diff)
+        fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch)
 sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e'
           'b2df43ede3a9d1a34b80139704a4cbbc7295c584'
           '8bbd39f61de7b6991385457a4944b8ea104da88b'
           '2361df9ddad59c426b0f863414c6d527b463a38a'
-          '9c70c6543dae6815710b239b4638ffe3843bac86')
+          '9c70c6543dae6815710b239b4638ffe3843bac86'
+          'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,6 +30,7 @@ build() {
   patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
   patch -p1 < "${srcdir}/fix_lirc.diff"
   patch -p1 < "${srcdir}/xine-ui-xdg.diff"
+  patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch"
   sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c
   autoconf
   ./configure --prefix=/usr --mandir=/usr/share/man \
diff --git a/extra/xine-ui/xine-ui-0.99.6-libpng15.patch b/extra/xine-ui/xine-ui-0.99.6-libpng15.patch
new file mode 100644
index 000000000..6a5fb5522
--- /dev/null
+++ b/extra/xine-ui/xine-ui-0.99.6-libpng15.patch
@@ -0,0 +1,13 @@
+Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c
+===================================================================
+--- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
++++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c
+@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id,
+       png_destroy_read_struct(&png_ptr, NULL, NULL);
+       return NULL;
+     }
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
diff --git a/extra/xorg-font-util/PKGBUILD b/extra/xorg-font-util/PKGBUILD
index d23ec52bc..5dd73707c 100644
--- a/extra/xorg-font-util/PKGBUILD
+++ b/extra/xorg-font-util/PKGBUILD
@@ -1,27 +1,37 @@
-# $Id: $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 149063 2012-02-05 16:06:39Z bisson $
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xorg-font-util
 pkgver=1.2.0
-pkgrel=1
-pkgdesc="X.Org font utilities"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
+pkgrel=2
+pkgdesc='X.Org font utilities'
+url='http://xorg.freedesktop.org/'
+arch=('i686' 'x86_64')
 license=('custom')
 makedepends=('xorg-util-macros')
+source=("${url}/releases/individual/font/font-util-${pkgver}.tar.bz2")
+sha1sums=('011fa9c8fe08d9f6f848df570374ed1cb7488146')
+
 replaces=('font-util')
 provides=('font-util')
 conflicts=('font-util')
 groups=('xorg-fonts' 'xorg')
-source=(${url}/releases/individual/font/font-util-${pkgver}.tar.bz2)
-sha1sums=('011fa9c8fe08d9f6f848df570374ed1cb7488146')
 
 build() {
-  cd "${srcdir}/font-util-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-      --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+	cd "${srcdir}/font-util-${pkgver}"
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-mapdir=/usr/share/fonts/util \
+		--with-fontrootdir=/usr/share/fonts \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/font-util-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xorg-setxkbmap/PKGBUILD b/extra/xorg-setxkbmap/PKGBUILD
index b25f37dc1..cbc76fc6a 100644
--- a/extra/xorg-setxkbmap/PKGBUILD
+++ b/extra/xorg-setxkbmap/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 113688 2011-03-10 14:45:16Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 149065 2012-02-05 16:09:19Z bisson $
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xorg-setxkbmap
 pkgver=1.2.0
-pkgrel=2
-pkgdesc="Set the keyboard using the X Keyboard Extension"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
+pkgrel=3
+pkgdesc='Set the keyboard using the X Keyboard Extension'
+url='http://xorg.freedesktop.org/'
 license=('custom')
+arch=('i686' 'x86_64')
 depends=('libxkbfile')
 makedepends=('xorg-util-macros')
-groups=('xorg-apps' 'xorg')
-source=(${url}/releases/individual/app/setxkbmap-${pkgver}.tar.bz2)
+source=("${url}/releases/individual/app/setxkbmap-${pkgver}.tar.bz2")
 sha1sums=('860785e16313d30792fe62604f65d84281812322')
 
+groups=('xorg-apps' 'xorg')
+
 build() {
-  cd "${srcdir}/setxkbmap-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+	cd "${srcdir}/setxkbmap-${pkgver}"
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/setxkbmap-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xorg-xcursorgen/PKGBUILD b/extra/xorg-xcursorgen/PKGBUILD
index f798e9591..567b50873 100644
--- a/extra/xorg-xcursorgen/PKGBUILD
+++ b/extra/xorg-xcursorgen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113731 2011-03-10 15:00:48Z jgc $
+# $Id: PKGBUILD 148982 2012-02-05 11:58:53Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xcursorgen
 pkgver=1.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Create an X cursor file from PNG images"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -18,6 +18,10 @@ build() {
   cd "${srcdir}/xcursorgen-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xcursorgen-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xev/PKGBUILD b/extra/xorg-xev/PKGBUILD
index 70f75e86b..23ad46247 100644
--- a/extra/xorg-xev/PKGBUILD
+++ b/extra/xorg-xev/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 113751 2011-03-10 15:22:05Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 149060 2012-02-05 15:59:34Z bisson $
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xorg-xev
 pkgver=1.1.0
-pkgrel=2
-pkgdesc="Print contents of X events"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
+pkgrel=3
+pkgdesc='Print contents of X events'
+url='http://xorg.freedesktop.org/'
+arch=('i686' 'x86_64')
 license=('custom')
 depends=('libx11')
 makedepends=('xorg-util-macros')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2)
+source=("http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2")
 sha1sums=('77dcbdaa2046db56f31936f921843bd05df2255f')
 
+groups=('xorg-apps' 'xorg')
+
 build() {
-  cd "${srcdir}/xev-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+	cd "${srcdir}/xev-${pkgver}"
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/xev-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index 531985301..c06616e23 100644
--- a/extra/xsane/PKGBUILD
+++ b/extra/xsane/PKGBUILD
@@ -1,46 +1,50 @@
-# $Id: PKGBUILD 100458 2010-11-23 17:10:57Z tpowa $
+# $Id: PKGBUILD 148984 2012-02-05 11:58:59Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgbase=xsane
 pkgname=('xsane' 'xsane-gimp')
 pkgver=0.998
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.xsane.org"
 license=('GPL2')
 makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
 source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
 	xsane-0.995-xdg-open.patch)
+md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
+         '15541ff0ddc10acfa2059cf99d5478eb')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
   # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora
-  patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch || return 1
-  
+  patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch"
+  sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
+
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp
-  /usr/bin/make || return 1
+  make
   mv src/xsane src/xsane-gimp
 
   # build again with gimp enabled
   make clean
   ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
+  make
 }
 
 package_xsane() {
   pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp."
   install=$pkgname.install
   depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')  
-  optdepends=('xsane-gimp; for gimp plugin support')
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install || return 1
+  optdepends=('xsane-gimp: for gimp plugin support')
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
 
 package_xsane-gimp() {
   pkgdesc="XSane Gimp plugin"
   depends=('xsane' 'gimp')
-  cd "$srcdir/$pkgname-$pkgver"
-  install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp || return 1
+  cd "$srcdir/$pkgbase-$pkgver"
+  install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp"
 
   ## For making Gimp Plugin available 
   /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
@@ -62,5 +66,3 @@ package_xsane-gimp() {
 #115 	fi
 #116 	fi 
 }
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
-         '15541ff0ddc10acfa2059cf99d5478eb')
diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD
index 85730ab32..46625467b 100644
--- a/extra/xsp/PKGBUILD
+++ b/extra/xsp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120915 2011-04-27 09:28:00Z daniel $
+# $Id: PKGBUILD 149095 2012-02-05 17:09:35Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=xsp
 pkgver=2.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple webserver based on mono - provides ASP.NET support"
 arch=(i686 x86_64)
 license=('custom')
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 0f423222d..56196484e 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148515 2012-02-02 23:34:39Z ibiru $
+# $Id: PKGBUILD 148986 2012-02-05 11:59:04Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
 pkgver=10.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
diff --git a/extra/yakuake/PKGBUILD b/extra/yakuake/PKGBUILD
index 6fe44c6cb..260601529 100644
--- a/extra/yakuake/PKGBUILD
+++ b/extra/yakuake/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 107962 2011-01-28 08:00:39Z andrea $
+# $Id: PKGBUILD 149017 2012-02-05 14:08:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
 # Contributor: leeghoofd <abcdefg@solcon.nl>
 
 pkgname=yakuake
 pkgver=2.9.8
-pkgrel=1
-pkgdesc="A KDE konsole application with the look and feel of that in the Quake engine"
+pkgrel=2
+pkgdesc="A drop-down terminal emulator based on KDE konsole technology"
 arch=('i686' 'x86_64')
-url="http://yakuake.kde.org"
+url='http://yakuake.kde.org/'
 license=('GPL')
 depends=('kdebase-konsole')
 makedepends=('cmake' 'automoc4')
@@ -22,7 +22,6 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD
index 8ad534a47..e80fae342 100644
--- a/extra/zvbi/PKGBUILD
+++ b/extra/zvbi/PKGBUILD
@@ -1,25 +1,38 @@
-# $Id: PKGBUILD 101442 2010-11-29 09:37:06Z jgc $
+# $Id: PKGBUILD 148988 2012-02-05 11:59:13Z ibiru $
 # Maintainer: 
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
+
 pkgname=zvbi
 pkgver=0.2.33
-pkgrel=3
+pkgrel=4
 pkgdesc="VBI capture and decoding library"
 url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 depends=('libpng' 'libx11')
 license=('GPL')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2
-        fix-includes.patch)
+source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
+        'fix-includes.patch'
+        'zvbi-0.2.33-libpng15.patch')
 md5sums=('1741a6045c3eedfb611d645f2da69ac8'
-         '38766bc59e1571133d0399f0102da653')
+         '38766bc59e1571133d0399f0102da653'
+         '4434de7addc438be8c5a33274146bd11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -Np1 -i "${srcdir}/fix-includes.patch"
-  ./configure --prefix=/usr --disable-static --mandir=/usr/share/man
+  patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch"
+
+  ./configure --prefix=/usr \
+              --disable-static \
+              --mandir=/usr/share/man
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/zvbi/zvbi-0.2.33-libpng15.patch b/extra/zvbi/zvbi-0.2.33-libpng15.patch
new file mode 100644
index 000000000..262677376
--- /dev/null
+++ b/extra/zvbi/zvbi-0.2.33-libpng15.patch
@@ -0,0 +1,21 @@
+Index: src/exp-gfx.c
+===================================================================
+RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v
+retrieving revision 1.16
+diff -u -B -r1.16 exp-gfx.c
+--- src/exp-gfx.c	24 Feb 2008 14:17:47 -0000	1.16
++++ src/exp-gfx.c	15 Feb 2011 20:03:58 -0000
+@@ -1672,11 +1672,11 @@
+ 	char title[80];
+ 	unsigned int i;
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp (png_jmpbuf(png_ptr)))
+ 		return FALSE;
+ 
+ 	png_set_write_fn (png_ptr,
+-			  (voidp) gfx,
++			  (png_voidp) gfx,
+ 			  write_data,
+ 			  flush_data);
+