Mon Aug 22 23:14:28 UTC 2011

20 files changed, 263 insertions, 188 deletions

diff --git a/extra/evilwm/LICENSE b/extra/evilwm/LICENSE
new file mode 100644
index 000000000..6778ede8c
--- /dev/null
+++ b/extra/evilwm/LICENSE
@@ -0,0 +1,40 @@
+LICENCE
+
+evilwm 1.1
+Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk>
+
+This is free software.  You can do what you want to it, but if it
+breaks something, you get to pay for the counselling.  The code was
+originally based on aewm, so this is distributed under the same terms,
+which follow.
+
+
+AEWM LICENCE
+
+Copyright (c) 1998-2000 Decklin Foster.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
+OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
+HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
+
+You are granted permission to copy, publish, distribute, and/or sell
+copies of this program and any modified versions or derived works,
+provided that this copyright and notice are not removed or altered.
+
+Portions of the code were based on 9wm, which contains this license:
+
+> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
+> Permission is granted to all sentient beings to use this software,
+> to make copies of it, and to distribute those copies, provided
+> that:
+>
+>     (1) the copyright and licence notices are left intact
+>     (2) the recipients are aware that it is free software
+>     (3) any unapproved changes in functionality are either
+>           (i) only distributed as patches
+>       or (ii) distributed as a new program which is not called 9wm
+>               and whose documentation gives credit where it is due
+>     (4) the author is not held responsible for any defects
+>         or shortcomings in the software, or damages caused by it.
+>
+> There is no warranty for this software.  Have a nice day.
diff --git a/extra/evilwm/PKGBUILD b/extra/evilwm/PKGBUILD
index 704006067..4cee0b427 100644
--- a/extra/evilwm/PKGBUILD
+++ b/extra/evilwm/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 45303 2009-07-09 17:59:42Z giovanni $
+# $Id: PKGBUILD 136041 2011-08-22 00:36:55Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=evilwm
-pkgver=1.0.1
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="A minimalist but usable window manager for the X Window System."
 arch=('i686' 'x86_64')
-depends=('libxrandr')
 url="http://evilwm.sourceforge.net"
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz evilwm.desktop)
-license=(custom)
-md5sums=('8fd9256c635cce2289b648a01d54202c' 'fd404c0f0787fbf99b8b3270f639128c')
+license=('custom')
+depends=('libxrandr')
+source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('5f14cc3019320860c85bb07c60a76bd7'
+         '0941ad3e96597ef75c6310f43a0342a0')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
-  install -D -m644 $startdir/evilwm.desktop \
-      $startdir/pkg/etc/X11/sessions/evilwm.desktop
-  install -D -m644 README $startdir/pkg/usr/share/licenses/$pkgname/README
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
+  install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD
index 1b4bf6abe..f8398bbe2 100644
--- a/extra/fam/PKGBUILD
+++ b/extra/fam/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 124073 2011-05-16 14:51:09Z andrea $
+# $Id: PKGBUILD 136014 2011-08-21 14:26:17Z eric $
 # Maintainer:
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fam
 pkgver=2.7.0
-pkgrel=15
+pkgrel=16
 pkgdesc="File Alteration Monitor"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 depends=('rpcbind' 'gcc-libs' 'bash')
 url="http://oss.sgi.com/projects/fam/"
 backup=('etc/fam/fam.conf')
-options=('!makeflags') # Don't !libtool
+options=('!makeflags' 'libtool')
 source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz
 	fam-2.7.0-dnotify.patch
 	fam-2.7.0-largefiles.patch
@@ -24,7 +24,7 @@ md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39'
          '47b41e0b0498793af004696a096d7da1'
          '2638b8ffacb9f03b6e438e08ea7b290a'
          'fc0cabc0ac4f819680401eb3090c29c9'
-         '92a37f9eb6ad0e60ded9c70e9ad93a88')
+         'ec50139679bc31508a843cafa47cd298')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/extra/fam/fam b/extra/fam/fam
index 5fc54a6df..69a049730 100755
--- a/extra/fam/fam
+++ b/extra/fam/fam
@@ -6,13 +6,10 @@
 PID=`pidof -o %PPID /usr/sbin/famd`
 case "$1" in
   start)
-    #Check for running portmap, start when not running
-    ck_daemon rpcbind && /etc/rc.d/rpcbind start
     stat_busy "Starting File Alteration Monitor"
     if ck_daemon rpcbind; then
