Date: Thursday, August 6, 2015 @ 13:05:51 Author: ronald Revision: 243078
archrelease: copy trunk to extra-i686, extra-x86_64 Added: r/repos/extra-i686/PKGBUILD (from rev 243077, r/trunk/PKGBUILD) r/repos/extra-i686/R.conf (from rev 243077, r/trunk/R.conf) r/repos/extra-i686/r.desktop (from rev 243077, r/trunk/r.desktop) r/repos/extra-i686/r.install (from rev 243077, r/trunk/r.install) r/repos/extra-i686/r.png (from rev 243077, r/trunk/r.png) r/repos/extra-x86_64/PKGBUILD (from rev 243077, r/trunk/PKGBUILD) r/repos/extra-x86_64/R.conf (from rev 243077, r/trunk/R.conf) r/repos/extra-x86_64/r.desktop (from rev 243077, r/trunk/r.desktop) r/repos/extra-x86_64/r.install (from rev 243077, r/trunk/r.install) r/repos/extra-x86_64/r.png (from rev 243077, r/trunk/r.png) Deleted: r/repos/extra-i686/PKGBUILD r/repos/extra-i686/R.conf 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.conf r/repos/extra-x86_64/r.desktop r/repos/extra-x86_64/r.install r/repos/extra-x86_64/r.png ------------------------+ /PKGBUILD | 180 +++++++++++++++++++++++++++++++++++++++++++++++ /R.conf | 4 + /r.desktop | 22 +++++ /r.install | 32 ++++++++ extra-i686/PKGBUILD | 90 ----------------------- extra-i686/R.conf | 2 extra-i686/r.desktop | 11 -- extra-i686/r.install | 16 ---- extra-x86_64/PKGBUILD | 90 ----------------------- extra-x86_64/R.conf | 2 extra-x86_64/r.desktop | 11 -- extra-x86_64/r.install | 16 ---- 12 files changed, 238 insertions(+), 238 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-i686/PKGBUILD 2015-08-06 11:05:51 UTC (rev 243078) @@ -1,90 +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=3.2.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' - 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip') -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' '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' - 'R.conf') -sha1sums=('a6e9a6ca5ef186037a2f8ad2ccc8d7d0147640f1' - 'd7fa521345b230a4187d60d07d06ce4b6d573e3f' - 'a69a07ec363440efc18ce0a7f2af103375dea978' - '43668da6cfd1b4455a99f23e79e2059294dddac9') - -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 -} - -build() { - cd R-${pkgver} - ./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 - -# make libRmath.so - cd src/nmath/standalone - make shared -} - -package() { - cd R-${pkgver} - make DESTDIR="${pkgdir}" install - -# install libRmath.so - cd src/nmath/standalone - make 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 - - # 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" -} Copied: r/repos/extra-i686/PKGBUILD (from rev 243077, r/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-08-06 11:05:51 UTC (rev 243078) @@ -0,0 +1,90 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> +# Contributor: K. Piche <kpi...@rogers.com> + +pkgname=r +pkgver=3.2.1 +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' + 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip') +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' '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' + 'R.conf') +sha1sums=('74476c4d356f227bf0f17c8c21e63459861fbc93' + 'd7fa521345b230a4187d60d07d06ce4b6d573e3f' + 'a69a07ec363440efc18ce0a7f2af103375dea978' + '43668da6cfd1b4455a99f23e79e2059294dddac9') + +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 +} + +build() { + cd R-${pkgver} + ./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 + +# make libRmath.so + cd src/nmath/standalone + make shared +} + +package() { + cd R-${pkgver} + make DESTDIR="${pkgdir}" install + +# install libRmath.so + cd src/nmath/standalone + make 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 + + # 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" +} Deleted: extra-i686/R.conf =================================================================== --- extra-i686/R.conf 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-i686/R.conf 2015-08-06 11:05:51 UTC (rev 243078) @@ -1,2 +0,0 @@ -/usr/lib/R/lib - Copied: r/repos/extra-i686/R.conf (from rev 243077, r/trunk/R.conf) =================================================================== --- extra-i686/R.conf (rev 0) +++ extra-i686/R.conf 2015-08-06 11:05:51 UTC (rev 243078) @@ -0,0 +1,2 @@ +/usr/lib/R/lib + Deleted: extra-i686/r.desktop =================================================================== --- extra-i686/r.desktop 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-i686/r.desktop 2015-08-06 11:05:51 UTC (rev 243078) @@ -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=Science; Copied: r/repos/extra-i686/r.desktop (from rev 243077, r/trunk/r.desktop) =================================================================== --- extra-i686/r.desktop (rev 0) +++ extra-i686/r.desktop 2015-08-06 11:05:51 UTC (rev 243078) @@ -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=Science; Deleted: extra-i686/r.install =================================================================== --- extra-i686/r.install 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-i686/r.install 2015-08-06 11:05:51 UTC (rev 243078) @@ -1,16 +0,0 @@ -post_install() { - update-desktop-database -q - 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 -} - Copied: r/repos/extra-i686/r.install (from rev 243077, r/trunk/r.install) =================================================================== --- extra-i686/r.install (rev 0) +++ extra-i686/r.install 2015-08-06 11:05:51 UTC (rev 243078) @@ -0,0 +1,16 @@ +post_install() { + update-desktop-database -q + 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 +} + Deleted: extra-i686/r.png =================================================================== (Binary files differ) Copied: r/repos/extra-i686/r.png (from rev 243077, r/trunk/r.png) =================================================================== (Binary files differ) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-x86_64/PKGBUILD 2015-08-06 11:05:51 UTC (rev 243078) @@ -1,90 +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=3.2.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' - 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip') -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' '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' - 'R.conf') -sha1sums=('a6e9a6ca5ef186037a2f8ad2ccc8d7d0147640f1' - 'd7fa521345b230a4187d60d07d06ce4b6d573e3f' - 'a69a07ec363440efc18ce0a7f2af103375dea978' - '43668da6cfd1b4455a99f23e79e2059294dddac9') - -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 -} - -build() { - cd R-${pkgver} - ./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 - -# make libRmath.so - cd src/nmath/standalone - make shared -} - -package() { - cd R-${pkgver} - make DESTDIR="${pkgdir}" install - -# install libRmath.so - cd src/nmath/standalone - make 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 - - # 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" -} Copied: r/repos/extra-x86_64/PKGBUILD (from rev 243077, r/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-08-06 11:05:51 UTC (rev 243078) @@ -0,0 +1,90 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> +# Contributor: K. Piche <kpi...@rogers.com> + +pkgname=r +pkgver=3.2.1 +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' + 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip') +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' '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' + 'R.conf') +sha1sums=('74476c4d356f227bf0f17c8c21e63459861fbc93' + 'd7fa521345b230a4187d60d07d06ce4b6d573e3f' + 'a69a07ec363440efc18ce0a7f2af103375dea978' + '43668da6cfd1b4455a99f23e79e2059294dddac9') + +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 +} + +build() { + cd R-${pkgver} + ./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 + +# make libRmath.so + cd src/nmath/standalone + make shared +} + +package() { + cd R-${pkgver} + make DESTDIR="${pkgdir}" install + +# install libRmath.so + cd src/nmath/standalone + make 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 + + # 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" +} Deleted: extra-x86_64/R.conf =================================================================== --- extra-x86_64/R.conf 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-x86_64/R.conf 2015-08-06 11:05:51 UTC (rev 243078) @@ -1,2 +0,0 @@ -/usr/lib/R/lib - Copied: r/repos/extra-x86_64/R.conf (from rev 243077, r/trunk/R.conf) =================================================================== --- extra-x86_64/R.conf (rev 0) +++ extra-x86_64/R.conf 2015-08-06 11:05:51 UTC (rev 243078) @@ -0,0 +1,2 @@ +/usr/lib/R/lib + Deleted: extra-x86_64/r.desktop =================================================================== --- extra-x86_64/r.desktop 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-x86_64/r.desktop 2015-08-06 11:05:51 UTC (rev 243078) @@ -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=Science; Copied: r/repos/extra-x86_64/r.desktop (from rev 243077, r/trunk/r.desktop) =================================================================== --- extra-x86_64/r.desktop (rev 0) +++ extra-x86_64/r.desktop 2015-08-06 11:05:51 UTC (rev 243078) @@ -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=Science; Deleted: extra-x86_64/r.install =================================================================== --- extra-x86_64/r.install 2015-08-06 11:05:37 UTC (rev 243077) +++ extra-x86_64/r.install 2015-08-06 11:05:51 UTC (rev 243078) @@ -1,16 +0,0 @@ -post_install() { - update-desktop-database -q - 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 -} - Copied: r/repos/extra-x86_64/r.install (from rev 243077, r/trunk/r.install) =================================================================== --- extra-x86_64/r.install (rev 0) +++ extra-x86_64/r.install 2015-08-06 11:05:51 UTC (rev 243078) @@ -0,0 +1,16 @@ +post_install() { + update-desktop-database -q + 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 +} + Deleted: extra-x86_64/r.png =================================================================== (Binary files differ) Copied: r/repos/extra-x86_64/r.png (from rev 243077, r/trunk/r.png) =================================================================== (Binary files differ)