From 43983783a3e8bf61896eb93a2858a14bbaf3a53b Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 24 Jul 2011 23:18:01 +0000
Subject: Sun Jul 24 23:18:00 UTC 2011

---
 extra/r/PKGBUILD  | 31 ++++++++++++++++++-------------
 extra/r/r.install | 12 ++++++++++++
 2 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 extra/r/r.install

(limited to 'extra/r')

diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 7ef4e0b0e..e6b7af9dc 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,42 +1,39 @@
-# $Id: PKGBUILD 122820 2011-05-06 10:48:44Z ronald $
+# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z 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.13.0
+pkgver=2.13.1
 pkgrel=1
-pkgdesc="R is a language and environment for statistical computing and graphics"
+pkgdesc="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' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
-         'tk' 'libxt' 'libxmu' 'pango')
+         'tk' 'libxt' 'libxmu' 'pango' 'xz')
 makedepends=('openjdk6' 'gcc-fortran')
+backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
 options=('!makeflags')
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png')
-sha1sums=('878510e8a5fa1ccd1e0c4af5866f5416f3c27469'
+install=r.install
+sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978')
-
 build() {
    cd ${srcdir}/R-${pkgver}
    sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
+		--sysconfdir=/etc/R \
 		--datarootdir=/usr/share \
 		  rsharedir=/usr/share/R/ \
 		  rincludedir=/usr/include/R/ \
-		  rdocdir=/usr/share/R/docs/ \
-                --with-gnu-ld \
-		--with-readline \
+		  rdocdir=/usr/share/doc/R/ \
                 --with-x \
-                --with-zlib \
-                --with-bzlib  \
-                --with-pcre \
 		--enable-R-shlib \
                 --with-lapack \
 		--with-blas \
@@ -60,4 +57,12 @@ package() {
 	${pkgdir}/usr/share/applications/r.desktop
   install -Dm644 ${srcdir}/r.png \
 	${pkgdir}/usr/share/pixmaps/r.png
- }
+
+  # move the config directory to /etc and create symlinks
+  install -d ${pkgdir}/etc/R
+  cd ${pkgdir}/usr/lib/R/etc
+  for i in *; do
+    mv -f ${i} ${pkgdir}/etc/R
+    ln -s /etc/R/${i} ${i}
+  done
+}
diff --git a/extra/r/r.install b/extra/r/r.install
new file mode 100644
index 000000000..d3289ab64
--- /dev/null
+++ b/extra/r/r.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
-- 
cgit v1.2.3-54-g00ecf