Wed Feb 22 23:15:20 UTC 2012

14 files changed, 223 insertions, 65 deletions

diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 4b3221af6..02876b468 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 148680 2012-02-05 11:46:41Z ibiru $
+# $Id: PKGBUILD 150782 2012-02-22 03:38:27Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
-pkgver=0.6.30
-pkgrel=7
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
+pkgver=0.6.31
+pkgrel=1
+pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
+arch=('i686' 'x86_64')
+options=('!libtool' '!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
@@ -21,43 +22,44 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
              'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
+backup=('etc/avahi/avahi-daemon.conf'
+        'etc/avahi/services/ssh.service'
+        'etc/avahi/services/sftp-ssh.service')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
         'gnome-nettool.png'
         'rc.d.patch')
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
           'cf56387c88aed246b9f435efc182ef44de4d52f3'
           '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
 
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+replaces=('howl' 'mdnsresponder')
+
+install=install
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i "../rc.d.patch"
+	patch -p1 -i ../rc.d.patch
 
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
 	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
-		./configure \
+	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
 		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-xmltoman \
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
 		--with-distro=archlinux \
 		--with-avahi-priv-access-group=network \
 		--with-autoipd-user=avahi \
 		--with-autoipd-group=avahi \
-		--with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
+		--with-systemdsystemunitdir=/lib/systemd/system \
 
 	make
 }
@@ -65,10 +67,11 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
+	install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
 
 	cd "${pkgdir}"
 	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+
 	# howl and mdnsresponder compatability
 	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
 	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index d73eac6ee..f6a465e8a 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150599 2012-02-18 20:30:20Z ibiru $
+# $Id: PKGBUILD 150770 2012-02-21 20:45:23Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.6.5
+pkgver=2.6.6
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
 makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fe4db888ccdcdab0c3366cb5a61413b8bf4dc4b96b146f39e35380d9276334e0')
