Date: Thursday, November 10, 2011 @ 15:30:04
Author: ronald
Revision: 142507
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
r/repos/extra-i686/PKGBUILD
(from rev 142506, r/trunk/PKGBUILD)
r/repos/extra-i686/r.desktop
(from rev 142506, r/trunk/r.desktop)
r/repos/extra-i686/r.install
(from rev 142506, r/trunk/r.install)
r/repos/extra-i686/r.png
(from rev 142506, r/trunk/r.png)
r/repos/extra-x86_64/PKGBUILD
(from rev 142506, r/trunk/PKGBUILD)
r/repos/extra-x86_64/r.desktop
(from rev 142506, r/trunk/r.desktop)
r/repos/extra-x86_64/r.install
(from rev 142506, r/trunk/r.install)
r/repos/extra-x86_64/r.png
(from rev 142506, r/trunk/r.png)
Deleted:
r/repos/extra-i686/PKGBUILD
r/repos/extra-i686/r.desktop
r/repos/extra-i686/r.install
r/repos/extra-i686/r.png
r/repos/extra-x86_64/PKGBUILD
r/repos/extra-x86_64/r.desktop
r/repos/extra-x86_64/r.install
r/repos/extra-x86_64/r.png
------------------------+
extra-i686/PKGBUILD | 137 +++++++++++++++++++++++------------------------
extra-i686/r.desktop | 22 +++----
extra-i686/r.install | 24 ++++----
extra-x86_64/PKGBUILD | 137 +++++++++++++++++++++++------------------------
extra-x86_64/r.desktop | 22 +++----
extra-x86_64/r.install | 24 ++++----
6 files changed, 184 insertions(+), 182 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-11-10 20:29:17 UTC (rev 142506)
+++ extra-i686/PKGBUILD 2011-11-10 20:30:04 UTC (rev 142507)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.per...@bluewin.ch>
-# Contributor: K. Piche <kpi...@rogers.com>
-
-pkgname=r
-pkgver=2.13.2
-pkgrel=1
-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=('3c8e3055b2d76cf79627325af8846848ca9a7e90'
- '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/extra-i686/PKGBUILD (from rev 142506, r/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-10 20:30:04 UTC (rev 142507)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.per...@bluewin.ch>
+# Contributor: K. Piche <kpi...@rogers.com>
+
+pkgname=r
+pkgver=2.14.0
+pkgrel=1
+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
+}
Deleted: extra-i686/r.desktop
===================================================================
--- extra-i686/r.desktop 2011-11-10 20:29:17 UTC (rev 142506)
+++ extra-i686/r.desktop 2011-11-10 20:30:04 UTC (rev 142507)
@@ -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/extra-i686/r.desktop (from rev 142506, r/trunk/r.desktop)
===================================================================
--- extra-i686/r.desktop (rev 0)
+++ extra-i686/r.desktop 2011-11-10 20:30:04 UTC (rev 142507)
@@ -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: extra-i686/r.install
===================================================================
--- extra-i686/r.install 2011-11-10 20:29:17 UTC (rev 142506)
+++ extra-i686/r.install 2011-11-10 20:30:04 UTC (rev 142507)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: r/repos/extra-i686/r.install (from rev 142506, r/trunk/r.install)
===================================================================
--- extra-i686/r.install (rev 0)
+++ extra-i686/r.install 2011-11-10 20:30:04 UTC (rev 142507)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: extra-i686/r.png
===================================================================
(Binary files differ)
Copied: r/repos/extra-i686/r.png (from rev 142506, r/trunk/r.png)
===================================================================
(Binary files differ)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-11-10 20:29:17 UTC (rev 142506)
+++ extra-x86_64/PKGBUILD 2011-11-10 20:30:04 UTC (rev 142507)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.per...@bluewin.ch>
-# Contributor: K. Piche <kpi...@rogers.com>
-
-pkgname=r
-pkgver=2.13.2
-pkgrel=1
-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=('3c8e3055b2d76cf79627325af8846848ca9a7e90'
- '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/extra-x86_64/PKGBUILD (from rev 142506, r/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-11-10 20:30:04 UTC (rev 142507)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.per...@bluewin.ch>
+# Contributor: K. Piche <kpi...@rogers.com>
+
+pkgname=r
+pkgver=2.14.0
+pkgrel=1
+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
+}
Deleted: extra-x86_64/r.desktop
===================================================================
--- extra-x86_64/r.desktop 2011-11-10 20:29:17 UTC (rev 142506)
+++ extra-x86_64/r.desktop 2011-11-10 20:30:04 UTC (rev 142507)
@@ -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/extra-x86_64/r.desktop (from rev 142506, r/trunk/r.desktop)
===================================================================
--- extra-x86_64/r.desktop (rev 0)
+++ extra-x86_64/r.desktop 2011-11-10 20:30:04 UTC (rev 142507)
@@ -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: extra-x86_64/r.install
===================================================================
--- extra-x86_64/r.install 2011-11-10 20:29:17 UTC (rev 142506)
+++ extra-x86_64/r.install 2011-11-10 20:30:04 UTC (rev 142507)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: r/repos/extra-x86_64/r.install (from rev 142506, r/trunk/r.install)
===================================================================
--- extra-x86_64/r.install (rev 0)
+++ extra-x86_64/r.install 2011-11-10 20:30:04 UTC (rev 142507)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: extra-x86_64/r.png
===================================================================
(Binary files differ)
Copied: r/repos/extra-x86_64/r.png (from rev 142506, r/trunk/r.png)
===================================================================
(Binary files differ)
