[arch-commits] Commit in r/repos (extra-i686 extra-i686/PKGBUILD)

[Ronald van Haren]

    Date: Tuesday, December 30, 2008 @ 06:48:02
  Author: ronald
Revision: 22977

Merged revisions 22972 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/r/trunk

........
  r22972 | ronald | 2008-12-30 12:23:41 +0100 (Tue, 30 Dec 2008) | 1 line
  
  upgpkg: r 2.8.1-1
........

Modified:
  r/repos/extra-i686/	(properties)
  r/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)


Property changes on: r/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /r/trunk:1-16870
   + /r/trunk:1-22976

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-30 11:35:01 UTC (rev 22976)
+++ extra-i686/PKGBUILD	2008-12-30 11:48:02 UTC (rev 22977)
@@ -4,7 +4,7 @@
 # Contributor: K. Piche <kpiche at rogers.com>
 
 pkgname=r
-pkgver=2.8.0
+pkgver=2.8.1
 pkgrel=1
 pkgdesc="R is a language and environment for statistical computing and graphics"
 arch=("i686" "x86_64")
@@ -15,12 +15,13 @@
 source=(http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz
 	r.desktop
 	r.png)
-md5sums=('5213c9644aec984278b669df1a63a2ce'
+
+md5sums=('acd40621b8942a2464daa2f9cef3273d'
          'f6d54d32e510d90c748a0d16d2abcbdc'
          '00659f39e90627fe87f1645df5d4e3a7')
 
 build() {
-   cd $srcdir/R-${pkgver}
+   cd ${srcdir}/R-${pkgver}
    sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c || return 1
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
@@ -40,17 +41,17 @@
                 F77=gfortran \
 		LIBnn=lib
    make || return 1
-   make -j1 DESTDIR=$pkgdir install || return 1
+   make -j1 DESTDIR=${pkgdir} install || return 1
 
    #  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 || return 1
-  install -Dm644 $srcdir/r.png \
-	$pkgdir/usr/share/pixmaps/r.png || return 1
+  install -Dm644 ${srcdir}/r.desktop \
+	${pkgdir}/usr/share/applications/r.desktop || return 1
+  install -Dm644 ${srcdir}/r.png \
+	${pkgdir}/usr/share/pixmaps/r.png || return 1
  }