[arch-commits] CVS update of extra/science/r (PKGBUILD)

Jan de Groot jgc at archlinux.org
Sun Mar 9 17:17:43 UTC 2008


    Date: Sunday, March 9, 2008 @ 13:17:43
  Author: jgc
    Path: /home/cvs-extra/extra/science/r

Modified: PKGBUILD (1.24 -> 1.25)

upgpkg: r 2.6.0-2
    Rebuild with gfortran 4.3


----------+
 PKGBUILD |   33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)


Index: extra/science/r/PKGBUILD
diff -u extra/science/r/PKGBUILD:1.24 extra/science/r/PKGBUILD:1.25
--- extra/science/r/PKGBUILD:1.24	Tue Oct 23 09:33:53 2007
+++ extra/science/r/PKGBUILD	Sun Mar  9 13:17:43 2008
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD,v 1.24 2007/10/23 13:33:53 damir Exp $
+# $Id: PKGBUILD,v 1.25 2008/03/09 17:17:43 jgc Exp $
 # Maintainer: Damir Perisa <damir.perisa at bluewin.ch>
 # Contributor: K. Piche <kpiche at rogers.com>
 
 pkgname=r
-origname=R
 pkgver=2.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="R is a language and environment for statistical computing and graphics"
 arch=("i686" "x86_64")
 license=('GPL')
 url=('http://www.r-project.org/')
-depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-fortran>=4.2.0' 'tk' 'libxt' 'libxmu')
-makedepends=('jre')
-#source=(http://cran.r-project.org/src/base/$origname-$pkgver.tgz)
-source=("http://cran.r-project.org/src/base/R-2/$origname-$pkgver.tar.gz" \
-	"$pkgname.desktop" "$pkgname.png")
+depends=('blas>=19980702-4' 'lapack>=3.1.1-3' 'bzip2'  'libpng' 'libjpeg' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs>=4.3.0' 'tk' 'libxt' 'libxmu')
+makedepends=('java-gcj-compat')
+source=(http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz
+	r.desktop
+	r.png)
 
 build() {
-   cd $startdir/src/$origname-$pkgver
+   cd ${startdir}/src/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 \
@@ -37,19 +36,19 @@
                 F77=gfortran \
 		LIBnn=lib
    make || return 1
-   make DESTDIR=$startdir/pkg/ install || return 1
+   make -j1 DESTDIR=${startdir}/pkg/ install || return 1
 
    #  Fixup R wrapper scripts.
-   sed -i "s|$startdir/pkg||" $startdir/pkg/usr/bin/R
-   rm $startdir/pkg/usr/lib/R/bin/R
-   cd $startdir/pkg/usr/lib/R/bin
+   sed -i "s|${startdir}/pkg||" ${startdir}/pkg/usr/bin/R
+   rm ${startdir}/pkg/usr/lib/R/bin/R
+   cd ${startdir}/pkg/usr/lib/R/bin
    ln -s ../../../bin/R
 
   # install some freedesktop.org compatibility
-  install -D -m644 $startdir/src/$pkgname.desktop \
-  $startdir/pkg/usr/share/applications/$pkgname.desktop
-  install -D -m644 $startdir/src/$pkgname.png \
-  $startdir/pkg/usr/share/pixmaps/$pkgname.png
+  install -m755 -d ${startdir}/pkg/usr/share/applications
+  install -m755 -d ${startdir}/pkg/usr/share/pixmaps
+  install -m644 ${startdir}/src/r.desktop ${startdir}/pkg/usr/share/applications/ || return 1
+  install -m644 ${startdir}/src/r.png ${startdir}/pkg/usr/share/pixmaps/ || return 1
  }
 
 




More information about the arch-commits mailing list