[arch-commits] Commit in r/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Monday, October 25, 2010 @ 11:34:52
  Author: pierre
Revision: 96917

xz 5.0.0 rebuild

Modified:
  r/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-25 15:28:52 UTC (rev 96916)
+++ PKGBUILD	2010-10-25 15:34:52 UTC (rev 96917)
@@ -5,7 +5,7 @@
 
 pkgname=r
 pkgver=2.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="R is a language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,9 +15,9 @@
          'tk' 'libxt' 'libxmu' 'pango')
 makedepends=('openjdk6' 'gcc-fortran')
 options=('!makeflags')
-source=(http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz
-	r.desktop
-	r.png)
+source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
+	'r.desktop'
+	'r.png')
 
 md5sums=('7421108ade3e9223263394b9bbe277ce'
          'f6d54d32e510d90c748a0d16d2abcbdc'
@@ -43,9 +43,13 @@
 		--with-blas \
                 F77=gfortran \
 		LIBnn=lib
-   make || return 1
-   make -j1 DESTDIR=${pkgdir} install || return 1
+   make
+}
 
+package() {
+   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
@@ -54,7 +58,7 @@
 
   # install some freedesktop.org compatibility
   install -Dm644 ${srcdir}/r.desktop \
-	${pkgdir}/usr/share/applications/r.desktop || return 1
+	${pkgdir}/usr/share/applications/r.desktop
   install -Dm644 ${srcdir}/r.png \
-	${pkgdir}/usr/share/pixmaps/r.png || return 1
+	${pkgdir}/usr/share/pixmaps/r.png
  }