-      stat_fail
-      echo "ERROR: rpcbind is not running"
-      exit 1
+      echo "ERROR: Refusing to start fam without rpcbind running!" >&2
+      stat_die
     fi
     if [ -z "$PID" ]; then
        /usr/sbin/famd -T 0 -c /etc/fam/fam.conf
diff --git a/extra/fbset/PKGBUILD b/extra/fbset/PKGBUILD
index 0db694c92..89cd0b7ae 100644
--- a/extra/fbset/PKGBUILD
+++ b/extra/fbset/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 49864 2009-08-16 19:15:47Z jgc $
+# $Id: PKGBUILD 135993 2011-08-21 06:02:11Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Paul Mattal <pjmattal@elys.com>
 
 pkgname=fbset
 pkgver=2.1
-pkgrel=3
-pkgdesc="Framebuffer setup util"
-arch=(i686 x86_64)
+pkgrel=4
+pkgdesc="Framebuffer setup utility"
+arch=('i686' 'x86_64')
 url="http://users.telenet.be/geertu/Linux/fbdev/"
 license=('GPL')
 depends=('glibc')
-backup=(etc/fb.modes)
-options=(!makeflags)
+backup=('etc/fb.modes')
+options=('!makeflags')
 source=(http://users.telenet.be/geertu/Linux/fbdev/fbset-${pkgver}.tar.gz)
 md5sums=('e547cfcbb8c1a4f2a6b8ba4acb8b7164')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make || return 1
-  install -m755 -d "${pkgdir}/etc"
-  install -m755 -d "${pkgdir}/usr/sbin"
-  install -m755 -d "${pkgdir}/usr/share/man/man5"
-  install -m755 -d "${pkgdir}/usr/share/man/man8"
-  install -m755 fbset "${pkgdir}/usr/sbin/" || return 1
-  install -m644 fb.modes.5 "${pkgdir}/usr/share/man/man5/" || return 1
-  install -m644 fbset.8 "${pkgdir}/usr/share/man/man8/" || return 1
-  install -m644 etc/fb.modes.ATI "${pkgdir}/etc/fb.modes" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -D -m755 fbset "${pkgdir}/usr/sbin/fbset"
+  install -D -m644 fb.modes.5 "${pkgdir}/usr/share/man/man5/fb.modes.5"
+  install -D -m644 fbset.8 "${pkgdir}/usr/share/man/man8/fbset.8"
+  install -D -m644 etc/fb.modes.ATI "${pkgdir}/etc/fb.modes"
 }
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index bb7d3346d..5934a5292 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 126713 2011-06-06 20:27:56Z eric $
+# $Id: PKGBUILD 136047 2011-08-22 03:29:54Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fetchmail
-pkgver=6.3.20
+pkgver=6.3.21
 pkgrel=1
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64')
@@ -15,10 +15,10 @@ options=('!makeflags')
 install=fetchmail.install
 source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
         fetchmail.rc fetchmail.conf)
-md5sums=('9176a9005a816946f766774bc4cbc642'
+md5sums=('0ad8eac47e85bd0ae63870daa09992af'
          '89fdde15bf81b3a5c065949322b5d138'
          '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('797b5b0050763ad111c244aba606b2fcb4dfdaad'
+sha1sums=('e32a0d40ec133d651782543ecd7bc9bbee52dff7'
           '910ec21ad0a619db67e4665189dc46d2a0634ea5'
           '30401729386d6f774c6c36ab8530842166de54a8')
 
diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD
index 277ddcbde..84698b9c1 100644
--- a/extra/gnome-alsamixer/PKGBUILD
+++ b/extra/gnome-alsamixer/PKGBUILD
@@ -1,24 +1,33 @@
-# $Id: PKGBUILD 49919 2009-08-16 21:30:55Z jgc $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
+# $Id: PKGBUILD 136003 2011-08-21 09:18:58Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gnome-alsamixer
 pkgver=0.9.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Gnome ALSA mixer"
 arch=('i686' 'x86_64')
-url="http://www.paw.za.org"
+url="https://launchpad.net/gnome-alsamixer"
 license=('GPL')
-depends=('libgnomeui>=2.24.1')
+depends=('libgnomeui')
 source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-        gnome-alsamixer-0.9.6-gtk24.patch)
+        gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
 md5sums=('387623cfeb079d78325eed2d6bc94251'
-         '82b95a0df43429da5098b4da883f6bd0')
+         '82b95a0df43429da5098b4da883f6bd0'
+         'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+          'b4e3b871676025600170ba54f59db4977b853c08'
+          '31639f7932d088ca76a18c79839682be811f23d0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+    "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
 }