+sha256sums=('efdff4cebaaa9b8dfe99832eb16f54ce60a7e02c5d1f3964f15d4ae0ddf6b3ee')
 
 build() {
   # get rid of that .wapi errors in fakeroot
@@ -22,7 +22,8 @@ build() {
 
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr --enable-smime \
+      --disable-static
   make
 }
 
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 024b23834..655416492 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147901 2012-01-28 10:36:40Z andrea $
+# $Id: PKGBUILD 150748 2012-02-21 19:37:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -23,7 +23,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -63,12 +63,16 @@ package_kdesdk-cervisia() {
 
 package_kdesdk-dolphin-plugins() {
 	pkgdesc='Extra Dolphin plugins'
-	depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
+	depends=('kdebase-dolphin')
+    optdepends=('bzr: bazaar support'
+                'git: git support'
+                'mercurial: hg support'
+                'subversion: svn support')
 	install='kdesdk.install'
-	cd $srcdir/build/dolphin-plugins/git
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dolphin-plugins/svn
-	make DESTDIR=$pkgdir install
+    for i in bazaar git hg svn; do
+        cd $srcdir/build/dolphin-plugins/$i
+    	make DESTDIR=$pkgdir install
+    done
 }
 
 package_kdesdk-kapptemplate() {
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index bf58c75b4..21d85faed 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 146513 2012-01-12 08:08:19Z andrea $
+# $Id: PKGBUILD 150723 2012-02-21 07:30:13Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.20
+pkgver=5.5.21
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('375794ebf84b4c7b63f1676bc7416cd0'
+md5sums=('86d6bd335054a0aed1756ed60574c16d'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 9085d5e61..d44412fc0 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132063 2011-07-19 17:35:27Z stephane $
+# $Id: PKGBUILD 150735 2012-02-21 15:12:29Z stephane $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgbase=nasm
 pkgname=('nasm' 'nasm-doc')
 pkgver=2.09.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nasm.us"
 license=('BSD')
diff --git a/extra/netkit-bsd-finger/PKGBUILD b/extra/netkit-bsd-finger/PKGBUILD
index 39ee4889b..286a6f82a 100644
--- a/extra/netkit-bsd-finger/PKGBUILD
+++ b/extra/netkit-bsd-finger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143921 2011-11-30 20:53:59Z andrea $
+# $Id: PKGBUILD 150721 2012-02-21 07:25:55Z andrea $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=netkit-bsd-finger
 pkgver=0.17
-pkgrel=6
+pkgrel=7
 pkgdesc="BSD-finger ported to Linux"
 arch=('i686' 'x86_64')
 url='ftp://ftp.uk.linux.org/pub/linux/Networking/netkit'
@@ -12,13 +12,19 @@ license=('BSD')
 depends=('glibc' 'xinetd')
 backup=('etc/xinetd.d/finger')
 source=("ftp://ftp.archlinux.org/other/${pkgname}/bsd-finger-${pkgver}.tar.gz"
-        'finger.xinetd' 'LICENSE')
+        'finger.xinetd' 'LICENSE'
+        'fix-manpage-typo.patch')
 md5sums=('52bf281aac8814bf56cdc92f7661ee75'
          'a8682004dc8dee356065162bde892b47'
-         '5fc568418a0379fc3a358ed1c2523b44')
+         '5fc568418a0379fc3a358ed1c2523b44'
+         '9c4ad79a8df81ade6d1938955f1debbd')
 
 build() {
    cd ${srcdir}/bsd-finger-${pkgver}
+
+   # FS#28232
+   patch -p1 -i "${srcdir}"/fix-manpage-typo.patch
+
    ./configure --prefix=/usr
    sed -i 's@include <sys/time.h>@include <time.h>@' finger/lprint.c
    sed -i 's@include <sys/time.h>@include <time.h>@' finger/sprint.c
diff --git a/extra/netkit-bsd-finger/fix-manpage-typo.patch b/extra/netkit-bsd-finger/fix-manpage-typo.patch
new file mode 100644
index 000000000..99915ce92
--- /dev/null
+++ b/extra/netkit-bsd-finger/fix-manpage-typo.patch
@@ -0,0 +1,11 @@
+--- bsd-finger-0.17/finger/finger.1~	2012-02-21 07:18:46.236600851 +0000
++++ bsd-finger-0.17/finger/finger.1	2012-02-21 07:19:26.979613738 +0000
+@@ -169,7 +169,7 @@
+ must be able to see the
+ .Pa .nofinger
+ file. This generally means that the home directory containing the file
+-must have the other-users-execute bit set (o+w). See
++must have the other-users-execute bit set (o+x). See
+ .Xr chmod 1 .
+ If you use this feature for privacy, please test it with ``finger
+ @localhost'' before relying on it, just in case.
diff --git a/extra/nss-mdns/PKGBUILD b/extra/nss-mdns/PKGBUILD
index eb7574a33..6747d103a 100644
--- a/extra/nss-mdns/PKGBUILD
+++ b/extra/nss-mdns/PKGBUILD
@@ -1,34 +1,30 @@
-# $Id: PKGBUILD 150570 2012-02-18 15:06:04Z pierre $
-# Maintainer:
+# $Id: PKGBUILD 150739 2012-02-21 17:19:59Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Travis Willard <travis@archlinux.org>
 
 pkgname=nss-mdns
 pkgver=0.10
-pkgrel=4
+pkgrel=5
 pkgdesc="glibc plugin providing host name resolution via mDNS"
 arch=('i686' 'x86_64')
 url="http://0pointer.de/lennart/projects/nss-mdns/"
 license=('LGPL')
 depends=('glibc')
-makedepends=('pkgconfig')
-backup=('etc/mdns.allow')
 install=nss-mdns.install
-source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'mdns.allow')
-md5sums=('03938f17646efbb50aa70ba5f99f51d7'
-         '904abb492fb1f56722826c0c3a997bf0')
+source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('03938f17646efbb50aa70ba5f99f51d7')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/ \
-    --disable-lynx \
-    --enable-avahi
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
   make
 }
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}"/mdns.allow "${pkgdir}"/etc/mdns.allow
 }
 
diff --git a/extra/nss-myhostname/PKGBUILD b/extra/nss-myhostname/PKGBUILD
new file mode 100644
index 000000000..35aa0cc37
--- /dev/null
+++ b/extra/nss-myhostname/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 150778 2012-02-21 23:58:05Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Mantas M. <grawity@gmail.com>
+pkgname="nss-myhostname"
+pkgver=0.3
+pkgrel=2
+pkgdesc="NSS plugin providing host name resolution for the locally configured system hostname"
+arch=(i686 x86_64)
+url="http://0pointer.de/lennart/projects/nss-myhostname/"
+license=('LGPL2.1')
+depends=('glibc')
+source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+install=nss-myhostname.install
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-lynx
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+md5sums=('d4ab9ac36c053ab8fb836db1cbd4a48f')
diff --git a/extra/nss-myhostname/nss-myhostname.install b/extra/nss-myhostname/nss-myhostname.install
new file mode 100644
index 000000000..30ae6844f
--- /dev/null
+++ b/extra/nss-myhostname/nss-myhostname.install
@@ -0,0 +1,6 @@
+post_install() {
+  cat << 'EOM'
+==> To enable resolution of the local hostname, append 'myhostname' to the hosts
+    line in /etc/nsswitch.conf.
+EOM
+}
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
index 3d247b376..7be10f581 100644
--- a/extra/ntrack/PKGBUILD
+++ b/extra/ntrack/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149014 2012-02-05 14:07:18Z andrea $
+# $Id: PKGBUILD 150729 2012-02-21 11:02:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=ntrack
 pkgver=16
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A network connectivity tracking library"
 arch=('i686' 'x86_64')
