cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to R 3.6.0

Browse Source 
OK kn@
This commit is contained in:
feinerer 2019-04-29 08:52:47 +00:00
parent 14bf336c20
commit c0084e8158
5 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
math/R/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.108 2019/04/28 21:08:26 naddy Exp $
# $OpenBSD: Makefile,v 1.109 2019/04/29 08:52:47 feinerer Exp $
COMMENT= powerful math/statistics/graphics language
DISTNAME= R-3.5.3
REVISION= 0
DISTNAME= R-3.6.0
SO_VERSION= 34.2
SO_VERSION= 35.0
.for _lib in R Rblas Rlapack
SHARED_LIBS += ${_lib} ${SO_VERSION}
.endfor
@ -80,14 +79,13 @@ CONFIGURE_ARGS= --disable-java \
--with-tcl-config=${MODTCL_CONFIG} \
--with-tk-config=${MODTK_CONFIG}
CONFIGURE_ENV= F77="${MODFORTRAN_COMPILER}" \
FC="${MODFORTRAN_COMPILER}" \
CONFIGURE_ENV= FC="${MODFORTRAN_COMPILER}" \
FFLAGS="${FFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib/R/lib" \
LIBnn=lib \
MAKEINFO="${LOCALBASE}/bin/gtexi2any" \
R_DYLIB_VERSION=${SO_VERSION} \
TEXI2ANY="${LOCALBASE}/bin/gtexi2any" \
TEXI2DVI="${LOCALBASE}/bin/gtexi2dvi" \
rdocdir="${PREFIX}/share/doc/R"

4
math/R/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (R-3.5.3.tar.gz) = K/o3t71wnwA9a4oXLd+20D3dLWctYJZDlSMDn3qOZ4w=
SIZE (R-3.5.3.tar.gz) = 30205979
SHA256 (R-3.6.0.tar.gz) = NvysPkUmZhWOYkWcb8gQrcJHxxCe1xxbbDrV/Cv1dQk=
SIZE (R-3.6.0.tar.gz) = 30449618

6
math/R/patches/patch-configure
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure,v 1.37 2019/03/17 07:16:32 feinerer Exp $
$OpenBSD: patch-configure,v 1.38 2019/04/29 08:52:47 feinerer Exp $
Index: configure
--- configure.orig
+++ configure
@@ -42293,8 +42293,8 @@ fi
@@ -41796,8 +41796,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
@@ -42309,7 +42309,7 @@ else
@@ -41812,7 +41812,7 @@ else
#include <zlib.h>
int main() {
#ifdef ZLIB_VERNUM

32
math/R/patches/patch-src_modules_internet_libcurl_c
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-src_modules_internet_libcurl_c,v 1.1 2019/02/21 20:04:34 tb Exp $
Avoid use-after-free. Upstream SVN commit #76143.
Index: src/modules/internet/libcurl.c
--- src/modules/internet/libcurl.c.orig
+++ src/modules/internet/libcurl.c
@@ -641,12 +641,12 @@ in_do_curlDownload(SEXP call, SEXP op, SEXP args, SEXP
n_err += curlMultiCheckerrs(mhnd);
+ long status = 0L;
for (int i = 0; i < nurls; i++) {
if (out[i]) {
fclose(out[i]);
double dl;
curl_easy_getinfo(hnd[i], CURLINFO_SIZE_DOWNLOAD, &dl);
- long status;
curl_easy_getinfo(hnd[i], CURLINFO_RESPONSE_CODE, &status);
// should we do something about incomplete transfers?
if (status != 200 && dl == 0. && strchr(mode, 'w'))
@@ -655,10 +655,6 @@ in_do_curlDownload(SEXP call, SEXP op, SEXP args, SEXP
curl_multi_remove_handle(mhnd, hnd[i]);
curl_easy_cleanup(hnd[i]);
}
- // This can show an invalid read: can it be improved?
- long status = 0L;
- if(nurls == 1)
- curl_easy_getinfo(hnd[0], CURLINFO_RESPONSE_CODE, &status);
curl_multi_cleanup(mhnd);
if (!cacheOK) curl_slist_free_all(slist1);

10
math/R/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.41 2018/12/23 08:03:45 feinerer Exp $
@comment $OpenBSD: PLIST,v 1.42 2019/04/29 08:52:48 feinerer Exp $
bin/R
@bin bin/Rscript
lib/R/
@ -25,7 +25,6 @@ lib/R/bin/check
lib/R/bin/config
lib/R/bin/exec/
@bin lib/R/bin/exec/R
lib/R/bin/f77_f2c
lib/R/bin/javareconf
lib/R/bin/libtool
lib/R/bin/mkinstalldirs
@ -1168,6 +1167,8 @@ lib/R/library/rpart/doc/usercode.pdf
lib/R/library/rpart/help/
lib/R/library/rpart/help/AnIndex
lib/R/library/rpart/help/aliases.rds
lib/R/library/rpart/help/figures/
lib/R/library/rpart/help/figures/rpart.png
lib/R/library/rpart/help/paths.rds
lib/R/library/rpart/help/rpart.rdb
lib/R/library/rpart/help/rpart.rdx
@ -1399,6 +1400,9 @@ lib/R/library/survival/doc/population.pdf
lib/R/library/survival/doc/splines.R
lib/R/library/survival/doc/splines.Rnw
lib/R/library/survival/doc/splines.pdf
lib/R/library/survival/doc/survival.R
lib/R/library/survival/doc/survival.Rnw
lib/R/library/survival/doc/survival.pdf
lib/R/library/survival/doc/tests.R
lib/R/library/survival/doc/tests.Rnw
lib/R/library/survival/doc/tests.pdf
@ -1414,6 +1418,8 @@ lib/R/library/survival/doc/validate.pdf
lib/R/library/survival/help/
lib/R/library/survival/help/AnIndex
lib/R/library/survival/help/aliases.rds
lib/R/library/survival/help/figures/
lib/R/library/survival/help/figures/logo.png
lib/R/library/survival/help/paths.rds
lib/R/library/survival/help/survival.rdb
lib/R/library/survival/help/survival.rdx