diff --git a/extra/gnome-alsamixer/gnome-alsamixer.desktop b/extra/gnome-alsamixer/gnome-alsamixer.desktop
new file mode 100644
index 000000000..861a22849
--- /dev/null
+++ b/extra/gnome-alsamixer/gnome-alsamixer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=GNOME ALSA Mixer
+Comment=ALSA sound mixer for GNOME
+Comment[es]=Mezclador de sonido ALSA para GNOME
+Comment[fr]=Mélangeur de son ALSA pour GNOME
+Exec=gnome-alsamixer
+Icon=/usr/share/pixmaps/gnome-alsamixer/gnome-alsamixer-icon.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
+StartupNotify=true
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index f501d08f5..c16f3285e 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135768 2011-08-18 15:03:47Z andyrtr $
+# $Id: PKGBUILD 135996 2011-08-21 08:10:46Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
@@ -11,20 +11,18 @@ url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
-	align.patch)
-md5sums=('0677a66667f48810ff8df8335a9a9f9b'
-         'bce979498addb45d0fa8d6951f93fab3')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix AES-NI for i686
-  patch -Np1 -i ${srcdir}/align.patch
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--without-p11-kit
+	--without-p11-kit \
+	--disable-valgrind-tests # breaks make check. errors have been reported upstream
   make
 }
 
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index d26892a8a..a8f50513e 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,45 +1,44 @@
-# $Id: PKGBUILD 116032 2011-03-22 16:23:53Z andrea $
+# $Id: PKGBUILD 136033 2011-08-21 23:13:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: Giacomo Rizzo <alt@free-os.it>
 
 pkgname=gpsd
-pkgver=2.96
-pkgrel=1
+pkgver=3.0
+pkgrel=3
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://gpsd.berlios.de"
 license=('BSD')
-depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils')
+depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
 optdepends=('php: generate a PHP status page for your GPS'
             'php-gd: image support for the PHP status page')
-makedepends=('docbook-xsl')
+makedepends=('scons' 'docbook-xsl' 'chrpath')
 backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
-options=('!libtool')
+options=('!libtool' '!buildflags')
 install="${pkgname}.install"
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gpsd' 'LICENSE')
-md5sums=('26a7a04d4298bc3a3a5d89fef4582b64'
-         'f929322fc4670543fcb36dafc7bb9e03'
-         'd217a23f408e91c94359447735bc1800')
+        'gpsd' 'gpsd.conf.d')
+md5sums=('c63d41a26868e9bdd48d9e311a9cc42c'
+         '1f3402f8e33a7032b9ae6dfd077234f7'
+         '3e963df3f9f7ef3572ecc648ae829315')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # install python to the same DESTDIR given make
-  sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} --root=$(DESTDIR)|' Makefile.am Makefile.in
-
   # fix python 2.7 path
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper}
-  sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \
-    gpsfake gpsprof xgps xgpsspeed gps/gps.py
-  
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --disable-libQgpsmm \
-    --disable-static
-  make
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find . -name '*.py')
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps gpscat gpsfake \
+    gpsprof xgps xgpsspeed
+
+  scons prefix=/usr \
+    systemd=yes \
+    libQgpsmm=no \
+    PYTHONPATH=/usr/bin/python2
+  scons build
 }
 
 package() {
@@ -48,30 +47,29 @@ package() {
   # Fix man pages path (FS#21715)
   sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
 
-  make DESTDIR="${pkgdir}" install
+  export DESTDIR="${pkgdir}"
+  scons install
 
-  # Our own udev-install since the Makefile uses absolute paths
-  # Original file names are [mostly] unmodified: useful to match process name in case of error
-  # Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/
-  sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd.pid"|' packaging/deb/etc_default_gpsd
-  sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd
-  install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd"
+  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
 
-  sed -i 's|Id: gpsd.rules|Id: 99-gpsd-usb.rules|' gpsd.rules
   install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules"
 
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug.wrapper
-  install -D -m755 gpsd.hotplug.wrapper "${pkgdir}/lib/udev/gpsd.hotplug.wrapper"
-
-  # Patch a path bug. Check to see if fixed in ensuing releases
-  sed -i 's|gpsdcmd = "gpsd %s|gpsdcmd = "/usr/sbin/gpsd %s|' gpsd.hotplug
+  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
   install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug"
 
-  install -D -m644 packaging/X11/xgps.desktop ${pkgdir}/usr/share/applications/xgps.desktop
-  install -D -m644 packaging/X11/xgpsspeed.desktop ${pkgdir}/usr/share/applications/xgpsspeed.desktop
-  install -D -m644 packaging/X11/gpsd-logo.png ${pkgdir}/usr/share/gpsd/gpsd-logo.png
+  # GPSD needs RPATH
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
+
+  install -D -m644 packaging/X11/xgps.desktop \
+    "${pkgdir}/usr/share/applications/xgps.desktop"
+  install -D -m644 packaging/X11/xgpsspeed.desktop \
+    "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
+  install -D -m644 packaging/X11/gpsd-logo.png \
+    "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
 
   install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
 
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/gpsd/gpsd b/extra/gpsd/gpsd
index b0f22c735..b510a7542 100755
--- a/extra/gpsd/gpsd
+++ b/extra/gpsd/gpsd
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 . /etc/rc.conf
 . /etc/rc.d/functions
@@ -6,29 +6,30 @@
 
 NAME=gpsd
 DAEMON=/usr/sbin/$NAME
-PID=$(pidof -o %PPID /usr/sbin/gpsd)
+PIDFILE=/var/run/$NAME/$NAME.pid
+PID=$(cat $PIDFILE 2>/dev/null)
 
 case "$1" in
    start)
-	stat_busy "Starting gpsd"
-	[ ! -d /var/run/gpsd ] && install -d /var/run/gpsd
-	[ -z "$PID" ] && "$DAEMON" ${GPSD_OPTIONS} -F ${GPSD_SOCKET} ${DEVICES}
+	stat_busy "Starting $NAME"
+	[ ! -d /var/run/$NAME ] && install -d /var/run/$NAME
+	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES}
 	if [ $? -gt 0 ]; then
 		stat_fail
 	else
