Fri Apr 19 01:05:57 PDT 2013

18 files changed, 148 insertions, 214 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index ef8176d1f..e293ebcdf 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $
+# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -9,23 +9,21 @@
 
 pkgname=bitlbee
 pkgver=3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('openssl' 'glib2')
+depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr3')
 optdepends=('skype4py: to use skyped'
             'libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
         'xinetd'
-        'rc.d'
         'bitlbee.tmpfiles')
 sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '02423c500ac64f673ba26a3395c7c7036c17343e'
           '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
 backup=('etc/bitlbee/bitlbee.conf'
         'etc/bitlbee/motd.txt'
@@ -41,7 +39,7 @@ build() {
     --pidfile=/run/bitlbee/bitlbee.pid \
     --ipcsocket=/run/bitlbee/bitlbee.sock \
     --systemdsystemunitdir=/usr/lib/systemd/system \
-    --ssl=openssl \
+    --ssl=gnutls \
     --strip=0 \
     --otr=plugin \
     --skype=plugin
@@ -58,6 +56,5 @@ package() {
 
   install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
   install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-  install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
   install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
 }
diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d
deleted file mode 100644
index ade85221a..000000000
--- a/extra/bitlbee/rc.d
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/bitlbee/bitlbee.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting bitlbee daemon"
-    if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then
-      stat_fail
-      exit 1
-    else
-      add_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bitlbee daemon"
-    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
-      stat_fail
-      exit 1
-    else
-      rm -f "$pidfile"
-      rm_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-    ;;
-esac
-
-# vim: set ft=sh et ts=2 sw=2:
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
index 6ab2354ba..84574061f 100644
--- a/extra/check/PKGBUILD
+++ b/extra/check/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171322 2012-11-17 08:55:42Z heftig $
+# $Id: PKGBUILD 183188 2013-04-18 16:03:52Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jeremy Cowgar <jeremy@cowgar.com>
 
 pkgname=check
-pkgver=0.9.9
+pkgver=0.9.10
 pkgrel=1
 pkgdesc="A unit testing framework for C"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 options=('!libtool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('f3702f2fcfc19ce3f62dca66c241a168')
+md5sums=('6d10a8efb9a683467b92b3bce97aeb30')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch
new file mode 100644
index 000000000..05223cdb2
--- /dev/null
+++ b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch
@@ -0,0 +1,26 @@
+From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 18 Apr 2013 09:47:49 +0100
+Subject: [PATCH] Fix wrong size in memset() call.
+
+Thanks to Dave Reisner.
+---
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index a34ed96..f175fa4 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
+       return -1;
+     }
+   
+-  memset(buffer, 0, sizeof(buffer));
++  memset(buffer, 0, BUFF_SZ);
+ 
+   nlh = (struct nlmsghdr *)buffer;
+   nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
+-- 
+1.8.2.1
+
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 09757a55a..38accba08 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173229 2012-12-14 17:31:42Z dreisner $
+# $Id: PKGBUILD 183176 2013-04-18 12:45:45Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.65
+pkgver=2.66
 pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
@@ -12,17 +12,20 @@ arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glibc' 'dbus-core')
 install=$pkgname.install
-backup=('etc/dnsmasq.conf'
-        'etc/conf.d/dnsmasq')
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
-        'dnsmasq.confd'
-        'rc.dnsmasq'
+backup=('etc/dnsmasq.conf')
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
+        '0001-Fix-wrong-size-in-memset-call.patch'
         'dnsmasq.service')
-md5sums=('a91534a5d6f053d5c80f67ef502afa34'
-         '66479e99123faeab83ebaed709ef95b5'
-         '819fbdf6440d710616e6df5f8ca9cdba'
+md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20'
+         '05ccefefde68ebdebce5e40d2b3c78be'
          '7ac45726cabef4145db40d758cc7fedf')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch"
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
@@ -30,7 +33,7 @@ build() {
   # compile time opts report properly on startup. yuck.
   sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h
 
-  make
+  make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS"
 }
 
 package() {
@@ -38,9 +41,6 @@ package() {
 
   make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
 
-  install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
-  install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq"
-
   install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
   install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
   install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service
diff --git a/extra/dnsmasq/dnsmasq.confd b/extra/dnsmasq/dnsmasq.confd
deleted file mode 100644
index 933b92850..000000000
--- a/extra/dnsmasq/dnsmasq.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# runtime config for dnsmasq
-#
-
-# if unset, dnsmasq will run as nobody.
-DNSMASQ_USER=dnsmasq
-
-# other runtime options. treated as an array.
-DNSMASQ_OPTS=()
diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq
deleted file mode 100755
index 4030c2896..000000000
--- a/extra/dnsmasq/rc.dnsmasq
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
-  local testout
-
-  if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then
-    echo "$testout"
-    return 1
-  fi
-
-  return 0
-}
-
-pidfile=/run/dnsmasq.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting DNS/DHCP daemon"
-    if [[ -z $PID ]] && checkconfig &&
-        /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
-                          "--pid-file=$pidfile" \
-                          "${DNSMASQ_OPTS[@]}"; then
-      add_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS/DHCP daemon"
-    if [[ $PID ]] && kill "$PID" &> /dev/null; then
-      # dnsmasq doesn't clean up after itself
-      rm -f "$pidfile"
-      rm_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  checkconfig)
-    # diagnostics will be printed, with zero/non-zero exit
-    /usr/bin/dnsmasq --test
-    ;;
-  *)
-    echo "usage: $0 <start|stop|restart|checkconfig>"
-esac
-
diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD
index 60c493c8f..e89b5193b 100644
--- a/extra/farstream/PKGBUILD
+++ b/extra/farstream/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 170993 2012-11-14 14:37:18Z ibiru $
+# $Id: PKGBUILD 183166 2013-04-18 07:35:04Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=farstream
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
+license=('LGPL')
 depends=('gst-plugins-base-libs' 'libnice')
 makedepends=('gobject-introspection')
 optdepends=('gst-plugins-good' 'gst-plugins-bad')
 conflicts=('farsight2')
 replaces=('farsight2')
 options=(!libtool)
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('01c20c1ed014ad4e18e55f1f6caf7877')
+source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('a8971167068b69a6933d3eaaeb9ab448'
+         'SKIP')
 
 build() {
-  cd  $pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --with-package-name='Arch Linux farstream package' \
     --with-package-origin='http://archlinux.org' \
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index 8e75a5e94..e409fb486 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158109 2012-05-03 01:01:32Z foutrelis $
+# $Id: PKGBUILD 183169 2013-04-18 10:54:20Z juergen $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.8
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=('i686' 'x86_64')
 url="http://www.maxmind.com/app/c"
@@ -13,7 +13,7 @@ depends=('zlib' 'geoip-database')
 backup=('etc/geoip/GeoIP.conf')
 options=('!libtool' '!emptydirs')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz)
