diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-02 15:52:33 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-02 15:52:33 -0300 |
| commit | 0ca20230bdd33f8e07d2da28bec74c5e685650e9 (patch) | |
| tree | 6f09c1056210679c3dfe0c6534ffd6b2d0f7bf68 /extra/r | |
| parent | ca8ab20a665411e312578954c85f1bd3913fc726 (diff) | |
| parent | 9d209f25af63a35774000e87df4e188057f71b2f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mythtv/PKGBUILD
community-staging/mythtv/mythbackend.rc
community-staging/mythtv/mythtv.install
community/sigil/PKGBUILD
extra/pixman/PKGBUILD
staging/vlc/PKGBUILD
Diffstat (limited to 'extra/r')
| -rw-r--r-- | extra/r/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/r/r.install | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index fa3893cdf..ac3dafa31 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 162765 2012-06-29 20:58:34Z ronald $ +# $Id: PKGBUILD 162770 2012-06-30 07:08:33Z ronald $ # 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.1 -pkgrel=1 +pkgrel=2 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'libxt' 'libxmu' 'pango' 'xz' 'texlive-bin' 'desktop-file-utils') + 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') makedepends=('openjdk6' 'gcc-fortran' 'tk') -optdepends=('tk: tcl/tk interface') +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') source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" diff --git a/extra/r/r.install b/extra/r/r.install index 89fea599b..522ce52e7 100644 --- a/extra/r/r.install +++ b/extra/r/r.install @@ -1,7 +1,9 @@ post_install() { update-desktop-database -q - echo ">>> updating the filename database for texlive..." - mktexlsr --quiet usr/share/texmf + if [[ -x /usr/bin/mktexlsr ]]; then + echo ">>> updating the filename database for texlive..." + mktexlsr --quiet usr/share/texmf + fi } post_upgrade() { |