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

Conflicts: community-testing/blender/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/root/PKGBUILD community-testing/ted/PKGBUILD extra/cpufrequtils/PKGBUILD extra/libraw1394/PKGBUILD extra/musicbrainz/PKGBUILD extra/pm-utils/PKGBUILD extra/re2c/PKGBUILD extra/zip/PKGBUILD multilib/lib32-expat/PKGBUILD multilib/lib32-flac/PKGBUILD multilib/lib32-fontconfig/PKGBUILD multilib/lib32-giflib/PKGBUILD multilib/lib32-glew/PKGBUILD multilib/lib32-glib/PKGBUILD multilib/lib32-json-c/PKGBUILD multilib/lib32-lcms/PKGBUILD multilib/lib32-libao/PKGBUILD multilib/lib32-libasyncns/PKGBUILD multilib/lib32-libcups/PKGBUILD multilib/lib32-libice/PKGBUILD multilib/lib32-libmikmod/PKGBUILD multilib/lib32-libsm/PKGBUILD multilib/lib32-libsndfile/PKGBUILD multilib/lib32-libstdc++5/PKGBUILD multilib/lib32-libvorbis/PKGBUILD multilib/lib32-libxau/PKGBUILD multilib/lib32-libxcomposite/PKGBUILD multilib/lib32-libxdamage/PKGBUILD multilib/lib32-libxdmcp/PKGBUILD multilib/lib32-libxft/PKGBUILD multilib/lib32-libxinerama/PKGBUILD multilib/lib32-libxml2/PKGBUILD multilib/lib32-libxmu/PKGBUILD multilib/lib32-libxrender/PKGBUILD multilib/lib32-libxss/PKGBUILD multilib/lib32-libxt/PKGBUILD multilib/lib32-libxtst/PKGBUILD multilib/lib32-libxv/PKGBUILD multilib/lib32-libxvmc/PKGBUILD multilib/lib32-libxxf86vm/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-openal/PKGBUILD multilib/lib32-speex/PKGBUILD testing/kdelibs3/PKGBUILD testing/kmod/PKGBUILD testing/php/PKGBUILD testing/systemd/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-02-10 10:21:53 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-02-10 10:21:53 -0300
commit: 9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (patch)
tree: a9c2e47a6d2ce00fda6c302e09aba390accc1407 /extra
parent: 96790e4d7e2c3a76ee2ee0c5d703b8144049532c (diff)
parent: 4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (diff)
44 files changed, 277 insertions, 148 deletions
diff --git a/extra/basket/PKGBUILD b/extra/basket/PKGBUILD
index 8887cd7ca..f8f652191 100644
--- a/extra/basket/PKGBUILD
+++ b/extra/basket/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94445 2010-10-07 10:25:17Z ronald $
+# $Id: PKGBUILD 149623 2012-02-08 20:36:29Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=basket
 pkgver=1.81
-pkgrel=1
+pkgrel=2
 pkgdesc="All-purpose notes taker for KDE."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://basket.kde.org/"
