On Sun, May 17, 2020 at 09:55:31AM +0200, Ingo Feinerer wrote: > Dear useRs, > > update math/R 3.6.3 -> 4.0.0 > > - SHARED_LIBS: increase major version number due to removals in dynamic > export changes in libR.so. > > - Sync WANTLIB as PCRE2 is now preferred (see > https://stat.ethz.ch/pipermail/r-announce/2020/000653.html for details). > > - Clean up MASTER_SITES as a few sites time out (for details see > https://cran.r-project.org/mirmon_report.html). Use the main site and the > new > cloud CDN site as backup instead. > > - Update line numbers in patch. > > - Recommend to use (optional) Java 11 instead of 1.8 in README. > > Works for me on amd64 since a few weeks (released on 24 April). > > (Note: you need to reinstall your R packages as this is a major R update.) > > OK?
OK > > Best regards, > Ingo > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/math/R/Makefile,v > retrieving revision 1.114 > diff -u -p -r1.114 Makefile > --- Makefile 2 Mar 2020 14:07:05 -0000 1.114 > +++ Makefile 17 May 2020 07:33:04 -0000 > @@ -1,9 +1,9 @@ > # $OpenBSD: Makefile,v 1.114 2020/03/02 14:07:05 feinerer Exp $ > > COMMENT= powerful math/statistics/graphics language > -DISTNAME= R-3.6.3 > +DISTNAME= R-4.0.0 > > -SO_VERSION= 36.1 > +SO_VERSION= 37.0 > .for _lib in R Rblas Rlapack > SHARED_LIBS += ${_lib} ${SO_VERSION} > .endfor > @@ -19,20 +19,12 @@ PERMIT_PACKAGE= Yes > WANTLIB += ${COMPILER_LIBCXX} ${MODTK_WANTLIB} ${MODFORTRAN_WANTLIB} > WANTLIB += ICE SM X11 Xext Xmu Xss Xt bz2 c cairo crypto curl > WANTLIB += glib-2.0 gobject-2.0 harfbuzz iconv icui18n icuuc intl jpeg lzma m > -WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pcre pcre2-8 png readline ssl > tiff z > +WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pcre2-8 png readline ssl tiff z > > COMPILER = base-clang ports-gcc base-gcc > > -MASTER_SITES= https://cran.r-project.org/src/base/R-3/ \ > - http://cran.at.r-project.org/src/base/R-3/ \ > - http://cran.br.r-project.org/src/base/R-3/ \ > - http://cran.ch.r-project.org/src/base/R-3/ \ > - http://cran.dk.r-project.org/src/base/R-3/ \ > - http://cran.es.r-project.org/src/base/R-3/ \ > - http://cran.stat.ucla.edu/src/base/R-3/ \ > - http://cran.uk.r-project.org/src/base/R-3/ \ > - http://cran.us.r-project.org/src/base/R-3/ \ > - http://probability.ca/cran/src/base/R-3/ > +MASTER_SITES= https://cran.r-project.org/src/base/R-4/ \ > + https://cloud.r-project.org/src/base/R-4/ > > MODULES= fortran \ > x11/tk > Index: distinfo > =================================================================== > RCS file: /cvs/ports/math/R/distinfo,v > retrieving revision 1.46 > diff -u -p -r1.46 distinfo > --- distinfo 2 Mar 2020 14:07:05 -0000 1.46 > +++ distinfo 17 May 2020 07:33:04 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (R-3.6.3.tar.gz) = iTApkNjordU24SEl7FkdaVECLPhHWGGzaQvIvxzvqo8= > -SIZE (R-3.6.3.tar.gz) = 33308185 > +SHA256 (R-4.0.0.tar.gz) = Br6wKRtWmXhITrDctdIzlmXsdFc3vftOhz56WnVJKUA= > +SIZE (R-4.0.0.tar.gz) = 33173947 > Index: patches/patch-configure > =================================================================== > RCS file: /cvs/ports/math/R/patches/patch-configure,v > retrieving revision 1.40 > diff -u -p -r1.40 patch-configure > --- patches/patch-configure 18 Dec 2019 13:05:48 -0000 1.40 > +++ patches/patch-configure 17 May 2020 07:33:04 -0000 > @@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.40 2019/12 > Index: configure > --- configure.orig > +++ configure > -@@ -42057,8 +42057,8 @@ fi > +@@ -45219,8 +45219,8 @@ fi > > fi > if test "${have_zlib}" = yes; then > @@ -14,7 +14,7 @@ Index: configure > if ${r_cv_header_zlib_h+:} false; then : > $as_echo_n "(cached) " >&6 > else > -@@ -42073,7 +42073,7 @@ else > +@@ -45235,7 +45235,7 @@ else > #include <zlib.h> > int main() { > #ifdef ZLIB_VERNUM > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/math/R/pkg/PLIST,v > retrieving revision 1.43 > diff -u -p -r1.43 PLIST > --- pkg/PLIST 18 Dec 2019 13:05:48 -0000 1.43 > +++ pkg/PLIST 17 May 2020 07:33:05 -0000 > @@ -415,6 +415,9 @@ lib/R/library/class/po/en@quot/LC_MESSAG > lib/R/library/class/po/fr/ > lib/R/library/class/po/fr/LC_MESSAGES/ > lib/R/library/class/po/fr/LC_MESSAGES/R-class.mo > +lib/R/library/class/po/it/ > +lib/R/library/class/po/it/LC_MESSAGES/ > +lib/R/library/class/po/it/LC_MESSAGES/R-class.mo > lib/R/library/class/po/ko/ > lib/R/library/class/po/ko/LC_MESSAGES/ > lib/R/library/class/po/ko/LC_MESSAGES/R-class.mo > @@ -1923,12 +1926,16 @@ share/doc/R/NEWS > share/doc/R/NEWS.0 > share/doc/R/NEWS.1 > share/doc/R/NEWS.2 > +share/doc/R/NEWS.2.rds > +share/doc/R/NEWS.3 > +share/doc/R/NEWS.3.rds > share/doc/R/NEWS.pdf > share/doc/R/NEWS.rds > share/doc/R/RESOURCES > share/doc/R/THANKS > share/doc/R/html/ > share/doc/R/html/NEWS.2.html > +share/doc/R/html/NEWS.3.html > share/doc/R/html/NEWS.html > share/doc/R/html/R.css > share/doc/R/html/Rlogo.pdf > Index: pkg/README > =================================================================== > RCS file: /cvs/ports/math/R/pkg/README,v > retrieving revision 1.9 > diff -u -p -r1.9 README > --- pkg/README 4 Sep 2018 12:46:16 -0000 1.9 > +++ pkg/README 17 May 2020 07:33:05 -0000 > @@ -11,7 +11,7 @@ libraries are located. > > Running: > > -# export JAVA_HOME=${LOCALBASE}/jdk-1.8.0 > +# export JAVA_HOME=${LOCALBASE}/jdk-11 > # ${TRUEPREFIX}/bin/R CMD javareconf > > as root, will update both ${TRUEPREFIX}/lib/R/etc/Makeconf and