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

2016-08-08 Thread Antonio Rojas
Date: Monday, August 8, 2016 @ 17:30:24
  Author: arojas
Revision: 273499

texlive hooks

Modified:
  r/trunk/PKGBUILD
Deleted:
  r/trunk/r.install

---+
 PKGBUILD  |3 +--
 r.install |   15 ---
 2 files changed, 1 insertion(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-08 15:56:13 UTC (rev 273498)
+++ PKGBUILD2016-08-08 17:30:24 UTC (rev 273499)
@@ -5,7 +5,7 @@
 
 pkgname=r
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,7 +17,6 @@
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 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-${pkgver%%.*}/R-${pkgver}.tar.gz;
'r.desktop'
'r.png'

Deleted: r.install
===
--- r.install   2016-08-08 15:56:13 UTC (rev 273498)
+++ r.install   2016-08-08 17:30:24 UTC (rev 273499)
@@ -1,15 +0,0 @@
-post_install() {
-  if [[ -x /usr/bin/mktexlsr ]]; then
- echo ">>> updating the filename database for texlive..."
- mktexlsr --quiet usr/share/texmf
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-


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

2016-05-14 Thread Antonio Rojas
Date: Saturday, May 14, 2016 @ 21:55:51
  Author: arojas
Revision: 268017

Update to 3.3.0

Modified:
  r/trunk/PKGBUILD
  r/trunk/r.install

---+
 PKGBUILD  |   14 +++---
 r.install |1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 19:43:02 UTC (rev 268016)
+++ PKGBUILD2016-05-14 19:55:51 UTC (rev 268017)
@@ -4,8 +4,8 @@
 # Contributor: K. Piche 
 
 pkgname=r
-pkgver=3.2.4
-pkgrel=2
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,17 +18,17 @@
 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-${pkgver%%.*}/R-${pkgver}-revised.tar.gz;
+source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz;
'r.desktop'
'r.png'
'R.conf')
-sha1sums=('54d8b02b4564655f1be84b4a830813f8452b5e9c'
+sha1sums=('166a25a7996150c9c83cdafcc89bfcd81578a887'
   'd7fa521345b230a4187d60d07d06ce4b6d573e3f'
   'a69a07ec363440efc18ce0a7f2af103375dea978'
   '43668da6cfd1b4455a99f23e79e2059294dddac9')
 
 prepare() {
-   cd R-revised
+   cd R-${pkgver}
# set texmf dir correctly in makefile
sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
# fix for texinfo 5.X
@@ -36,7 +36,7 @@
 }
 
 build() {
-   cd R-revised
+   cd R-${pkgver}
./configure  --prefix=/usr \
--libdir=/usr/lib \
--sysconfdir=/etc/R \
@@ -58,7 +58,7 @@
 }
 
 package() {
-   cd R-revised
+   cd R-${pkgver}
make DESTDIR="${pkgdir}" install
 
 # install libRmath.so

Modified: r.install
===
--- r.install   2016-05-14 19:43:02 UTC (rev 268016)
+++ r.install   2016-05-14 19:55:51 UTC (rev 268017)
@@ -1,5 +1,4 @@
 post_install() {
-  update-desktop-database -q
   if [[ -x /usr/bin/mktexlsr ]]; then
  echo ">>> updating the filename database for texlive..."
  mktexlsr --quiet usr/share/texmf


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

2012-06-30 Thread Ronald van Haren
Date: Saturday, June 30, 2012 @ 03:07:40
  Author: ronald
Revision: 162769

upgpkg: r 2.15.1-2

move texlive-bin to optdepends

Modified:
  r/trunk/PKGBUILD
  r/trunk/r.install

---+
 PKGBUILD  |6 +++---
 r.install |6 --
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-29 23:57:31 UTC (rev 162768)
+++ PKGBUILD2012-06-30 07:07:40 UTC (rev 162769)
@@ -5,16 +5,16 @@
 
 pkgname=r
 pkgver=2.15.1
-pkgrel=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'
- 'libxt' 'libxmu' 'pango' 'xz' 'texlive-bin' 'desktop-file-utils')
+ 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
 makedepends=('openjdk6' 'gcc-fortran' 'tk')
-optdepends=('tk: tcl/tk interface')
+optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
 options=('!makeflags' '!emptydirs')
 source=(http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz;

Modified: r.install
===
--- r.install   2012-06-29 23:57:31 UTC (rev 162768)
+++ r.install   2012-06-30 07:07:40 UTC (rev 162769)
@@ -1,7 +1,9 @@
 post_install() {
   update-desktop-database -q
-  echo  updating the filename database for texlive...
-  mktexlsr --quiet usr/share/texmf
+  if [[ -x /usr/bin/mktexlsr ]]; then
+ echo  updating the filename database for texlive...
+ mktexlsr --quiet usr/share/texmf
+  fi
 }
 
 post_upgrade() {



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

2011-07-20 Thread Ronald van Haren
Date: Wednesday, July 20, 2011 @ 03:19:13
  Author: ronald
Revision: 132100

upgpkg: r 2.13.1-1
update to 2.13.1; add install file; move config files to /etc and create 
symlinks; add config files to backup array (FS#21786)

Added:
  r/trunk/r.install
Modified:
  r/trunk/PKGBUILD

---+
 PKGBUILD  |   29 +
 r.install |   12 
 2 files changed, 29 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-20 07:13:12 UTC (rev 132099)
+++ PKGBUILD2011-07-20 07:19:13 UTC (rev 132100)
@@ -4,39 +4,36 @@
 # Contributor: K. Piche kpi...@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 @@
${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
+}

Added: r.install
===
--- r.install   (rev 0)
+++ r.install   2011-07-20 07:19:13 UTC (rev 132100)
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+