From 55f2d1ab0ab1bd2f7c8c7c5cefeb45f7c457a5d9 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 1 Jul 2012 00:03:50 +0000
Subject: Sun Jul  1 00:03:50 UTC 2012

---
 extra/r/PKGBUILD  | 26 ++++++++++++++++++--------
 extra/r/R.conf    |  2 ++
 extra/r/r.install |  2 ++
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 extra/r/R.conf

(limited to 'extra/r')

diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index f0e8dd79f..c6d79493f 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154825 2012-03-30 19:44:16Z ronald $
+# $Id: PKGBUILD 162765 2012-06-29 20:58:34Z 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.0
+pkgver=2.15.1
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
@@ -12,21 +12,28 @@ license=('GPL')
 url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
-         'tk' 'libxt' 'libxmu' 'pango' 'xz')
-makedepends=('openjdk6' 'gcc-fortran')
+         'libxt' 'libxmu' 'pango' 'xz' 'texlive-bin' 'desktop-file-utils')
+makedepends=('openjdk6' 'gcc-fortran' 'tk')
+optdepends=('tk: tcl/tk interface')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
-options=('!makeflags')
+options=('!makeflags' '!emptydirs')
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
-	'r.png')
+	'r.png'
+	'R.conf')
 install=r.install
-sha1sums=('a633f87fdbd22e8c371971c535ca815e63c297f6'
+sha1sums=('f0e6912be6dfc0d1fdc4be66048304d8befe8424'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
-          'a69a07ec363440efc18ce0a7f2af103375dea978')
+          'a69a07ec363440efc18ce0a7f2af103375dea978'
+          '43668da6cfd1b4455a99f23e79e2059294dddac9')
 
 build() {
    cd "${srcdir}/R-${pkgver}"
    sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
+
+  # set texmf dir correctly in makefile
+  sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
+
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
 		--sysconfdir=/etc/R \
@@ -66,4 +73,7 @@ package() {
     mv -f ${i} "${pkgdir}/etc/R"
     ln -s /etc/R/${i} ${i}
   done
+
+  # Install ld.so.conf.d file to ensure other applications access the shared lib
+  install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf
 }
diff --git a/extra/r/R.conf b/extra/r/R.conf
new file mode 100644
index 000000000..e360859db
--- /dev/null
+++ b/extra/r/R.conf
@@ -0,0 +1,2 @@
+/usr/lib/R/lib
+
diff --git a/extra/r/r.install b/extra/r/r.install
index d3289ab64..89fea599b 100644
--- a/extra/r/r.install
+++ b/extra/r/r.install
@@ -1,5 +1,7 @@
 post_install() {
   update-desktop-database -q
+  echo ">>> updating the filename database for texlive..."
+  mktexlsr --quiet usr/share/texmf
 }
 
 post_upgrade() {
-- 
cgit v1.2.3-54-g00ecf