Date: Friday, June 29, 2012 @ 16:57:40 Author: ronald Revision: 162764
upgpkg: r 2.15.1-1 update to 2.15.1; add etc/ld.so.conf.d/ config file; add latex sty files FS#29604; move tk from depends to optdepends FS#30209 Added: r/trunk/R.conf Modified: r/trunk/PKGBUILD r/trunk/r.install -----------+ PKGBUILD | 24 +++++++++++++++++------- R.conf | 2 ++ r.install | 2 ++ 3 files changed, 21 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-29 19:59:42 UTC (rev 162763) +++ PKGBUILD 2012-06-29 20:57:40 UTC (rev 162764) @@ -4,7 +4,7 @@ # Contributor: K. Piche <[email protected]> pkgname=r -pkgver=2.15.0 +pkgver=2.15.1 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') @@ -12,21 +12,28 @@ 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') + 'libxt' 'libxmu' 'pango' 'xz' 'texlive-bin' 'desktop-file-utils') +makedepends=('openjdk6' 'gcc-fortran' 'tk') +optdepends=('tk: tcl/tk interface') backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') -options=('!makeflags') +options=('!makeflags' '!emptydirs') source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"; 'r.desktop' - 'r.png') + 'r.png' + 'R.conf') install=r.install -sha1sums=('a633f87fdbd22e8c371971c535ca815e63c297f6' +sha1sums=('f0e6912be6dfc0d1fdc4be66048304d8befe8424' '13aa29219bcaa102e575de8c1c8e0833d233e836' - 'a69a07ec363440efc18ce0a7f2af103375dea978') + '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 + ./configure --prefix=/usr \ --libdir=/usr/lib \ --sysconfdir=/etc/R \ @@ -66,4 +73,7 @@ mv -f ${i} "${pkgdir}/etc/R" ln -s /etc/R/${i} ${i} done + + # Install ld.so.conf.d file to ensure other applications access the shared lib + install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf } Added: R.conf =================================================================== --- R.conf (rev 0) +++ R.conf 2012-06-29 20:57:40 UTC (rev 162764) @@ -0,0 +1,2 @@ +/usr/lib/R/lib + Modified: r.install =================================================================== --- r.install 2012-06-29 19:59:42 UTC (rev 162763) +++ r.install 2012-06-29 20:57:40 UTC (rev 162764) @@ -1,5 +1,7 @@ post_install() { update-desktop-database -q + echo ">>> updating the filename database for texlive..." + mktexlsr --quiet usr/share/texmf } post_upgrade() {
