Thu Apr 28 22:32:07 UTC 2011

15 files changed, 376 insertions, 60 deletions

diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index d7fde405c..63b14b164 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118450 2011-04-07 01:40:08Z dan $
+# $Id: PKGBUILD 120940 2011-04-27 15:41:06Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.4.4
+pkgver=1.7.5
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -13,7 +13,9 @@ makedepends=('python2')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
+            'perl-mime-tools: git send-email'
             'perl-net-smtp-ssl: git send-email TLS support'
+            'perl-authen-sasl: git send-email TLS support'
             'python2: various helper scripts'
             'subversion: git svn'
             'cvsps: git cvsimport')
@@ -69,11 +71,11 @@ package() {
   install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf
 }
 
-md5sums=('1313f71d62fa100b32fa313769a85f2a'
-         '5812f4fca4afc6c81e06f485111ec8ab'
+md5sums=('7f0bc26a6e87d251c9b09fa05a186ed3'
+         '94cf18c292f0db30046092ef306bf57c'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('5c3e738b01a4021ade56abebfdcce8825d2a50868e5c7befb65102f497387aa0'
-            'fa2ce1fd34a81dac1d8fca466dcd823ce1ed800ec5cb98d8bb2b0967deed19d0'
+sha256sums=('7d293c5c0e544188d9b9ea94036cc56b39fbe045ead6f8ced00ad02a8854142d'
+            'ced2319cbb48a4aa10bc5b1e1167a5de3b694eb9d256e68d978dbe86d997bee9'
             '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
             'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD
index 4c53891b7..dfc334918 100644
--- a/extra/k9copy/PKGBUILD
+++ b/extra/k9copy/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87453 2010-08-13 20:02:16Z giovanni $
+# $Id: PKGBUILD 120930 2011-04-27 13:07:03Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=k9copy
-pkgver=2.3.6
+pkgver=2.3.7
 pkgrel=1
 pkgdesc="A small utility which allows the copy of DVD under Linux"
 arch=('i686' 'x86_64')
@@ -12,14 +12,19 @@ license=('GPL')
 depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor')
 makedepends=('automoc4' 'cmake')
 install=k9copy.install
-source=(http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz)
-md5sums=('c062dcb141a0320afe9dae0d36f87965')
+source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz")
+md5sums=('bbfda2937f5027d31495df67dc29efa4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
   sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop
-  cmake -DCMAKE_INSTALL_PREFIX=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index e66042a65..a2d9302ee 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 63372 2010-01-17 12:51:49Z andrea $
+# $Id: PKGBUILD 120955 2011-04-27 19:24:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
-pkgver=0.9.7
-pkgrel=3
-pkgdesc="The vnc library"
+pkgver=0.9.8
+pkgrel=1
+pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
 arch=('i686' 'x86_64')
 url="http://libvncserver.sourceforge.net/"
 license=('GPL')
-depends=('libjpeg>=8' 'zlib')
+depends=('libjpeg' 'zlib')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz)
-md5sums=('14af5bdae461df4666c18e5f83c150c4')
+source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
+md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3')
 
 build() {
-  cd $srcdir/LibVNCServer-$pkgver
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}/LibVNCServer-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/LibVNCServer-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index d713582b6..346f19858 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118904 2011-04-09 11:33:06Z pierre $
+# $Id: PKGBUILD 120925 2011-04-27 13:05:01Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.28
-pkgrel=5
+pkgrel=6
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
 md5sums=('586eb535d31ac299652495b058dd87c4'
-         'eadffcda24d0d996032f8555ce9623c2'
+         '369f2eea6231342b514ca4777bf395c8'
          '913e2157fa78d990c32146f387d44c2b'
          '2803a9ee7f20409c69f1566d2d90720e')
 
diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d
index 32fdd0d08..345e889ae 100644
--- a/extra/lighttpd/lighttpd.rc.d
+++ b/extra/lighttpd/lighttpd.rc.d
@@ -44,7 +44,7 @@ test_config() {
 	fi
 
 	local piddir=$(dirname "$(get_pid_file)")
-	if [ ! -d "{$piddir}" ]; then
+	if [ ! -d "${piddir}" ]; then
 		install -d -m755 -o http -g http "${piddir}"
 	fi
 
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index fd54cc79f..d4fec3349 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112872 2011-03-07 12:41:38Z daniel $
+# $Id: PKGBUILD 120910 2011-04-27 09:25:47Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
-pkgver=2.10.1
-pkgrel=2
+pkgver=2.10.2
+pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
@@ -16,7 +16,7 @@ provides=('monodoc')
 conflicts=('monodoc')
 source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         mono.rc.d)
-md5sums=('ae8d1875447527599e68dd6c1d82bc11'
+md5sums=('bff057dc3e56b8841bbb1abe053858bb'
          '8315e46c6a6e9625502521fc0ad1a322')
 
 build() {
diff --git a/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi b/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi
new file mode 100644
index 000000000..54195d8b3
--- /dev/null
+++ b/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+  <device>
+   	<match key="volume.fstype" string="ntfs">
+        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
+        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
+        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
+        <merge key="volume.fstype" type="string">ntfs-3g</merge>
+       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
+        <append key="volume.mount.valid_options" type="strlist">atime</append>
+        <append key="volume.mount.valid_options" type="strlist">noatime</append>
+       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
+       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
+       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
+       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
+       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+       	<append key="volume.mount.valid_options" type="strlist">gid=</append>
+      	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
+       	<append key="volume.mount.valid_options" type="strlist">silent</append>
+       	<append key="volume.mount.valid_options" type="strlist">force</append>
+       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
+       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
+       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
+       	<append key="volume.mount.valid_options" type="strlist">debug</append>
+       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
+       	<append key="volume.mount.valid_options" type="strlist">sync</append>
+       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
+       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
+       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
+        <append key="volume.mount.valid_options" type="strlist">quiet</append>
+       	<append key="volume.mount.valid_options" type="strlist">remount</append>
+       	<append key="volume.mount.valid_options" type="strlist">exec</append>
+       	<append key="volume.mount.valid_options" type="strlist">recover</append>
+       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
+       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
+       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+	</match>
+  </device>
+</deviceinfo>
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
new file mode 100644
index 000000000..d9968d181
--- /dev/null
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 120898 2011-04-27 08:00:36Z ronald $
+# 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
+url="http://www.tuxera.com"
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('glibc' 'fuse')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://tuxera.com/opensource/${pkgbase}-${pkgver}.tgz
+        25-ntfs-config-write-policy.fdi)
+sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7'
+          '200029f2999a2c284fd30ae25734abf6459c3501')
+
+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
+  make
+}
+
+package_ntfs-3g() {
+  pkgdesc="Stable read and write NTFS driver"
+
+  for DIR in src libntfs-3g include; do
+    cd "${srcdir}/${pkgbase}-${pkgver}/${DIR}"
+    make DESTDIR="${pkgdir}" install
+  done
+
+  ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs"
+  install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor"
+  install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/"
+}
+
+package_ntfsprogs() {
+  pkgdesc="NTFS filesystem utilities"
+  depends=('util-linux' 'ntfs-3g')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/ntfsprogs"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index f7a6000e6..ce71a53e1 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,42 +1,38 @@
-# $Id: PKGBUILD 103149 2010-12-15 21:12:17Z ronald $
+# $Id: PKGBUILD 120945 2011-04-27 18:09:04Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.2.4
+pkgver=3.4.0
 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')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull')
 makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting'
 	    'umfpack: LU decomposition of some large sparse matrices')
-source=("ftp://ftp.octave.org/pub/octave/octave-$pkgver.tar.bz2"
-	'octave-3.2.0_as_needed.patch'  'octave-3.2.0_parallel_make.patch' 'imread.patch')
+source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2"
+	octave-3.4.0-gcc46.patch)
 options=('!emptydirs')
-install=octave.install
-md5sums=('608196657f4fa010420227b77333bb71'
-         '33c8886cd908ace40f8b60334df1c34f'
-         'd59d783a8d7e8d8306caed4b2b8671a4'
-         '72d33ba1a862244f970cf259923815d9')
+#install=octave.install
+sha1sums=('936a8fc962abd96e7568fb5909ec2a4d7997a1a8'
+          '791c905a80510783e5f9c556c12f02400887fbec')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # gentoo patches
-  patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch
-  patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch 
-  patch -Np0 -i ${srcdir}/imread.patch
-  
+  # fedora gcc46 patch
+  patch -Np1 -i ${srcdir}/octave-3.4.0-gcc46.patch
+
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS="-O -ffloat-store" \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static
+  --enable-shared --disable-static --disable-docs
 
   make
 }