-		add_daemon gpsd
+		add_daemon $NAME
 		stat_done
 	fi
    ;;
    stop)
-	stat_busy "Stopping gpsd"
+	stat_busy "Stopping $NAME"
 	[ ! -z "$PID" ]  && kill $PID &> /dev/null
 	if [ $? -gt 0 ]; then
 		stat_fail
 	else
-	rm -f /var/run/$PID.pid &>/dev/null
-	rm_daemon gpsd
-	stat_done
+	    rm -f $PIDFILE &>/dev/null
+	    rm_daemon $NAME
+	    stat_done
 	fi
    ;;
 
diff --git a/extra/gpsd/gpsd.conf.d b/extra/gpsd/gpsd.conf.d
new file mode 100644
index 000000000..9fef72cb9
--- /dev/null
+++ b/extra/gpsd/gpsd.conf.d
@@ -0,0 +1,5 @@
+# Default settings for gpsd.
+START_DAEMON="true"
+GPSD_OPTIONS=""
+DEVICES=""
+USBAUTO="true"
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
index 7fa7f8e4f..5ffc377f3 100644
--- a/extra/gtkpod/PKGBUILD
+++ b/extra/gtkpod/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 96753 2010-10-24 16:27:54Z ibiru $
+# $Id: PKGBUILD 136044 2011-08-22 03:18:52Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A platform independent GUI for Apple's iPod using GTK2"
 arch=('i686' 'x86_64')
-license=('GPL')
 url="http://gtkpod.sourceforge.net"
-install=gtkpod.install
-depends=('libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 'hicolor-icon-theme')
-optdepends=('libmp4v2: MP4/h264 support')
+license=('GPL')
+depends=('awk' 'libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 'hicolor-icon-theme')
 makedepends=('intltool')
+optdepends=('libmp4v2: MP4/h264 support'
+            'vorbis-tools: OGG support'
+            'id3v2: mp3 conversion support')
+install=gtkpod.install
 source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz)
 md5sums=('cadd402dcd1cfbedda0357bf24965a7c')
 
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index a1f72cb01..5bdceb7c2 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 136011 2011-08-21 12:39:53Z eric $
+# Maintainer: 
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64')
 url="http://www.net-snmp.org/"
 license=('custom')
 depends=('openssl' 'libnl')
-makedepends=('setuptools')
+makedepends=('python2-distribute')
 optdepends=('perl-term-readkey: for snmpcheck application' 
             'perl-tk: for snmpcheck and tkmib applications'
             'python2: for the python modules')
 provides=('ucd-snmp')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'snmpd.rc')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        snmpd.confd snmpd.rc)
 md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