@@ -23,7 +23,7 @@ build() {
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr
 
-  make || return 1
+  make
 }
 
 package() {
diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD
index c630d2d8c..e1f818002 100644
--- a/extra/boo/PKGBUILD
+++ b/extra/boo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110402 2011-02-19 07:26:29Z eric $
+# $Id: PKGBUILD 149602 2012-02-08 17:29:14Z stephane $
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: tardo <tardo@nagi-fanboi.net>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=boo
 pkgver=0.9.4.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A wrist friendly language for the CLI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://boo.codehaus.org/"
diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD
index b5fbb721b..30be03277 100644
--- a/extra/chemtool/PKGBUILD
+++ b/extra/chemtool/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 78228 2010-04-20 03:46:15Z dgriffiths $
+# $Id: PKGBUILD 149523 2012-02-08 11:37:54Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=chemtool
-pkgver=1.6.12
-pkgrel=3
+pkgver=1.6.13
+pkgrel=1
 pkgdesc="A small program for drawing chemical structures"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html"
-depends=('gtk2')
+depends=('gtk2' 'desktop-file-utils')
 options=(!libtool)
 source=(http://ruby.chemie.uni-freiburg.de/~martin/${pkgname}/${pkgname}-${pkgver}.tar.gz chemtool.desktop)
+install=chemtool.install
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man
- make || return 1
+ make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
  make DESTDIR=${pkgdir}/ install
  install -D -m644 gnome/chemtool.png ${pkgdir}/usr/share/pixmaps/chemtool.png
  install -D -m644 ${srcdir}/chemtool.desktop ${pkgdir}/usr/share/applications/chemtool.desktop
 }
-md5sums=('f9e0633cbda09fcfe5a4ea4c56bcd460'
+md5sums=('d263b8cf097134e36c5e929e7e77d668'
          '8cbb6f7021bd5aaa6f6a31fc4d95a06e')
diff --git a/extra/chemtool/chemtool.install b/extra/chemtool/chemtool.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/extra/chemtool/chemtool.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/cpio/PKGBUILD b/extra/cpio/PKGBUILD
index c6ebc1d41..e555b3119 100644
--- a/extra/cpio/PKGBUILD
+++ b/extra/cpio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 76085 2010-04-07 18:00:10Z tpowa $
+# $Id: PKGBUILD 149526 2012-02-08 11:43:48Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=cpio
 pkgver=2.11
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool to copy files into or out of a cpio or tar archive"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -15,7 +15,11 @@ md5sums=('1112bb6c45863468b5496ba128792f6c')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1
   mv ${pkgdir}/usr/bin ${pkgdir}/bin
diff --git a/extra/cpufrequtils/PKGBUILD b/extra/cpufrequtils/PKGBUILD
index 21ffbe1cd..2eab017a8 100644
--- a/extra/cpufrequtils/PKGBUILD
+++ b/extra/cpufrequtils/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 85780 2010-07-19 14:39:52Z kevin $
+# $Id: PKGBUILD 149475 2012-02-08 09:53:00Z pierre $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: phrakture <aaronmgriffin+gmail+com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=cpufrequtils
 pkgver=008
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools for the kernel cpufreq subsystem"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
 license=('GPL')
 depends=('sysfsutils')
 backup=('etc/conf.d/cpufreq')
-source=(http://www.kernel.org/pub/linux/utils/kernel/cpufreq/${pkgname}-${pkgver}.tar.bz2
-        cpufreq.rcd
-        cpufreq.confd
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'cpufreq.rcd'
+        'cpufreq.confd'
         cpufrequtils-mips.patch)
-options=(!libtool !distcc)
+options=('!libtool' '!makeflags')
 md5sums=('c59b71c044d463896f3247e8dd83dd7e'
          '7f2b5085df44d2df3e7c2d0b9f6dab08'
          'baae1f2abffc6bef2bd32a8dd8263c09'
          'edbe311e6813f3b395a08b7f174065c1')
 
-build()
-{
+build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   [ "$CARCH" = "mips64el" ] && patch -Np0 -i ${srcdir}/cpufrequtils-mips.patch
 
-  make -j1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install
 
   install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq"
diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD
index d74363da5..c5b0c85fc 100644
--- a/extra/ddrescue/PKGBUILD
+++ b/extra/ddrescue/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 107823 2011-01-27 04:32:13Z paul $
+# $Id: PKGBUILD 149619 2012-02-08 20:30:46Z pierre $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=ddrescue
-pkgver=1.14
+pkgver=1.15
 pkgrel=1
 pkgdesc="GNU data recovery tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,13 +10,19 @@ url="http://www.gnu.org/software/ddrescue/ddrescue.html"
 license=('GPL3')
 depends=('gcc-libs')
 install=$pkgname.install
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d6f6cc63df9ad352bc6e43b65c975af5')
+source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+        "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig")
+md5sums=('6b445f6246074a7fa02f3b2599031096'
+         '53bc7e1f5b2a260def5207eb358b7dca')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install install-man || return 1
-  rm "$pkgdir"/usr/share/info/dir || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install install-man
+  rm "$pkgdir"/usr/share/info/dir
 }
diff --git a/extra/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD
index 7d58d2436..d19989cda 100644
--- a/extra/dotconf/PKGBUILD
+++ b/extra/dotconf/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 127711 2011-06-17 18:24:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 149587 2012-02-08 15:12:44Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Chris Brannon <cmbrannon@cox.net>
 
 pkgname=dotconf
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A C library for parsing configuration files'
 url="https://github.com/williamh/dotconf"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
index 1c25d102d..62eef8fc0 100755
--- a/extra/efibootmgr/PKGBUILD
+++ b/extra/efibootmgr/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 108903 2011-02-04 21:01:10Z tpowa $
+# $Id: PKGBUILD 149530 2012-02-08 11:51:04Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor : Murtuza Akhtari <inxsible at gmail dot com>
 # Contributor: Keshav P R <skodabenz at rocketmail dot com>
 
 pkgname=efibootmgr
 pkgver=0.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux.dell.com/efibootmgr/"
 license=('GPL2')
-depends=('zlib')
+depends=('zlib' 'pciutils')
 makedepends=()
 provides=()
 options=(strip purge docs zipman !emptydirs)
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index 25317e58e..7dfb92f6c 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 104058 2010-12-27 16:47:09Z andrea $
+# $Id: PKGBUILD 149589 2012-02-08 15:14:51Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=fsarchiver
 pkgver=0.6.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A safe and flexible file-system backup and deployment tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fsarchiver.org/"
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index 92d96cdf0..6e0b38f27 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141256 2011-10-27 14:45:14Z ronald $
+# $Id: PKGBUILD 149637 2012-02-08 21:50:56Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
-pkgver=2.8.6
+pkgver=2.8.7
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,9 @@ install=fuse.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
-sha1sums=('c2c0f9fff8bfee217da200888123e5abb5b498f2'
+sha1sums=('284f22401131ec148bd04362dc86f7b0e94fb5f4'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
@@ -52,6 +53,7 @@ package() {
 
   # install sample config file
   install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
+
   # Fix udev rule location
   install -d -m755 "${pkgdir}/lib"
   mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
diff --git a/extra/ggz-client-libs/PKGBUILD b/extra/ggz-client-libs/PKGBUILD
index 530fa77bd..4262fe121 100644
--- a/extra/ggz-client-libs/PKGBUILD
+++ b/extra/ggz-client-libs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123871 2011-05-14 00:20:19Z andrea $
+# $Id: PKGBUILD 149560 2012-02-08 14:11:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ggz-client-libs
 pkgver=0.0.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GGZ client library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ggzgamingzone.org/"
diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD
index f40457224..b6b4d4fb9 100644
--- a/extra/htdig/PKGBUILD
+++ b/extra/htdig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122102 2011-05-02 07:10:01Z andrea $
+# $Id: PKGBUILD 149485 2012-02-08 10:07:38Z pierre $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=htdig
 pkgver=3.2.0b6
-pkgrel=7
+pkgrel=8
 pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
 url="http://www.htdig.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('openssl')
 options=('!libtool' 'emptydirs')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'gcc4.3.patch'
-	    'CVE-2007-6110.patch')
+        'CVE-2007-6110.patch')
 md5sums=('8b9b9587a411ac7dd278fa5413428960'
          '2aeda683f95b58efc0978d7fe951de59'
          '0d9099d3b5a32d322a8e0240f85a3578')
@@ -42,4 +42,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-
diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD
index 64a24ebb6..87e8c74fd 100644
--- a/extra/lablgtk/PKGBUILD
+++ b/extra/lablgtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97741 2010-11-01 19:31:37Z tpowa $
+# $Id: PKGBUILD 149580 2012-02-08 15:00:33Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk
 pkgver=1.2.7
-pkgrel=8
+pkgrel=9
 pkgdesc=" An Objective Caml interface to gtk+"
 arch=(i686 x86_64 'mips64el')
 url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD
index a8a128035..90a1829ab 100644
--- a/extra/libdmtx/PKGBUILD
+++ b/extra/libdmtx/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 127675 2011-06-17 17:32:51Z andrea $
+# $Id: PKGBUILD 149591 2012-02-08 15:18:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: jose <jose1711 [at] gmail (dot) com>
 
 pkgname=libdmtx
 pkgver=0.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A software for reading and writing Data Matrix 2D barcodes"
 url="http://www.libdmtx.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-depends=('glibc' 'imagemagick')
+depends=('imagemagick')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('d3a4c0becd92895eb606dbdb78b023e2')
 options=('!libtool')
diff --git a/extra/libggz/PKGBUILD b/extra/libggz/PKGBUILD
index f3b7a4b3d..02377b3fc 100644
--- a/extra/libggz/PKGBUILD
+++ b/extra/libggz/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123866 2011-05-14 00:16:35Z andrea $
+# $Id: PKGBUILD 149563 2012-02-08 14:13:45Z tpowa $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libggz
 pkgver=0.0.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GGZ base library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ggzgamingzone.org/"
diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD
index 56c6f19b2..867158017 100644
--- a/extra/libical/PKGBUILD
+++ b/extra/libical/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id $
+# $Id: PKGBUILD 149595 2012-02-08 15:25:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=libical
 pkgver=0.46
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/freeassociation/'
diff --git a/extra/libifp/PKGBUILD b/extra/libifp/PKGBUILD
index fc3667670..b2febe4c8 100644
--- a/extra/libifp/PKGBUILD
+++ b/extra/libifp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101322 2010-11-28 22:22:28Z tpowa $
+# $Id: PKGBUILD 149577 2012-02-08 14:57:04Z tpowa $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 
 pkgname=libifp
 pkgver=1.0.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="General-purpose library-driver for iRiver's iFP portable audio players"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index 5f39e3bdf..a1728be5f 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libindi
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD
index 4266b08f4..bd7549478 100644
--- a/extra/libiodbc/PKGBUILD
+++ b/extra/libiodbc/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libiodbc
 pkgver=3.52.7
-pkgrel=4
+pkgrel=5
 pkgdesc='Independent Open DataBase Connectivity for Linux'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/"
diff --git a/extra/libksba/PKGBUILD b/extra/libksba/PKGBUILD
new file mode 100644
index 000000000..20179c686
--- /dev/null
+++ b/extra/libksba/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 149501 2012-02-08 10:55:32Z tpowa $
+# Maintainer: damir <damir@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=libksba
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="A CMS and X.509 access library"
+arch=(i686 x86_64)
+license=('GPL')
+url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
+depends=('bash' 'libgpg-error' 'glibc')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
+options=(!libtool)
+install=libksba.install
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+   cd $srcdir/$pkgname-$pkgver
+   make check
+}  
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
+md5sums=('e797f370b69b4dc776499d6a071ae137')
diff --git a/extra/libksba/libksba.install b/extra/libksba/libksba.install
new file mode 100644
index 000000000..3715b8960
--- /dev/null
+++ b/extra/libksba/libksba.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(ksba.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/libraw1394/PKGBUILD b/extra/libraw1394/PKGBUILD
index 3f61231e3..4f2fdfa30 100644
--- a/extra/libraw1394/PKGBUILD
+++ b/extra/libraw1394/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 114419 2011-03-13 13:06:30Z tpowa $
+# $Id: PKGBUILD 149545 2012-02-08 13:57:56Z tpowa $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libraw1394
 pkgver=2.0.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD
index 0b24738ae..122248b0b 100644
--- a/extra/lynx/PKGBUILD
+++ b/extra/lynx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108237 2011-01-30 14:55:53Z andrea $
+# $Id: PKGBUILD 149487 2012-02-08 10:10:55Z pierre $
 # Maintainer:
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 pkgname=lynx
 pkgver=2.8.7
 _pkgver=2-8-7
-pkgrel=4
+pkgrel=5
 pkgdesc="A text browser for the World Wide Web"
 url="http://lynx.isc.org/"
 arch=(i686 x86_64 'mips64el')
diff --git a/extra/musicbrainz/PKGBUILD b/extra/musicbrainz/PKGBUILD
index c9ea377ae..6894b5498 100644
--- a/extra/musicbrainz/PKGBUILD
+++ b/extra/musicbrainz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89512 2010-09-01 12:52:06Z remy $
+# $Id: PKGBUILD 149574 2012-02-08 14:54:36Z tpowa $
 # Maintainer: 
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=musicbrainz
 pkgver=2.1.5
-pkgrel=4
+pkgrel=5
 pkgdesc="The second generation incarnation of the CD Index"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.musicbrainz.org/index.html"
+url="http://www.musicbrainz.org"
 license=('LGPL')
-depends=('expat>=2.0')
+depends=('expat>=2.0' 'gcc-libs')
 makedepends=('python2')
 options=('!libtool')
 source=(ftp://ftp.musicbrainz.org/pub/$pkgname/libmusicbrainz-${pkgver}.tar.gz
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index b1706dde1..e51695ba4 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 120898 2011-04-27 08:00:36Z ronald $
+# $Id: PKGBUILD 149625 2012-02-08 20:40:04Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas B�chler <thomas.archlinux.org>
 
 pkgbase=ntfs-3g_ntfsprogs
 pkgname=('ntfs-3g' 'ntfsprogs')
 pkgver=2011.4.12
-pkgrel=1
+pkgrel=2
 url="http://www.tuxera.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -20,8 +20,8 @@ sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7'
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
-    --with-fuse=external --disable-static --disable-gnome-vfs \
-      --mandir=/usr/share/man
+    --with-fuse=external --disable-static \
+    --mandir=/usr/share/man
   make
 }
 
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index 9fe115aef..0462943ed 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122097 2011-05-02 06:42:28Z andrea $
+# $Id: PKGBUILD 149571 2012-02-08 14:46:39Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openexr
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An high dynamic-range image file format library"
 url="http://www.openexr.com/"
 arch=(i686 x86_64 'mips64el')
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 3a7e1755d..7b540932f 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145472 2011-12-22 22:17:38Z andrea $
+# $Id: PKGBUILD 149569 2012-02-08 14:44:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
@@ -12,17 +12,22 @@ pkgdesc="The multimedia framework for KDE"
 depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
 makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'fix-plugindir-for-qt-app.patch')
+md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
+         'e37d67038c2501f25ac7ee7c2de54a9a')
 
 build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+
   cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
     -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
   make