@@ -45,5 +41,4 @@ package(){
   cd ${srcdir}/${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
-
 }
diff --git a/extra/octave/octave-3.4.0-gcc46.patch b/extra/octave/octave-3.4.0-gcc46.patch
new file mode 100644
index 000000000..c174204ac
--- /dev/null
+++ b/extra/octave/octave-3.4.0-gcc46.patch
@@ -0,0 +1,24 @@
+diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
+--- octave-3.4.0/liboctave/oct-alloc.h.gcc46	2011-02-08 03:00:51.000000000 -0700
++++ octave-3.4.0/liboctave/oct-alloc.h	2011-02-08 09:41:23.984081687 -0700
+@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
+ #if !defined (octave_oct_alloc_h)
+ #define octave_oct_alloc_h 1
+ 
++#include <cstddef>
++
+ class
+ OCTAVE_API
+ octave_allocator
+diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
+--- octave-3.4.0/src/pr-output.cc.gcc46	2011-02-08 03:00:52.000000000 -0700
++++ octave-3.4.0/src/pr-output.cc	2011-02-08 09:55:16.149662744 -0700
+@@ -3024,7 +3024,7 @@ abs (T x)
+ }
+ 
+ #define INSTANTIATE_ABS(T) \
+-  template /* static */ inline T abs (T)
++  template /* static */ T abs (T)
+ 
+ INSTANTIATE_ABS(signed char);
+ INSTANTIATE_ABS(short);
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD
new file mode 100644
index 000000000..ebd94380f
--- /dev/null
+++ b/extra/qhull/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 120895 2011-04-27 06:52:39Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Jason Taylor <jftaylor21@gmail.com>
+# Contributor: Darwin Bautista <djclue917@gmail.com>
+
+pkgname=qhull
+pkgver=2010.1
+pkgrel=1
+pkgdesc="A general dimension code for computing convex hulls and related structures"
+arch=('i686' 'x86_64')
+url="http://www.qhull.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('cmake')
+source=(http://www.qhull.org/download/$pkgname-$pkgver-src.tgz
+	qhull-2010.1-cmake-install.patch
+	qhull-2010.1-overflows.patch)
+options=('!libtool')
+sha1sums=('ed480912e03efdd767195c06c7e8c252c78112b1'
+          '0a7747eb13c2e07c25882c1f0f5c0dfb4ef1c8c0'
+          '21295d57af2f8cdfc775512fa44fe90f49d89c41')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # gentoo patches
+  patch -Np1 -i ${srcdir}/qhull-2010.1-cmake-install.patch
+  patch -Np1 -i ${srcdir}/qhull-2010.1-overflows.patch
+
+  [ -d build ] || mkdir build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DDOC_INSTALL_DIR=/usr/share/doc \
+	-DLIB_INSTALL_DIR=/usr/lib ..
+  make
+}
+
+package() { 
+  cd "$srcdir/$pkgname-$pkgver/build"
+
+  make DESTDIR=$pkgdir install
+
+  # install manpages
+  install -Dm644 $srcdir/$pkgname-$pkgver/html/rbox.man $pkgdir/usr/share/man/man1/rbox.1
+  install -Dm644 $srcdir/$pkgname-$pkgver/html/qhull.man $pkgdir/usr/share/man/man1/qhull.1
+
+  # Install license
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+}
diff --git a/extra/qhull/qhull-2010.1-cmake-install.patch b/extra/qhull/qhull-2010.1-cmake-install.patch
new file mode 100644
index 000000000..9e1914d13
--- /dev/null
+++ b/extra/qhull/qhull-2010.1-cmake-install.patch
@@ -0,0 +1,98 @@
+diff -Nur qhull-2010.1.orig/CMakeLists.txt qhull-2010.1/CMakeLists.txt
+--- qhull-2010.1.orig/CMakeLists.txt	2010-10-03 23:04:04.000000000 +0100
++++ qhull-2010.1/CMakeLists.txt	2010-10-03 23:26:54.000000000 +0100
+@@ -1,8 +1,44 @@
+ project(qhull)
+-cmake_minimum_required(VERSION 2.4)
+-if(COMMAND cmake_policy)
+-  cmake_policy(SET CMP0003 NEW)
+-endif(COMMAND cmake_policy)
++cmake_minimum_required(VERSION 2.6)
++
++
++set(QHULL_VERSION "2010.1")
++
++if(INCLUDE_INSTALL_DIR)
++else()
++set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include)
++endif()
++if(LIB_INSTALL_DIR)
++else()
++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
++endif()
++if(BIN_INSTALL_DIR)
++else()
++set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
++endif()
++if(DOC_INSTALL_DIR)
++else()
++set(DOC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/qhull)
++endif()
++
++message(STATUS)
++message(STATUS "========== qhull Build Information ==========")
++message(STATUS "Build Version: ${QHULL_VERSION}")
++message(STATUS "Install Prefix (CMAKE_INSTALL_PREFIX): ${CMAKE_INSTALL_PREFIX}")
++message(STATUS "Binary Directory (BIN_INSTALL_DIR): ${BIN_INSTALL_DIR}")
++message(STATUS "Library Directory (LIB_INSTALL_DIR): ${LIB_INSTALL_DIR}")
++message(STATUS "Include Directory (INCLUDE_INSTALL_DIR): ${INCLUDE_INSTALL_DIR}")
++message(STATUS "Documentation Directory (DOC_INSTALL_DIR): ${DOC_INSTALL_DIR}")
++message(STATUS)
++message(STATUS "To change any of these options, override them using -D{OPTION_NAME} on the commandline.")
++message(STATUS "To build and install qhull, run \"make\" and \"make install\"")
++message(STATUS)
++
+ 
+ add_subdirectory(src)
++option(WITH_STATIC_LIBS "Build with a static library" OFF)
++option(WITH_DOCS "Install HTML documentation" OFF)
+ 
++if (WITH_DOCS)
++install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR})
++endif (WITH_DOCS)
+diff -Nur qhull-2010.1.orig/src/CMakeLists.txt qhull-2010.1/src/CMakeLists.txt
+--- qhull-2010.1.orig/src/CMakeLists.txt	2010-10-03 23:04:04.000000000 +0100
++++ qhull-2010.1/src/CMakeLists.txt	2010-10-04 00:23:47.000000000 +0100
+@@ -23,8 +23,25 @@
+ 
+ file(GLOB qhull_hdr *.h)
+ 
+-add_library(qhull ${qhull_src})
++add_library(qhull SHARED ${qhull_src})
+ target_link_libraries(qhull m)
++if(UNIX)
++	if(APPLE)
++		set_target_properties(qhull PROPERTIES 
++			INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
++	else(APPLE)
++		set_target_properties(qhull PROPERTIES 
++			INSTALL_RPATH "${LIB_INSTALL_DIR}"
++			INSTALL_RPATH_USE_LINK_PATH TRUE
++			BUILD_WITH_INSTALL_RPATH FALSE)
++	endif(APPLE)
++endif(UNIX)
++
++if(WITH_STATIC_LIBS)
++  add_library(qhullstatic STATIC ${qhull_src})
++  set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
++  install(TARGETS qhullstatic ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
++endif(WITH_STATIC_LIBS)
+ 
+ set(qhullcmd_SOURCES  unix.c)
+ set(rbox_SOURCES  rbox.c)
+@@ -36,6 +53,7 @@
+ 
+ add_executable(qhullcmd ${qhullcmd_SOURCES})
+ target_link_libraries(qhullcmd qhull)
++set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
+ 
+ add_executable(rbox ${rbox_SOURCES})
+ target_link_libraries(rbox qhull)
+@@ -52,3 +70,7 @@
+ add_executable(qhalf ${qhalf_SOURCES})
+ target_link_libraries(qhalf qhull)
+ 
++install(TARGETS qhull qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
++	RUNTIME DESTINATION ${BIN_INSTALL_DIR} 
++	LIBRARY DESTINATION ${LIB_INSTALL_DIR})
++install(FILES ${qhull_hdr} DESTINATION ${INCLUDE_INSTALL_DIR}/qhull)
diff --git a/extra/qhull/qhull-2010.1-overflows.patch b/extra/qhull/qhull-2010.1-overflows.patch
new file mode 100644
index 000000000..df4aa3da1
--- /dev/null
+++ b/extra/qhull/qhull-2010.1-overflows.patch
@@ -0,0 +1,50 @@
+From 176c01851026125f574a8223ad49ec58b2b58ec0 Mon Sep 17 00:00:00 2001
+From: Johannes Obermayr <johannesobermayr@gmx.de>
+Date: Fri, 23 Jul 2010 20:02:19 +0200
+Subject: [PATCH] Fix some serious compiler warnings causing build breakage on openSUSE.
+
+---
+ src/global.c  |    2 +-
+ src/rboxlib.c |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/global.c b/src/global.c
+index 3c6141a..4c9f56c 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -614,7 +614,7 @@ void qh_initflags(char *command) {
+   if (command <= &qh qhull_command[0] || command > &qh qhull_command[0] + sizeof(qh qhull_command)) {
+     if (command != &qh qhull_command[0]) {
+       *qh qhull_command= '\0';
+-      strncat( qh qhull_command, command, sizeof( qh qhull_command));
++      strncat(qh qhull_command, command, sizeof(qh qhull_command)-strlen(qh qhull_command)-1);
+     }
+     while (*s && !isspace(*s))  /* skip program name */
+       s++;
+diff --git a/src/rboxlib.c b/src/rboxlib.c
+index 4f11d22..17d01ac 100644
+--- a/src/rboxlib.c
++++ b/src/rboxlib.c
+@@ -124,7 +124,7 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) {
+   }
+ 
+   *command= '\0';
+-  strncat(command, rbox_command, sizeof(command));
++  strncat(command, rbox_command, sizeof(command)-strlen(command)-1);
+ 
+   while (*s && !isspace(*s))  /* skip program name */
+     s++;
+@@ -346,8 +346,8 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) {
+     }
+   }else if (israndom) {
+     seed= (int)time(&timedata);
+-    sprintf(seedbuf, " t%d", seed);  /* appends an extra t, not worth removing */
+-    strncat(command, seedbuf, sizeof(command));
++    printf(seedbuf, " t%d", seed);  /* appends an extra t, not worth removing */
++    strncat(command, seedbuf, sizeof(command)-strlen(command)-1);
+     t= strstr(command, " t ");
+     if (t)
+       strcpy(t+1, t+3); /* remove " t " */
+-- 
+1.6.1
+
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index 809e0ed05..c94f86115 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 108735 2011-02-02 18:31:26Z giovanni $
+# $Id: PKGBUILD 120950 2011-04-27 19:00:34Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=xchm
-pkgver=1.18
+pkgver=1.19
 pkgrel=1
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=xchm.install
 source=(http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz
         xchm.desktop
         xchm.xml)
-md5sums=('07d7a910b3216301a002be5630c71866'
+md5sums=('c9d65971801e044d51476f57e91909fc'
          '31fb9692b9ee9f2a205f58b9ff4bc4fe'
          '4102b0a393f5c60236143cc034664dd0')
 
@@ -21,12 +21,12 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop" || return 1
-  install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml" || return 1
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
+  install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml"
 }
diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD
index e78ba6aa7..85730ab32 100644
--- a/extra/xsp/PKGBUILD
+++ b/extra/xsp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 111514 2011-02-27 11:35:42Z daniel $
+# $Id: PKGBUILD 120915 2011-04-27 09:28:00Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=xsp
-pkgver=2.10
+pkgver=2.10.2
 pkgrel=1
 pkgdesc="A simple webserver based on mono - provides ASP.NET support"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.go-mono.com"
-depends=('mono>=2.10.1' 'sqlite3')
+depends=('mono>=2.10.2' 'sqlite3')
 options=(!makeflags)
 install=${pkgname}.install
 source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
         ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp)
-md5sums=('aec9369a00a9728801ea2587a1a8fd9c'
+md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
          '9575bd7d6f64d51ba05bdd6370665858'
          '35d921df0fefc30f47a438c95d420efc'
          'c917c07f68b945691506c29750db482f')