-sha256sums=('cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4')
+sha256sums=('d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2')
 
 build() {
   cd "$srcdir/GeoIP-$pkgver"
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index a81a1a3a1..97d6589dd 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173164 2012-12-11 22:33:51Z eric $
+# $Id: PKGBUILD 183196 2013-04-18 19:51:15Z eric $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ibus
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool')
 options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('31d732c17d0a103565fa29995c5610e8be8b2dca')
+sha1sums=('a7e1695731b4c954fa8897d091e6dda64e08b28c')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD
index 85db72147..bf97cc154 100644
--- a/extra/libofx/PKGBUILD
+++ b/extra/libofx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182911 2013-04-16 04:51:05Z eric $
+# $Id: PKGBUILD 183162 2013-04-18 06:30:55Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgbase=libofx
 pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.7
+pkgver=0.9.8
 pkgrel=1
 pkgdesc="API for the OFX banking standard"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('opensp' 'curl' 'libxml++')
 checkdepends=('gnupg')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('9c6ac208dcc6a89525281827c3ab56c08923a02c')
+sha1sums=('e0159d77c4458eb937871373db85c9f392e86554')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index ce8825abe..721f23a58 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173800 2012-12-24 00:28:32Z andyrtr $
+# $Id: PKGBUILD 183190 2013-04-18 16:15:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libtasn1
-pkgver=3.2
+pkgver=3.3
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('glibc' 'texinfo')
 options=('!libtool')
 install=libtasn1.install
 source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('1b07629163025b9693aae9b8957842b2'
-         '67bdae9b78ac7bbfa2ab24c7d46bd577')
+md5sums=('2bdd687f487c50a0382b99553866a6e0'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index c5846bdd5..306b7fc68 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 156639 2012-04-22 00:00:22Z andyrtr $
+# $Id: PKGBUILD 183192 2013-04-18 16:39:00Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libwpd
-pkgver=0.9.4
+pkgver=0.9.6
 pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('i686' 'x86_64')
 url="http://libwpd.sourceforge.net/"
 license=('LGPL')
-depends=('gcc-libs')
-makedepends=('libgsf>=1.14.20')
+depends=('gcc-libs' 'zlib')
+makedepends=('libgsf>=1.14.26')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d30d1726c3b113db70daaae423dd4448')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('63f476b892bf783072854b98d2fc4fa2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index 1b6dd8a5f..82116ab17 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 148860 2012-02-05 11:53:11Z ibiru $
+# $Id: PKGBUILD 183160 2013-04-18 02:16:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=neverball
 pkgver=1.5.4
-pkgrel=4
+pkgrel=5
 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')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \
+         'hicolor-icon-theme' 'xdg-utils')
 makedepends=('mesa')
+install=neverball.install
 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
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p0 -i ../neverball-1.5.4-underlink.patch
+}
 
-  if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
-  else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
-  fi
+build() {
+  cd ${pkgname}-${pkgver}
+  make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \
+    CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS"
 }
 
 package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
+  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,doc/neverball}
   install -d "${pkgdir}"/usr/share/man/man{1,6}
 
   install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