@@ -12,13 +12,16 @@ license=('LGPL')
 depends=('qt' 'libnl')
 makedepends=('python2')
 options=('!libtool' '!emptydirs')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz")
-md5sums=('21691dac43460a6791cba3decbc68242')
+source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
+        'libnl3.patch')
+md5sums=('21691dac43460a6791cba3decbc68242'
+         '0a1f6b7f9a01c323e81d6da95cad93cd')
 
 build() {
   cd "${srcdir}/${pkgname}-0${pkgver}"
+  patch -p1 -i "${srcdir}"/libnl3.patch
 
-  ./configure --prefix=/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var
   make
diff --git a/extra/ntrack/libnl3.patch b/extra/ntrack/libnl3.patch
new file mode 100644
index 000000000..879b52c8c
--- /dev/null
+++ b/extra/ntrack/libnl3.patch
@@ -0,0 +1,99 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib.
+
+Index: ntrack/glib/Makefile.am
+===================================================================
+--- ntrack.orig/glib/Makefile.am	2011-12-22 19:25:13.137470000 -0500
++++ ntrack/glib/Makefile.am	2011-12-22 20:07:10.243344976 -0500
+@@ -26,7 +26,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/
+ 
+ AM_LDFLAGS =
+Index: ntrack/glib/Makefile.in
+===================================================================
+--- ntrack.orig/glib/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/glib/Makefile.in	2011-12-22 20:07:14.871344769 -0500
+@@ -325,7 +325,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/
+ 
+ AM_LDFLAGS = 
+Index: ntrack/glib/test/Makefile.am
+===================================================================
+--- ntrack.orig/glib/test/Makefile.am	2011-12-22 19:25:13.137470000 -0500
++++ ntrack/glib/test/Makefile.am	2011-12-22 20:07:19.451344565 -0500
+@@ -27,7 +27,6 @@
+ 	../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-	-pedantic \
+ 	-Wall \
+ 	-Werror \
+ 	-I$(srcdir)/.. \
+Index: ntrack/glib/test/Makefile.in
+===================================================================
+--- ntrack.orig/glib/test/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/glib/test/Makefile.in	2011-12-22 20:07:23.903344367 -0500
+@@ -260,7 +260,6 @@
+ 	../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-	-pedantic \
+ 	-Wall \
+ 	-Werror \
+ 	-I$(srcdir)/.. \
+Index: ntrack/gobject/Makefile.am
+===================================================================
+--- ntrack.orig/gobject/Makefile.am	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/gobject/Makefile.am	2011-12-22 20:07:27.515344206 -0500
+@@ -26,7 +26,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/ \
+ 	-I$(srcdir)/../glib/
+ 
+Index: ntrack/gobject/Makefile.in
+===================================================================
+--- ntrack.orig/gobject/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/gobject/Makefile.in	2011-12-22 20:07:31.519344028 -0500
+@@ -347,7 +347,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/ \
+ 	-I$(srcdir)/../glib/
+ 
+Index: ntrack/modules/Makefile.am
+===================================================================
+--- ntrack.orig/modules/Makefile.am	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/modules/Makefile.am	2011-12-22 20:07:35.519343851 -0500
+@@ -26,7 +26,6 @@
+ 	-Wall \
+ 	-Werror \
+ 	-Wno-variadic-macros \
+-	-pedantic \
+ 	-I$(top_srcdir)/common/
+ 
+ AM_LDFLAGS =
+Index: ntrack/modules/Makefile.in
+===================================================================
+--- ntrack.orig/modules/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/modules/Makefile.in	2011-12-22 20:07:39.391343676 -0500
+@@ -352,7 +352,6 @@
+ 	-Wall \
+ 	-Werror \
+ 	-Wno-variadic-macros \
+-	-pedantic \
+ 	-I$(top_srcdir)/common/
+ 
+ AM_LDFLAGS = 
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index d8d9648cf..956214576 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 150143 2012-02-13 14:12:46Z ronald $
+# $Id: PKGBUILD 150772 2012-02-21 21:03:35Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org"
 license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 'fltk')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting'
-	    'umfpack: LU decomposition of some large sparse matrices'
-	    'fltk: alternative plotting')
+	    'umfpack: LU decomposition of some large sparse matrices')
 source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
 options=('!emptydirs')
 install=octave.install
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index f8551dc3f..c2f2e789e 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144860 2011-12-08 19:58:02Z juergen $
+# $Id: PKGBUILD 150733 2012-02-21 12:33:12Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.54
+pkgver=1.0.55
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -17,7 +17,7 @@ makedepends=('sbcl' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp")
-md5sums=('b7e956a71d603bb714f71c2f7ef350f6'
+md5sums=('128fb15c80e8e3f8d4024bd8e04635e0'
          '7ac0c1936547f4278198b8bf7725204d')
 
 build() {