[arch-commits] Commit in r/repos/testing-x86_64 (8 files)

Ronald van Haren ronald at archlinux.org
Mon Jan 30 20:32:32 UTC 2012


    Date: Monday, January 30, 2012 @ 15:32:31
  Author: ronald
Revision: 148375

resolve conflicts

Added:
  r/repos/testing-x86_64/PKGBUILD
    (from rev 148374, r/trunk/PKGBUILD)
  r/repos/testing-x86_64/r.desktop
    (from rev 148374, r/trunk/r.desktop)
  r/repos/testing-x86_64/r.install
    (from rev 148374, r/trunk/r.install)
  r/repos/testing-x86_64/r.png
    (from rev 148374, r/trunk/r.png)
Deleted:
  r/repos/testing-x86_64/PKGBUILD
  r/repos/testing-x86_64/r.desktop
  r/repos/testing-x86_64/r.install
  r/repos/testing-x86_64/r.png

-----------+
 PKGBUILD  |  137 +++++++++++++++++++++++++++++-------------------------------
 r.desktop |   22 ++++-----
 r.install |   24 +++++-----
 3 files changed, 91 insertions(+), 92 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-30 20:19:06 UTC (rev 148374)
+++ PKGBUILD	2012-01-30 20:32:31 UTC (rev 148375)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Contributor: K. Piche <kpiche at rogers.com>
-
-pkgname=r
-pkgver=2.14.0
-pkgrel=2
-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' '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')
-install=r.install
-sha1sums=('0f46bf75a7c150350b1142c29a98e7994d2b4bef'
-          '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/doc/R/ \
-                --with-x \
-		--enable-R-shlib \
-                --with-lapack \
-		--with-blas \
-                F77=gfortran \
-		LIBnn=lib
-   make
-}
-
-package() {
-   cd "${srcdir}/R-${pkgver}"
-   make -j1 DESTDIR="${pkgdir}" install
-
-   #  Fixup R wrapper scripts.
-   sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
-   rm "${pkgdir}/usr/lib/R/bin/R"
-   cd "${pkgdir}/usr/lib/R/bin"
-   ln -s ../../../bin/R
-
-  # install some freedesktop.org compatibility
-  install -Dm644 "${srcdir}/r.desktop" \
-	"${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
-}

Copied: r/repos/testing-x86_64/PKGBUILD (from rev 148374, r/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2012-01-30 20:32:31 UTC (rev 148375)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Contributor: K. Piche <kpiche at rogers.com>
+
+pkgname=r
+pkgver=2.14.1
+pkgrel=2
+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' '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')
+install=r.install
+sha1sums=('5803a213480a749e36bccc155aecb13070ade096'
+          '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/doc/R/ \
+                --with-x \
+		--enable-R-shlib \
+                --with-lapack \
+		--with-blas \
+                F77=gfortran \
+		LIBnn=lib
+   make
+}
+
+package() {
+   cd "${srcdir}/R-${pkgver}"
+   make -j1 DESTDIR="${pkgdir}" install
+
+   #  Fixup R wrapper scripts.
+   sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
+   rm "${pkgdir}/usr/lib/R/bin/R"
+   cd "${pkgdir}/usr/lib/R/bin"
+   ln -s ../../../bin/R
+
+  # install some freedesktop.org compatibility
+  install -Dm644 "${srcdir}/r.desktop" \
+	"${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
+}

Deleted: r.desktop
===================================================================
--- r.desktop	2012-01-30 20:19:06 UTC (rev 148374)
+++ r.desktop	2012-01-30 20:32:31 UTC (rev 148375)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=R
-GenericName=environment for statistical computing
-Comment=language and environment for statistical computing and graphics
-Exec=R
-Icon=/usr/share/pixmaps/r.png
-DocPath=/usr/lib/R/doc/html/index.html
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Education;Science;Math;

Copied: r/repos/testing-x86_64/r.desktop (from rev 148374, r/trunk/r.desktop)
===================================================================
--- r.desktop	                        (rev 0)
+++ r.desktop	2012-01-30 20:32:31 UTC (rev 148375)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=R
+GenericName=environment for statistical computing
+Comment=language and environment for statistical computing and graphics
+Exec=R
+Icon=/usr/share/pixmaps/r.png
+DocPath=/usr/lib/R/doc/html/index.html
+StartupNotify=true
+Terminal=true
+Type=Application
+Categories=Education;Science;Math;

Deleted: r.install
===================================================================
--- r.install	2012-01-30 20:19:06 UTC (rev 148374)
+++ r.install	2012-01-30 20:32:31 UTC (rev 148375)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-

Copied: r/repos/testing-x86_64/r.install (from rev 148374, r/trunk/r.install)
===================================================================
--- r.install	                        (rev 0)
+++ r.install	2012-01-30 20:32:31 UTC (rev 148375)
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+

Deleted: r.png
===================================================================
(Binary files differ)

Copied: r/repos/testing-x86_64/r.png (from rev 148374, r/trunk/r.png)
===================================================================
(Binary files differ)




More information about the arch-commits mailing list