@@ -37,11 +38,13 @@ package(){
   cp -r data/* "${pkgdir}/usr/share/neverball/"
   install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
   install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
   install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
   install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
 
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
-  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
+  for i in 16 24 32 48 64 128 256; do
+    install -D -m644 dist/neverball_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverball.png"
+    install -D -m644 dist/neverputt_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverputt.png"
+  done
+
+  chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
 }
diff --git a/extra/neverball/neverball.install b/extra/neverball/neverball.install
new file mode 100644
index 000000000..1c0de2e4f
--- /dev/null
+++ b/extra/neverball/neverball.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD
index c4c3caaa8..1af07faba 100644
--- a/extra/qsynth/PKGBUILD
+++ b/extra/qsynth/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 178984 2013-03-01 10:24:07Z andrea $
+# $Id: PKGBUILD 183182 2013-04-18 15:40:20Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=qsynth
-pkgver=0.3.6
-pkgrel=3
+pkgver=0.3.7
+pkgrel=1
 pkgdesc="Qt GUI for FluidSynth"
 arch=('i686' 'x86_64')
 url="http://qsynth.sourceforge.net/"
 license=('GPL')
 depends=('fluidsynth' 'qt4')
-options=('!makeflags')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('3cba3c87463be75ac188ebc3c3023d12')
+md5sums=('a101a50a7ecfb7319482a5022df1d58b')
 
 build() {
-  . /etc/profile.d/qt4.sh
-
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
@@ -25,7 +22,8 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
+
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD
index 1907c778f..a38df1083 100644
--- a/extra/razor/PKGBUILD
+++ b/extra/razor/PKGBUILD
@@ -1,41 +1,39 @@
-# $Id: PKGBUILD 160573 2012-06-02 10:28:53Z bluewind $
+# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=razor
-pkgver=2.84
-pkgrel=7
+pkgver=2.85
+pkgrel=1
 pkgdesc="A distributed, collaborative, spam detection and filtering network"
 arch=('i686' 'x86_64')
 url="http://razor.sourceforge.net"
 license=('PerlArtistic')
 depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl')
 options=('!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2")
-md5sums=('8b9a11a6ce020383c32c45d1530d77c2')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2"
+         razor-2.85-cosmetic-pv-fix.patch)
+md5sums=('014d08db40187cb1316482191566b012'
+         '850645e088b21845f4b6653623d59515')
 
-build() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
-
-  # skip install_razor_agents (we'll do the linking later)
-  # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile
+prepare() {
+  cd ${pkgname}-agents-${pkgver}
+  patch -p1 -i "$srcdir/razor-2.85-cosmetic-pv-fix.patch"
+}
 
+build() {
+  cd ${pkgname}-agents-${pkgver}
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
+  cd ${pkgname}-agents-${pkgver}
   make test
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
+  cd ${pkgname}-agents-${pkgver}
   make DESTDIR="${pkgdir}" install
-
-  # cd ${pkgdir}/usr/bin
-  # for i in razor-check razor-report razor-revoke razor-admin; do 
-  #  /bin/ln -sf razor-client $i; 
-  # done
 }
diff --git a/extra/razor/razor-2.85-cosmetic-pv-fix.patch b/extra/razor/razor-2.85-cosmetic-pv-fix.patch
new file mode 100644
index 000000000..c391d48fb
--- /dev/null
+++ b/extra/razor/razor-2.85-cosmetic-pv-fix.patch
@@ -0,0 +1,22 @@
+--- a/lib/Razor2/Client/Version.pm	2007-05-10 22:32:10.000000000 +0200
++++ b/lib/Razor2/Client/Version.pm	2010-03-25 11:11:36.911409707 +0100
+@@ -14,7 +14,7 @@
+ 
+ $PROTOCOL = 3;
+ 
+-$VERSION = '2.84';
++$VERSION = '2.85';
+ 
+ 1;
+ 
+--- a/META.yml	2007-05-23 20:29:34.000000000 +0200
++++ b/META.yml	2010-03-25 11:11:43.691408628 +0100
+@@ -1,7 +1,7 @@
+ # http://module-build.sourceforge.net/META-spec.html
+ #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+ name:         razor-agents
+-version:      2.84
++version:      2.85
+ version_from: lib/Razor2/Client/Version.pm
+ installdirs:  site
+ requires: