diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
| commit | 416f65d4b97ff26629ddfa1b40ea2041c3e75358 (patch) | |
| tree | 61e28b785eb3aa9e55ea269e170277b3d3b6e1fa /extra/r | |
| parent | b14277452871db749ef4faa7db7e69bfce39f1a7 (diff) | |
| parent | 6fbdd2899f39266e458531dcffefb85b9ce8d1b9 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libnewt/PKGBUILD
community/luasec/PKGBUILD
extra/expect/PKGBUILD
extra/fribidi/PKGBUILD
extra/goffice/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
Diffstat (limited to 'extra/r')
| -rw-r--r-- | extra/r/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 1550da603..214a531f1 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172476 2012-12-03 18:59:33Z ronald $ +# $Id: PKGBUILD 173847 2012-12-25 00:34:38Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r pkgver=2.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') -makedepends=('openjdk6' 'gcc-fortran' 'tk') +makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') options=('!makeflags' '!emptydirs') |