commit 9f7f59766000744ebc4819db6c869489e5317cec Author: Tim Biermann <tbier@posteo.de> Date: Fri Aug 16 16:02:42 2019 +0000 r: clean up dependencies diff --git a/r/.footprint b/r/.footprint index f29730ac..3c3d705c 100644 --- a/r/.footprint +++ b/r/.footprint @@ -778,7 +778,6 @@ drwxr-xr-x root/root usr/lib/R/library/grDevices/icc/ -rw-r--r-- root/root usr/lib/R/library/grDevices/icc/srgb -rw-r--r-- root/root usr/lib/R/library/grDevices/icc/srgb.flate drwxr-xr-x root/root usr/lib/R/library/grDevices/libs/ --rwxr-xr-x root/root usr/lib/R/library/grDevices/libs/cairo.so -rwxr-xr-x root/root usr/lib/R/library/grDevices/libs/grDevices.so drwxr-xr-x root/root usr/lib/R/library/graphics/ -rw-r--r-- root/root usr/lib/R/library/graphics/DESCRIPTION @@ -1849,8 +1848,6 @@ drwxr-xr-x root/root usr/lib/R/library/utils/misc/ -rw-r--r-- root/root usr/lib/R/library/utils/misc/exDIF.csv -rw-r--r-- root/root usr/lib/R/library/utils/misc/exDIF.dif drwxr-xr-x root/root usr/lib/R/modules/ --rwxr-xr-x root/root usr/lib/R/modules/R_X11.so --rwxr-xr-x root/root usr/lib/R/modules/R_de.so -rwxr-xr-x root/root usr/lib/R/modules/internet.so -rwxr-xr-x root/root usr/lib/R/modules/lapack.so -rwxr-xr-x root/root usr/lib/libRmath.so diff --git a/r/.signature b/r/.signature index bc8bd9b3..2e73f869 100644 --- a/r/.signature +++ b/r/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33/Z3cMFn6ucuCN2VBe6sWuaBCpanKglgGOuWkIfndGTHcG7FGl8yiUrptUGux3WxNWvHQyKjLQZ2ZjvAdW1fQg= -SHA256 (Pkgfile) = 455d13f963cd02017185e879d68c095d8e750208f61d374e7b9acc506a5689a5 -SHA256 (.footprint) = 3d941e7963f088fd1445b55cd7a99c12a4ea6f498790073e672ed28f77f50401 +RWSagIOpLGJF3xgy83CtPVrOMcf6cZOJ5elrExcud4eUyusViI6zjuGdsWN0RePaq9sUXoN4yYEFbaqQvDprLGhZBrNCr9JdUAc= +SHA256 (Pkgfile) = f53c14e3a59d436e7393c6da5f248f4969c1d82b9a674fed1540a7ed5df4cdcf +SHA256 (.footprint) = 62858cf2eb104a51165ffaf00c60fe586bc24787ae76b456e34868ec36c63cfd SHA256 (R-3.6.1.tar.gz) = 5baa9ebd3e71acecdcc3da31d9042fb174d55a42829f8315f2457080978b1389 SHA256 (r.desktop) = 25b01ea93fa704884b65ba002d44d4e99725bd826997e8c73b6467df9f23c798 SHA256 (r.png) = 465b623f15d8144fb30b52791047a22302c275d51f749d8732454e4496c1a989 diff --git a/r/Pkgfile b/r/Pkgfile index 4b96f64f..eb146fc3 100644 --- a/r/Pkgfile +++ b/r/Pkgfile @@ -1,27 +1,26 @@ # Description: R is a free software environment for statistical computing and graphics # URL: https://www.r-project.org/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: brotli gnutls graphite2 icu keyutils krb5 libpcre2 libpsl libwebp openblas openldap pango rtmpdump xorg-libxmu zstd openjdk8 +# Depends on: openblas zstd +# Optional: texlive tk name=r version=3.6.1 release=1 source=(https://cran.r-project.org/src/base/R-3/R-$version.tar.gz -r.desktop -r.png -R.conf -) + r.desktop r.png R.conf) build() { cd R-$version + [[ -e /usr/lib/pkgconfig/tk.pc ]] && PKGMK_R+=" --with-x=yes" || PKGMK_R+=" --with-x=no" sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in - ./configure --prefix=/usr \ + ./configure $PKGMK_R \ + --prefix=/usr \ --libdir=/usr/lib \ --sysconfdir=/etc/R \ --datarootdir=/usr/share \ rsharedir=/usr/share/R/ \ rincludedir=/usr/include/R/ \ - --with-x \ --enable-R-shlib \ --with-lapack \ --with-blas \ @@ -66,6 +65,6 @@ build() { -iname '*LICENSE*' -o \ -iname '*CHANGELOG*' \ \) -exec rm '{}' \+ || true - #doh! don't remove INSTALl or you won't be able to install R packages + #doh! don't remove INSTALL or you won't be able to install R packages #-iname '*INSTALL*' -o \ }