diff --git a/extra/phonon/fix-plugindir-for-qt-app.patch b/extra/phonon/fix-plugindir-for-qt-app.patch
new file mode 100644
index 000000000..376f294f7
--- /dev/null
+++ b/extra/phonon/fix-plugindir-for-qt-app.patch
@@ -0,0 +1,11 @@
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
+@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN)
+     add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN)
+ endif (PHONON_NO_PLATFORMPLUGIN)
+ 
+-add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
++add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins")
+ 
+ automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS})
+ target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD
index 2ef5e2208..735400365 100644
--- a/extra/pm-utils/PKGBUILD
+++ b/extra/pm-utils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 116693 2011-03-25 07:49:30Z jgc $
+# $Id: PKGBUILD 149612 2012-02-08 20:16:43Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=pm-utils
 pkgver=1.4.1
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Utilities and scripts for suspend and hibernate power management"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pm-utils.freedesktop.org"
@@ -13,10 +13,10 @@ license=('GPL')
 depends=('bash' 'procps' 'pm-quirks')
 makedepends=('xmlto' 'docbook-xml' 'docbook-xsl')
 source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-02-logging-append.patch
-12-fix-intel-audio-powersave-hook.patch
-13-49bluetooth-sync.patch
-14-disable-sata-alpm.patch
+        02-logging-append.patch
+        12-fix-intel-audio-powersave-hook.patch
+        13-49bluetooth-sync.patch
+        14-disable-sata-alpm.patch
         11netcfg)
 md5sums=('1742a556089c36c3a89eb1b957da5a60'
          'a45149617bf3eb8dc32e6d9e22ae715d'
@@ -35,6 +35,10 @@ build() {
       --sysconfdir=/etc \
       --localstatedir=/var
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   # install additional hooks
diff --git a/extra/pmount/PKGBUILD b/extra/pmount/PKGBUILD
index 908d7acdd..7844aaf9a 100644
--- a/extra/pmount/PKGBUILD
+++ b/extra/pmount/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 119797 2011-04-15 09:29:18Z jgc $
+# $Id: PKGBUILD 149539 2012-02-08 13:33:32Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=pmount
 pkgver=0.9.23
-pkgrel=2
+pkgrel=3
 pkgdesc="mount removable devices as normal user"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://pmount.alioth.debian.org/"
 backup=('etc/pmount.allow')
-depends=('sysfsutils>=2.0.0-1' 'bash')
+depends=('sysfsutils>=2.0.0-1' 'bash' 'util-linux')
 makedepends=('intltool')
 source=(https://alioth.debian.org/frs/download.php/3310/pmount-0.9.23.tar.bz2)
 md5sums=('db19f5bf3151b1b41705ec7bafa439d3')
@@ -18,5 +18,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-hal
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/pwgen/PKGBUILD b/extra/pwgen/PKGBUILD
index bc7dc14c4..aa9c23df0 100644
--- a/extra/pwgen/PKGBUILD
+++ b/extra/pwgen/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 78038 2010-04-19 08:28:26Z dgriffiths $
+# $Id: PKGBUILD 149610 2012-02-08 20:11:44Z pierre $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor : Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pwgen
 pkgver=2.06
-pkgrel=2
+pkgrel=3
 pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human"
 arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/pwgen/"
 license=('GPL')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz")
 md5sums=('935aebcbe610fbc9de8125e7b7d71297')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./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/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD
index cbe885624..519d01b72 100644
--- a/extra/qca-gnupg/PKGBUILD
+++ b/extra/qca-gnupg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123769 2011-05-12 21:14:25Z andrea $
+# $Id: PKGBUILD 149479 2012-02-08 09:59:34Z pierre $
 # Maintainer:
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qca-gnupg
 pkgver=2.0.0
 _pkgver=2.0.0-beta3
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD
index 91fb1bbf4..78f8b77ac 100644
--- a/extra/qca-ossl/PKGBUILD
+++ b/extra/qca-ossl/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qca-ossl
 pkgver=2.0.0
 _pkgver=2.0.0-beta3
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD
index 2cf9184ce..57050c146 100644
--- a/extra/qca/PKGBUILD
+++ b/extra/qca/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101667 2010-11-30 11:00:58Z andrea $
+# $Id: PKGBUILD 149477 2012-02-08 09:57:45Z pierre $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qca
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index e19e19418..a2dbb31b8 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 92392 2010-09-29 14:51:01Z ronald $
+# $Id: PKGBUILD 149629 2012-02-08 20:53:42Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qt-assistant-compat
 pkgver=4.6.3
-pkgrel=1
-pkgdesk="compat version of Qt Assistant"
+pkgrel=2
+pkgdesc="compat version of Qt Assistant"
 url="http://qt.nokia.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 depends=('qt')
 source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
-	'debian_patches_01_build_system.diff')
+        'debian_patches_01_build_system.diff')
 md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
          '1b55290dc9fab0c035797e9301d2fa61')
 
