14 files changed, 61 insertions, 69 deletions
diff --git a/extra/acpi/PKGBUILD b/extra/acpi/PKGBUILD
index 10d25d391..f967c9530 100644
--- a/extra/acpi/PKGBUILD
+++ b/extra/acpi/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 107523 2011-01-26 15:33:37Z thomas $
+# $Id: PKGBUILD 148028 2012-01-30 03:41:59Z dan $
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Maintainer: Thayer Williams <thayer@archlinux.org>
 
 pkgname=acpi
-pkgver=1.5
+pkgver=1.6
 pkgrel=1
 pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings"
 arch=('i686' 'x86_64')
@@ -11,7 +10,7 @@ url="http://sourceforge.net/projects/acpiclient"
 depends=('glibc')
 source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz)
 license=('GPL2')
-sha256sums=('57ff91cb5bef9e6d158c5b231a553a3a77c9ccfd0e4fad42958d1e61241060dd')
+sha256sums=('ed61d20400c4fd3965dde9b49ab3ac74da02f8eca1a55454f7a1ac3fa1fd5c31')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 96a55a2f9..06738f0f8 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147938 2012-01-28 11:06:05Z andrea $
+# $Id: PKGBUILD 147965 2012-01-29 09:32:13Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 474dae577..da2ad916d 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 146869 2012-01-19 01:23:02Z dan $
+# $Id: PKGBUILD 148010 2012-01-29 20:12:07Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.8.4
+pkgver=1.7.9
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -80,7 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('add7b05f26216181d1b148dde298432132552b0f'
-          '4372c423a0d2f7df33b5b39727a81f0a7b40669d'
+sha1sums=('ed51ef5ef250daaa6e98515cf2641820cd268d4c'
+          '1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD
index 0ec9479fc..970b2ce93 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -3,7 +3,7 @@
 # Additional contributors Senjin, Xavier, dundee
 
 pkgname=glpk
-pkgver=4.44
+pkgver=4.47
 pkgrel=1
 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('glibc')
 options=('!libtool')
 source=("http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f2ac7013bc0420d730d052e7ba24bdb1')
+sha1sums=('35e16d3167389b6bc75eb51b4b48590db59f789c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 1207d38a3..5b2f3b3a0 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122810 2011-05-06 10:03:29Z ronald $
+# $Id: PKGBUILD 147985 2012-01-29 11:40:13Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
-pkgver=4.4.3
+pkgver=4.4.4
 pkgrel=1
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64') 
@@ -14,14 +14,17 @@ depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
 install=gnuplot.install 
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('a4d315b9288739e3cbaa04d8ddda7861b4009bd4')
+sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # fix default source location; use the GDFONTPATH variable to modify at runtime 
   sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
-  sed -i 's|/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' src/variable.c
+
+  sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
+  -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
+  src/variable.c
 
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --infodir=/usr/share/info \
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index b727cf225..15ec95284 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 130965 2011-07-09 08:59:26Z ronald $
+# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=hdf5
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -15,7 +15,7 @@ depends=('zlib' 'sh')
 makedepends=('time')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-sha1sums=('be1daff26f066aca0b5be52d86dada6757fc4b95')
+sha1sums=('1bc16883ecd631840b70857bea637a06eb0155da')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 3e1513ed6..15bcdcbb8 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145777 2011-12-31 09:11:28Z andyrtr $
+# $Id: PKGBUILD 147995 2012-01-29 15:51:32Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.3.4
+pkgver=4.3.5
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('autoconf')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4840d0d20fafff3792b0b8ac305ab01e')
+md5sums=('9802867df48fb7c69d92dadf8fa86af6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index 250747ac0..4467333d0 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143527 2011-11-25 17:36:29Z andyrtr $
+# $Id: PKGBUILD 147997 2012-01-29 15:55:51Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libburn
-pkgver=1.1.8 #.pl01
+pkgver=1.2.0 #.pl01
 pkgrel=1
 pkgdesc="Library for reading, mastering and writing optical discs"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('glibc')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool' '!emptydirs')
-md5sums=('b91d2b8c65483efe447dbc3e3c9545d0')
+md5sums=('9638bfd46adbb6bf7cf3960749353c66')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/}
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index 8428590f6..4449c1008 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122805 2011-05-06 09:19:07Z ronald $
+# $Id: PKGBUILD 147970 2012-01-29 09:56:25Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc.archlinux.org>
 # Contributor: Eric Johnson <eric.archlinux.org>
 
 pkgname=libidn
-pkgver=1.22
+pkgver=1.24
 pkgrel=1
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="http://www.gnu.org/software/libidn/"
@@ -15,7 +15,7 @@ makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 install=libidn.install
-sha1sums=('8358e897c24d534438f6b5694c25e85889d860c3')
+sha1sums=('4251c108966375ede4df15d76a1bd9a4440f44ee')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 39e306723..22e5f2087 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 143529 2011-11-25 17:39:44Z andyrtr $
+# $Id: PKGBUILD 148001 2012-01-29 16:01:17Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gour <Gour <gour@mail.inet.hr>
 
 pkgname=libisoburn
-pkgver=1.1.8
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="frontend for libraries libburn and libisofs"
 url="http://libburnia.pykix.org/wiki/Libisoburn"
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('libburn>=1.1.8' 'libisofs>=1.1.6' 'readline')
+depends=('libburn>=1.2.0' 'libisofs>=1.2.0' 'readline')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('78c02d1790d5871524a9f4434934e277')
+md5sums=('48687da999d2508c82a391b59f2e2d77')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index c3cfed509..03db15e96 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140469 2011-10-15 09:31:03Z andyrtr $
+# $Id: PKGBUILD 147999 2012-01-29 15:58:31Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Hugo Doria <hugodoria@gmail.com>
 # Contributor: Bjorn Martensen
 
 pkgname=libisofs
-pkgver=1.1.6
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('acl' 'zlib')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('2f6088ba9ae7ed6cc91a51d2b6f2dfa0')
+md5sums=('dea7250f4ad917268810fc56bdcd92e4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index e6df06f4e..5b148762b 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142634 2011-11-12 17:15:30Z ibiru $
+# $Id: PKGBUILD 147967 2012-01-29 09:41:58Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=4.0.3
-pkgrel=2
+pkgver=4.0.5
+pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -17,14 +17,11 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
 makedepends=('pkg-config')
 install=miro.install
 options=('!makeflags')
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840'
-          'f0c851d51318c0e0be8b91463ef901625d2587a9')
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('1921357026df1092284a572ffe9c75ae32ec313f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/ffmpeg.patch"
   cd linux
 
   python2 setup.py install --root="${pkgdir}"
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 25103ab3b..6848e5354 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142507 2011-11-10 20:30:04Z ronald $
+# $Id: PKGBUILD 147988 2012-01-29 11:59:55Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.14.0
+pkgver=2.14.1
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
@@ -20,12 +20,11 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png')
 install=r.install
-sha1sums=('0f46bf75a7c150350b1142c29a98e7994d2b4bef'
+sha1sums=('5803a213480a749e36bccc155aecb13070ade096'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978')
-
 build() {
-   cd ${srcdir}/R-${pkgver}
+   cd "${srcdir}/R-${pkgver}"
    sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
@@ -44,26 +43,26 @@ build() {
 }
 
 package() {
-   cd ${srcdir}/R-${pkgver}
-   make -j1 DESTDIR=${pkgdir} install
+   cd "${srcdir}/R-${pkgver}"
+   make -j1 DESTDIR="${pkgdir}" install
 
    #  Fixup R wrapper scripts.
-   sed -i "s|${pkgdir} ||" ${pkgdir}/usr/bin/R
-   rm ${pkgdir}/usr/lib/R/bin/R
-   cd ${pkgdir}/usr/lib/R/bin
+   sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
+   rm "${pkgdir}/usr/lib/R/bin/R"
+   cd "${pkgdir}/usr/lib/R/bin"
    ln -s ../../../bin/R
 
   # install some freedesktop.org compatibility
-  install -Dm644 ${srcdir}/r.desktop \
-	${pkgdir}/usr/share/applications/r.desktop
-  install -Dm644 ${srcdir}/r.png \
-	${pkgdir}/usr/share/pixmaps/r.png
+  install -Dm644 "${srcdir}/r.desktop" \
+	"${pkgdir}/usr/share/applications/r.desktop"
+  install -Dm644 "${srcdir}/r.png" \
+	"${pkgdir}/usr/share/pixmaps/r.png"
 
   # move the config directory to /etc and create symlinks
-  install -d ${pkgdir}/etc/R
-  cd ${pkgdir}/usr/lib/R/etc
+  install -d "${pkgdir}/etc/R"
+  cd "${pkgdir}/usr/lib/R/etc"
   for i in *; do
-    mv -f ${i} ${pkgdir}/etc/R
+    mv -f ${i} "${pkgdir}/etc/R"
     ln -s /etc/R/${i} ${i}
   done
 }
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 09463e789..5d284ff3d 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145131 2011-12-17 09:42:49Z andyrtr $
+# $Id: PKGBUILD 147993 2012-01-29 15:45:06Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.11.3
+pkgver=1.11.4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -15,15 +15,13 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-sis.patch
         revert-trapezoids.patch
         #git-fixes.patch
-        xserver-1.11.2-record-crasher.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-md5sums=('a7194c437963627e1db0dd2d6c1a1984'
+md5sums=('256325e9b17dff479d92bed97f6b0adb'
          '6c7e87d63ac4b535e19a80c89d0cf091'
          'f8194638ca4872c2b0a67862a70bcebf'
          'f6c84f4936f8e00abdfbd9fb4eda83fb'
-         '3f9de4dbfee2da90167192d8ca9eb2b4'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b'
          'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
@@ -43,10 +41,6 @@ build() {
   # Add post-release patches from 1.11 branch
 #  patch -Np1 -i "${srcdir}/git-fixes.patch"
 
-  # From Fedora.
-  # Upstream URL: http://patchwork.freedesktop.org/patch/7866/
-  patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch"
-
   autoreconf -fi
   ./configure --prefix=/usr \
       --enable-ipv6 \