Dear useRs, update math/R 3.4.4 -> 3.5.0
- Remove MAP_STACK patch as mmap() no longer needs to be used (https://marc.info/?l=openbsd-cvs&m=152440172417443&w=2). - Regenerate existing configure patch - Add pcre2-8 to WANTLIB - /usr/src/lib/check_sym shows removed symbols in libR.so so bump major in SHARED_LIBS `make test` still fails for `tan(1+1000i)` (see https://marc.info/?l=openbsd-tech&m=150737856618497&w=2 for details). OK? Best regards, Ingo Index: Makefile =================================================================== RCS file: /cvs/ports/math/R/Makefile,v retrieving revision 1.98 diff -u -p -r1.98 Makefile --- Makefile 17 Mar 2018 05:15:09 -0000 1.98 +++ Makefile 23 Apr 2018 12:23:19 -0000 @@ -1,9 +1,9 @@ # $OpenBSD: Makefile,v 1.98 2018/03/17 05:15:09 feinerer Exp $ COMMENT= powerful math/statistics/graphics language -DISTNAME= R-3.4.4 +DISTNAME= R-3.5.0 -SO_VERSION= 33.0 +SO_VERSION= 34.0 .for _lib in R Rblas Rlapack SHARED_LIBS += ${_lib} ${SO_VERSION} .endfor @@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += ${COMPILER_LIBCXX} ${MODTK_WANTLIB} WANTLIB += ICE SM X11 Xext Xmu Xss Xt bz2 c cairo crypto curl curses glib-2.0 WANTLIB += gobject-2.0 iconv icui18n icuuc intl jpeg lzma m -WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pcre png readline ssl tiff z +WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pcre pcre2-8 png readline ssl tiff z MASTER_SITES= https://cran.r-project.org/src/base/R-3/ \ http://cran.at.r-project.org/src/base/R-3/ \ @@ -50,6 +50,7 @@ LIB_DEPENDS= ${MODTK_LIB_DEPENDS} \ archivers/xz \ devel/glib2 \ devel/pango \ + devel/pcre2 \ graphics/cairo \ graphics/jpeg \ graphics/png \ Index: distinfo =================================================================== RCS file: /cvs/ports/math/R/distinfo,v retrieving revision 1.38 diff -u -p -r1.38 distinfo --- distinfo 17 Mar 2018 05:15:09 -0000 1.38 +++ distinfo 23 Apr 2018 12:23:19 -0000 @@ -1,2 +1,2 @@ -SHA256 (R-3.4.4.tar.gz) = s+l9L6tyVtHGVcQHWTRyW6HNfLkjckChG7Isza2WAzc= -SIZE (R-3.4.4.tar.gz) = 30474612 +SHA256 (R-3.5.0.tar.gz) = /RclU14heX09n+qJY9mb4LpMOuytzwgbQ+JhRYtBaHA= +SIZE (R-3.5.0.tar.gz) = 30675040 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/math/R/patches/patch-configure,v retrieving revision 1.34 diff -u -p -r1.34 patch-configure --- patches/patch-configure 17 Mar 2018 05:15:09 -0000 1.34 +++ patches/patch-configure 23 Apr 2018 12:23:19 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.34 2018/03 Index: configure --- configure.orig +++ configure -@@ -40313,8 +40313,8 @@ fi +@@ -38967,8 +38967,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 -@@ -40329,7 +40329,7 @@ else +@@ -38983,7 +38983,7 @@ else #include <zlib.h> int main() { #ifdef ZLIB_VERNUM Index: patches/patch-src_main_main_c =================================================================== RCS file: patches/patch-src_main_main_c diff -N patches/patch-src_main_main_c --- patches/patch-src_main_main_c 17 Mar 2018 05:15:09 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_main_main_c,v 1.10 2018/03/17 05:15:09 feinerer Exp $ - -Allocate stack with MAP_STACK to pass stack-register checking. - -Index: src/main/main.c ---- src/main/main.c.orig -+++ src/main/main.c -@@ -19,6 +19,8 @@ - * https://www.R-project.org/Licenses/ - */ - -+#include <sys/mman.h> -+ - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif -@@ -643,7 +645,8 @@ static void init_signal_handlers(void) - { - /* <FIXME> may need to reinstall this if we do recover. */ - struct sigaction sa; -- signal_stack = malloc(SIGSTKSZ + R_USAGE); -+ signal_stack = mmap(NULL, SIGSTKSZ + R_USAGE, PROT_WRITE | PROT_READ, -+ MAP_PRIVATE | MAP_ANON | MAP_STACK, -1, 0); - if (signal_stack != NULL) { - sigstk.ss_sp = signal_stack; - sigstk.ss_size = SIGSTKSZ + R_USAGE; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/math/R/pkg/PLIST,v retrieving revision 1.36 diff -u -p -r1.36 PLIST --- pkg/PLIST 2 Jul 2017 05:18:42 -0000 1.36 +++ pkg/PLIST 23 Apr 2018 12:23:20 -0000 @@ -42,6 +42,7 @@ lib/R/etc/repositories lib/R/include/ lib/R/include/R.h lib/R/include/R_ext/ +lib/R/include/R_ext/Altrep.h lib/R/include/R_ext/Applic.h lib/R/include/R_ext/Arith.h lib/R/include/R_ext/BLAS.h @@ -473,6 +474,7 @@ lib/R/library/cluster/po/ko/LC_MESSAGES/ lib/R/library/cluster/po/pl/ lib/R/library/cluster/po/pl/LC_MESSAGES/ lib/R/library/cluster/po/pl/LC_MESSAGES/R-cluster.mo +lib/R/library/cluster/test-tools.R lib/R/library/codetools/ lib/R/library/codetools/DESCRIPTION lib/R/library/codetools/INDEX
