[arch-commits] Commit in r/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, April 30, 2013 @ 03:00:43
  Author: eric
Revision: 183956

upgpkg: r 3.0.0-1

Upstream update, Rebuild against libpng 1.6, Update backup array

Modified:
  r/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-29 23:25:15 UTC (rev 183955)
+++ PKGBUILD	2013-04-30 01:00:43 UTC (rev 183956)
@@ -4,7 +4,7 @@
 # Contributor: K. Piche <kpiche at rogers.com>
 
 pkgname=r
-pkgver=2.15.3
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
@@ -15,28 +15,28 @@
          'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
 makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
-backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
+backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf')
 options=('!makeflags' '!emptydirs')
 install=r.install
-source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
+source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
 	'R.conf')
-sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621'
+sha1sums=('0cb1d1b815af4ce640ceafd5402a2eb94924c945'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           '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
-
+prepare() {
+   cd R-${pkgver}
+# set texmf dir correctly in makefile
+   sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
 # fix for texinfo 5.X
-  sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
+   sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
+}
 
+build() {
+   cd R-${pkgver}
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
 		--sysconfdir=/etc/R \
@@ -58,7 +58,7 @@
 }
 
 package() {
-   cd "${srcdir}/R-${pkgver}"
+   cd R-${pkgver}
    make DESTDIR="${pkgdir}" install
 
 # install libRmath.so