-         '9f0d13676ba1fae1eb7eb178edd85b43')
+         '37bc5db8707004fe284c202437c6aa7d'
+         'edab44a12f76045e41340d433a79dcec')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  ./configure --prefix=/usr \
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     --enable-ucd-snmp-compatibility \
@@ -35,14 +36,14 @@ build() {
     --with-sys-location="Unknown" \
     --with-logfile="/var/log/snmpd.log" \
     --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp" \
-    PYTHONPROG=/usr/bin/python2
-  make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath -Wl,/usr/lib/perl5/core_perl/CORE"
+    --with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
   install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/net-snmp/snmpd.confd b/extra/net-snmp/snmpd.confd
new file mode 100644
index 000000000..926b09bbf
--- /dev/null
+++ b/extra/net-snmp/snmpd.confd
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to snmpd
+#
+SNMPD_ARGS=""
+
diff --git a/extra/net-snmp/snmpd.rc b/extra/net-snmp/snmpd.rc
index 9f1b83f64..b00c09f4f 100644
--- a/extra/net-snmp/snmpd.rc
+++ b/extra/net-snmp/snmpd.rc
@@ -2,12 +2,13 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/snmpd
 
 PID=`pidof -o %PPID /usr/sbin/snmpd`
 case "$1" in
   start)
     stat_busy "Starting Net-SNMP"
-    [ -z "$PID" ] && /usr/sbin/snmpd
+    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index 1ed7ff194..414f8dba1 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $
+# $Id: PKGBUILD 135987 2011-08-21 05:01:03Z eric $
 # Maintainer: juergen <juergen@hoetzel.info>
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scummvm.org/"
-depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth')
+depends=('libmad' 'sdl' 'fluidsynth')
+makedepends=('libmpeg2')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
   ./configure --backend=sdl --disable-debug \
-    --with-mpeg2-prefix=/usr \
+    --enable-mpeg2 --with-mpeg2-prefix=/usr \
     --with-flac-prefix=/usr \
     --with-fluidsynth-prefix=/usr \
     --prefix=/usr
@@ -24,15 +25,14 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -Dm755 scummvm ${pkgdir}/usr/bin/scummvm
-  install -Dm644 dists/scummvm.6 ${pkgdir}/usr/share/man/man6/scummvm.6
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  install -Dm755 scummvm "${pkgdir}"/usr/bin/scummvm
+  install -Dm644 dists/scummvm.6 "${pkgdir}"/usr/share/man/man6/scummvm.6
   # fixes FS#9118 
   install -Dm644 dists/${pkgname}.desktop \
-	${pkgdir}/usr/share/applications/${pkgname}.desktop
+	"${pkgdir}"/usr/share/applications/${pkgname}.desktop
   install -Dm644  icons/scummvm.xpm \
-	${pkgdir}/usr/share/pixmaps/scummvm.xpm
-
-  install -Dm644 gui/themes/scummmodern.zip ${pkgdir}/usr/share/scummvm/scummmodern.zip
+	"${pkgdir}"/usr/share/pixmaps/scummvm.xpm
 
+  install -Dm644 gui/themes/scummmodern.zip "${pkgdir}"/usr/share/scummvm/scummmodern.zip
 }
diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD
index 5a016aa63..e27054573 100644
--- a/extra/soundtouch/PKGBUILD
+++ b/extra/soundtouch/PKGBUILD
@@ -1,10 +1,8 @@
-# $Id: PKGBUILD 67310 2010-02-06 08:17:47Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Raymano <re1212122000@yahoo.com>
+# $Id: PKGBUILD 136036 2011-08-21 23:32:17Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=soundtouch
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="An audio processing library"
 arch=('i686' 'x86_64')
@@ -15,22 +13,25 @@ options=('!libtool')
 source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
         soundtouch-1.4.0-mmx-sse-compile-fix.patch
         soundtouch-1.4.0-x86_64-asm-broken.patch)