@@ -18,38 +18,37 @@ md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
 build() {
 	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
 
- 	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
-        
+	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
+
 	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
-        rm -f translations/assistant_adp_*.qm
+	rm -f translations/assistant_adp_*.qm
 
 	qmake CONFIG+=create_prl
-        make
-        cd  ../translations; lrelease assistant_adp_*.ts
-        cd ..
-        qmake CONFIG+=create_prl
-        make
+	make
+	cd  ../translations; lrelease assistant_adp_*.ts
+	cd ..
+	qmake CONFIG+=create_prl
+	make
 }
 
-package(){
-        cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+package() {
+	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
 
-      	make install INSTALL_ROOT=${pkgdir}
-        cd lib
-        make install INSTALL_ROOT=${pkgdir}
-        cd ..
+	make install INSTALL_ROOT=${pkgdir}
+	cd lib
+	make install INSTALL_ROOT=${pkgdir}
+	cd ..
 
 	# Fix wrong path in prl file
 	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \
-	    ${pkgdir}/usr/lib/libQtAssistantClient.prl
+		${pkgdir}/usr/lib/libQtAssistantClient.prl
 
 	# Install translations
 	install -d ${pkgdir}/usr/share/qt/translations/
 	install -p -m0644 translations/assistant_adp_*.qm \
-	    ${pkgdir}/usr/share/qt/translations/
+		${pkgdir}/usr/share/qt/translations/
 
 	# Install prf file
 	install -D -p -m0644 features/assistant.prf \
-	    ${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
-
+		${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
 }
diff --git a/extra/qtcurve-kde3/PKGBUILD b/extra/qtcurve-kde3/PKGBUILD
index 9aeadda41..214bdb40d 100644
--- a/extra/qtcurve-kde3/PKGBUILD
+++ b/extra/qtcurve-kde3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 118940 2011-04-09 13:49:25Z andrea $
+# $Id: PKGBUILD 149631 2012-02-08 20:57:56Z pierre $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-kde3
 pkgver=1.8.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 groups=('qtcurve')
 license=('GPL')
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index 3b7c111bb..9f465e8fc 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136901 2011-09-02 17:44:52Z ronald $
+# $Id: PKGBUILD 149627 2012-02-08 20:47:17Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qwt
 pkgver=6.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt Widgets for Technical Applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qwt.sourceforge.net/"
diff --git a/extra/re2c/PKGBUILD b/extra/re2c/PKGBUILD
index 7380b1d9a..d72f4d364 100644
--- a/extra/re2c/PKGBUILD
+++ b/extra/re2c/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 123734 2011-05-12 20:45:05Z andrea $
+# $Id: PKGBUILD 149483 2012-02-08 10:02:54Z pierre $
 # Maintainer:
 # Contributor: nut543 <kfs1@online.no>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=re2c
 pkgver=0.13.5
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs')
 pkgdesc="A tool for generating C-based recognizers from regular expressions"
diff --git a/extra/sane-frontends/PKGBUILD b/extra/sane-frontends/PKGBUILD
index 36a2b0721..99d7a9ee5 100644
--- a/extra/sane-frontends/PKGBUILD
+++ b/extra/sane-frontends/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 64806 2010-01-22 08:53:01Z eric $
+# $Id: PKGBUILD 149557 2012-02-08 14:05:36Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=sane-frontends
 pkgver=1.0.14
-pkgrel=5
+pkgrel=6
 pkgdesc="A set of frontends for SANE."
 arch=(i686 x86_64 'mips64el')
 url="http://www.sane-project.org"
 license=('GPL')
 depends=('sane' 'gimp' 'libjpeg>=7')
-source=(ftp://ftp.sane-project.org/pub/sane/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz MissingCapsFlag.patch)
+source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz MissingCapsFlag.patch)
 md5sums=('c63bf7b0bb5f530cf3c08715db721cd3' '770f66e0534953f6129e1fc03d88ae01')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 < ../MissingCapsFlag.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  patch -p0 < ../MissingCapsFlag.patch
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index f5f62c361..f2d408fa6 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 116933 2011-03-26 14:55:24Z tpowa $
+# $Id: PKGBUILD 149549 2012-02-08 14:00:43Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=tdb
 pkgver=1.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits"
 arch=(i686 x86_64 'mips64el')
 license=('GPL3')
diff --git a/extra/tunepimp/PKGBUILD b/extra/tunepimp/PKGBUILD
index caa9c1f0a..6c5554a67 100644
--- a/extra/tunepimp/PKGBUILD
+++ b/extra/tunepimp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90474 2010-09-11 21:30:49Z andrea $
+# $Id: PKGBUILD 149566 2012-02-08 14:42:07Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=tunepimp
 pkgver=0.5.3
-pkgrel=8
+pkgrel=9
 pkgdesc="A development library geared towards developers who wish to create MusicBrainz enabled tagging applications (aka libtunepimp)"
 url="http://www.musicbrainz.org/products/tunepimp/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,11 +15,8 @@ replaces=('trm')
 source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${pkgname}-${pkgver}.tar.gz
         tunepimp-gcc43.patch
 	gcc4.4.patch
-	mp4v2-1.9.patch)
-md5sums=('09649f983acef679a548344ba7a9bb2f'
-         '40f48ad658958b909909b204bf9b1367'
-         'b325bf8ed98bc008611ece0c418642f8'
-         '9f41d473a07e13808762545772fe3435')
+	mp4v2-1.9.patch
+        tunepimp-curl-headers.patch)
 
  build() {
   cd ${srcdir}/lib${pkgname}-${pkgver}
@@ -28,6 +25,7 @@ md5sums=('09649f983acef679a548344ba7a9bb2f'
   patch -Np0 -i ${srcdir}/tunepimp-gcc43.patch
   patch -Np1 -i ${srcdir}/gcc4.4.patch
   patch -Np1 -i ${srcdir}/mp4v2-1.9.patch
+  patch -Np1 -i ${srcdir}/tunepimp-curl-headers.patch
   ./configure --prefix=/usr
   make
 }
@@ -44,3 +42,8 @@ package() {
   cd ${pkgdir}/usr/include
   ln -s tunepimp-0.5 tunepimp
 }
+md5sums=('09649f983acef679a548344ba7a9bb2f'
+         '40f48ad658958b909909b204bf9b1367'
+         'b325bf8ed98bc008611ece0c418642f8'
+         '9f41d473a07e13808762545772fe3435'
+         '9cefd852995ebd2c4f733f2bef18c12a')
diff --git a/extra/tunepimp/tunepimp-curl-headers.patch b/extra/tunepimp/tunepimp-curl-headers.patch
new file mode 100644
index 000000000..15e059bfa
--- /dev/null
+++ b/extra/tunepimp/tunepimp-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/protocol.cpp b/lib/protocol.cpp
+index 3436f80..5adb2e5 100644
+--- a/lib/protocol.cpp
++++ b/lib/protocol.cpp
+@@ -13,7 +13,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ using namespace std;
+ 
diff --git a/extra/zip/PKGBUILD b/extra/zip/PKGBUILD
index ecf3e02a5..f55374772 100644
--- a/extra/zip/PKGBUILD
+++ b/extra/zip/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 121305 2011-04-30 13:24:04Z andrea $
+# $Id: PKGBUILD 149604 2012-02-08 19:38:19Z pierre $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=zip
 pkgver=3.0
 _pkgver=30
-pkgrel=2
+pkgrel=3
 pkgdesc="Creates PKZIP-compatible .zip files"
-arch=(i686 x86_64 'mips64el')
-url="http://www.info-zip.org/pub/infozip/Zip.html"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.info-zip.org/Zip.html"
 license=('BSD')
 depends=('bzip2')
 options=('!makeflags')
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-02-10 10:21:53 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-02-10 10:21:53 -0300
commit	9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (patch)
tree	a9c2e47a6d2ce00fda6c302e09aba390accc1407 /extra
parent	96790e4d7e2c3a76ee2ee0c5d703b8144049532c (diff)
parent	4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (diff)