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

[Ronald van Haren]

    Date: Monday, September 1, 2008 @ 14:05:37
  Author: ronald
Revision: 11704

fix merge conflict

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

----------+
 PKGBUILD |   54 ++++++++++++++++++++----------------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)


Property changes on: r/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /r/trunk:1-1242
   + /r/trunk:1-11703

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-01 18:03:57 UTC (rev 11703)
+++ extra-x86_64/PKGBUILD	2008-09-01 18:05:37 UTC (rev 11704)
@@ -1,24 +1,31 @@
 # $Id$
-# Maintainer: Damir Perisa <damir.perisa at bluewin.ch>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 # Contributor: K. Piche <kpiche at rogers.com>
 
 pkgname=r
-pkgver=2.7.0
+pkgver=2.7.2
 pkgrel=1
 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>=19980702-4' 'lapack>=3.1.1-3' 'bzip2'  'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs>=4.3.0' 'tk' 'libxt' 'libxmu' 'pango')
-makedepends=('java-gcj-compat')
+depends=('blas>=19980702-4' 'lapack>=3.1.1-3' 'bzip2'  'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs>=4.3.1' 'tk' 'libxt' 'libxmu' 'pango')
+makedepends=('openjdk6')
 source=(http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz
 	r.desktop
 	r.png)
+<<<<<<< .working
 md5sums=('9eaee3eceec1d5f72cea5640ca90768c' 'f6d54d32e510d90c748a0d16d2abcbdc'\
          '00659f39e90627fe87f1645df5d4e3a7')
+=======
+md5sums=('6122945e9301825b97a506151b3cefde'
+         'f6d54d32e510d90c748a0d16d2abcbdc'
+         '00659f39e90627fe87f1645df5d4e3a7')
+>>>>>>> .merge-right.r11703
 
 build() {
-   cd ${startdir}/src/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 \
@@ -38,38 +45,17 @@
                 F77=gfortran \
 		LIBnn=lib
    make || return 1
-   make -j1 DESTDIR=${startdir}/pkg/ install || return 1
+   make -j1 DESTDIR=$pkgdir 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|$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 -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
+  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
  }
-
-
-
-# R is now configured for x86_64-unknown-linux-gnu
-# 
-#   Source directory:          .
-#   Installation directory:    /usr
-# 
-#   C compiler:                gcc -std=gnu99  -march=x86-64 -mtune=generic -O2 -pipe
-#   Fortran 77 compiler:       gfortran  -g -O2
-# 
-#   C++ compiler:              g++  -march=x86-64 -mtune=generic -O2 -pipe
-#   Fortran 90/95 compiler:    gfortran -g -O2
-#   Obj-C compiler:            gcc -g -O2
-# 
-#   Interfaces supported:      X11, tcltk
-#   External libraries:        readline
-#   Additional capabilities:   PNG, JPEG, iconv, MBCS, NLS, cairo
-#   Options enabled:           shared R library, shared BLAS, R profiling, Java
-# 
-#   Recommended packages:      yes