-md5sums=('5456481d8707d2a2c27466ea64a099cb' 'f0204136c90ce4f6d4761073151eb4dc'\
+md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd'
+         '108cd080b4b0ebe8ed1f950ff1315e7a'
          '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' '39815091c4cb1817f8a56b8fb29fa684984514d1'\
-         '95282cca856b3b8645fadb530ce5eb892074f193')
+sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7'
+          '7a245aacadcb3003e73c1c202c8de0ecc09283ac'
+          '95282cca856b3b8645fadb530ce5eb892074f193')
 
 build() {
   cd "${srcdir}/${pkgname}"
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" || return 1
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" || return 1
-  if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --enable-shared --with-pic || return 1
-  else
-    ./configure --prefix=/usr --enable-shared || return 1
-  fi
-  make || return 1
-  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install || return 1
-  # Upstream changed pkgconfig filename
-  ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || return 1
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
+
+  [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
+  ./bootstrap
+  ./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install
 }
diff --git a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
index 4369b178b..562e38e97 100644
--- a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
+++ b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
@@ -1,14 +1,14 @@
-diff -up soundtouch/source/SoundTouch/Makefile.in~ soundtouch/source/SoundTouch/Makefile.in
---- soundtouch/source/SoundTouch/Makefile.in~	2009-02-15 11:21:36.000000000 +0100
-+++ soundtouch/source/SoundTouch/Makefile.in	2009-02-15 11:23:30.000000000 +0100
-@@ -209,7 +209,9 @@ libSoundTouch_la_SOURCES = AAFilter.cpp 
- # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can
- # fix this script to automatically check for CPU architecture, please submit a patch 
- # to me.
--AM_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include
-+AM_CXXFLAGS = -fcheck-new -I../../include
-+mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
-+sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include
- all: all-am
- 
- .SUFFIXES:
+diff -up soundtouch/source/SoundTouch/Makefile.am~ soundtouch/source/SoundTouch/Makefile.am
+--- soundtouch/source/SoundTouch/Makefile.am~	2009-02-15 11:21:36.000000000 +0100
++++ soundtouch/source/SoundTouch/Makefile.am	2009-02-15 11:23:30.000000000 +0100
+@@ -36,7 +36,9 @@
+ # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can

+ # fix this script to automatically check for CPU architecture, please submit a patch 

+ # to me.

+-AM_CXXFLAGS=-O3 -msse2 -fcheck-new -I../../include

++AM_CXXFLAGS = -fcheck-new -I../../include

++mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include

++sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include

+ 

+ 

+ # other linking flags to add

diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index 0e7b97a7c..3a2dff799 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 131635 2011-07-13 01:26:21Z kevin $
+# $Id: PKGBUILD 135984 2011-08-21 04:56:14Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=squid
 pkgver=3.1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
 url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl')
+depends=('openssl' 'pam' 'cron' 'perl' 'libtool')
 makedepends=('libcap>=2.16')
 license=('GPL')
 backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
 install=squid.install
 source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2
         squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch)
-md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' 'd213b0cc1db72b749bb8c88716fdab39'
-         '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777'
-         '5e17df989e2a74e869790c066f61225b' '8e59089e4a8556fc18df51979f1cfbff')
+md5sums=('8f82a451b04c3bf3c29202c548d2f2dd'
+         'd213b0cc1db72b749bb8c88716fdab39'
+         '2383772ef94efddc7b920628bc7ac5b0'
+         '270977cdd9b47ef44c0c427ab9034777'
+         '5e17df989e2a74e869790c066f61225b'
+         '8e59089e4a8556fc18df51979f1cfbff')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
   # gcc 4.6 doesn't support -fhuge-objects.
   sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
   # fix compile errors with gcc 4.6
   # http://bugs.squid-cache.org/show_bug.cgi?id=3178
-  #patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch
+  #patch -Np1 -i "${srcdir}"/squid-3.1.11-unused.patch
 
   # fix cache_dir, cache_dir size, and effective group.
   sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
@@ -55,12 +58,12 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m755 ${srcdir}/squid ${pkgdir}/etc/rc.d/squid
-  install -D -m755 ${srcdir}/squid.cron ${pkgdir}/etc/cron.weekly/squid
-  install -D -m644 ${srcdir}/squid.conf.d ${pkgdir}/etc/conf.d/squid
-  install -D -m644 ${srcdir}/squid.pam ${pkgdir}/etc/pam.d/squid
+  install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid
+  install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid
+  install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid
+  install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid
 }
 # vim: ts=2 sw=2 et ft=sh