Update to R 3.3.0
"Go ahead" pirofti@
This commit is contained in:
feinerer
parent
d0d6b4266f
commit
28833f5a81
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.82 2016/04/16 10:04:36 feinerer Exp $
|
||||
# $OpenBSD: Makefile,v 1.83 2016/05/06 08:52:28 feinerer Exp $
|
||||
|
||||
COMMENT= powerful math/statistics/graphics language
|
||||
DISTNAME= R-3.2.5
|
||||
DISTNAME= R-3.3.0
|
||||
|
||||
SO_VERSION= 31.2
|
||||
SO_VERSION= 32.0
|
||||
.for _lib in R Rblas Rlapack
|
||||
SHARED_LIBS += ${_lib} ${SO_VERSION}
|
||||
.endfor
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (R-3.2.5.tar.gz) = YHRWctzl3cIBgG+ln21OC6ZVTY7XjQ+fDXmmKZePgLU=
|
||||
SIZE (R-3.2.5.tar.gz) = 29876312
|
||||
SHA256 (R-3.3.0.tar.gz) = klaxVLGlmT2ES+57GVXNScma1yzvA8zjzRvcoTEDEeQ=
|
||||
SIZE (R-3.3.0.tar.gz) = 29820067
|
||||
|
||||
@ -1,29 +1,24 @@
|
||||
$OpenBSD: patch-configure,v 1.27 2015/12/14 16:49:02 feinerer Exp $
|
||||
$OpenBSD: patch-configure,v 1.28 2016/05/06 08:52:28 feinerer Exp $
|
||||
|
||||
Unbreak build on powerpc (relocation truncated to fit: R_PPC_GOT16...)
|
||||
|
||||
--- configure.orig Thu Dec 10 15:45:13 2015
|
||||
+++ configure Thu Dec 10 15:47:05 2015
|
||||
@@ -26576,6 +26576,22 @@ $as_echo "$as_me: WARNING: Use of flat namespace is re
|
||||
main_ldflags="${wl}-export-dynamic"
|
||||
shlib_ldflags="-shared -fPIC"
|
||||
fi
|
||||
+ case "${host_cpu}" in
|
||||
+ powerpc*)
|
||||
+ ## GCC -fpic limits to 2**16 on OpenBSD powerpc.
|
||||
+ ## Error message without -fPIC:
|
||||
+ ## relocation truncated to fit: R_PPC_GOT16...
|
||||
+ if test "${GCC}" = yes; then
|
||||
+ cpicflags="-fPIC"
|
||||
+ fi
|
||||
+ if test "${G77}" = yes; then
|
||||
+ fpicflags="-fPIC"
|
||||
+ fi
|
||||
+ if test "${GXX}" = yes; then
|
||||
+ cxxpicflags="-fPIC"
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
osf*)
|
||||
cpicflags=
|
||||
--- configure.orig Tue May 3 12:17:51 2016
|
||||
+++ configure Tue May 3 12:19:33 2016
|
||||
@@ -35481,8 +35481,8 @@ fi
|
||||
|
||||
fi
|
||||
if test "${have_zlib}" = yes; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if zlib version >= 1.2.5" >&5
|
||||
-$as_echo_n "checking if zlib version >= 1.2.5... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if zlib version >= 1.2.3" >&5
|
||||
+$as_echo_n "checking if zlib version >= 1.2.3... " >&6; }
|
||||
if ${r_cv_header_zlib_h+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
@@ -35499,7 +35499,7 @@ int main() {
|
||||
#ifdef ZLIB_VERSION
|
||||
/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
|
||||
version on the master site zlib.net */
|
||||
- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
|
||||
+ exit(strncmp(ZLIB_VERSION, "1.2.3", 5) < 0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-src_library_tools_R_news_R,v 1.1 2016/03/01 17:57:06 feinerer Exp $
|
||||
--- src/library/tools/R/news.R.orig Tue Mar 1 18:28:22 2016
|
||||
+++ src/library/tools/R/news.R Tue Mar 1 18:29:09 2016
|
||||
@@ -372,7 +372,9 @@ function(f, pdf_file)
|
||||
close(out)
|
||||
od <- setwd(dirname(f3))
|
||||
on.exit(setwd(od))
|
||||
- texi2pdf("NEWS.tex", quiet = TRUE)
|
||||
+ ## avoid broken texi2pdf scripts: this is simple LaTeX
|
||||
+ ## and emulation suffices
|
||||
+ texi2pdf("NEWS.tex", quiet = TRUE, texi2dvi = "emulation")
|
||||
setwd(od); on.exit()
|
||||
invisible(file.copy(file.path(dirname(f3), "NEWS.pdf"),
|
||||
pdf_file, overwrite = TRUE))
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.29 2016/03/19 11:42:57 feinerer Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.30 2016/05/06 08:52:28 feinerer Exp $
|
||||
bin/R
|
||||
@bin bin/Rscript
|
||||
lib/R/
|
||||
@ -1339,7 +1339,6 @@ lib/R/library/survival/Meta/package.rds
|
||||
lib/R/library/survival/Meta/vignette.rds
|
||||
lib/R/library/survival/NAMESPACE
|
||||
lib/R/library/survival/NEWS.Rd
|
||||
lib/R/library/survival/NEWS.Rd.orig
|
||||
lib/R/library/survival/R/
|
||||
lib/R/library/survival/R/survival
|
||||
lib/R/library/survival/R/survival.rdb
|
||||
@ -1366,6 +1365,8 @@ lib/R/library/survival/doc/tests.pdf
|
||||
lib/R/library/survival/doc/timedep.R
|
||||
lib/R/library/survival/doc/timedep.Rnw
|
||||
lib/R/library/survival/doc/timedep.pdf
|
||||
lib/R/library/survival/doc/validate.R
|
||||
lib/R/library/survival/doc/validate.Rnw
|
||||
lib/R/library/survival/doc/validate.pdf
|
||||
lib/R/library/survival/help/
|
||||
lib/R/library/survival/help/AnIndex
|
||||
@ -1778,6 +1779,8 @@ lib/R/library/utils/Meta/package.rds
|
||||
lib/R/library/utils/Meta/vignette.rds
|
||||
lib/R/library/utils/NAMESPACE
|
||||
lib/R/library/utils/R/
|
||||
lib/R/library/utils/R/sysdata.rdb
|
||||
lib/R/library/utils/R/sysdata.rdx
|
||||
lib/R/library/utils/R/utils
|
||||
lib/R/library/utils/R/utils.rdb
|
||||
lib/R/library/utils/R/utils.rdx
|
||||
@ -1875,6 +1878,8 @@ share/doc/R/html/
|
||||
share/doc/R/html/NEWS.2.html
|
||||
share/doc/R/html/NEWS.html
|
||||
share/doc/R/html/R.css
|
||||
share/doc/R/html/Rlogo.pdf
|
||||
share/doc/R/html/Rlogo.svg
|
||||
share/doc/R/html/Search.html
|
||||
share/doc/R/html/SearchOn.html
|
||||
share/doc/R/html/about.html
|
||||
@ -1882,7 +1887,6 @@ share/doc/R/html/favicon.ico
|
||||
share/doc/R/html/index.html
|
||||
share/doc/R/html/left.jpg
|
||||
share/doc/R/html/logo.jpg
|
||||
share/doc/R/html/logosm.jpg
|
||||
share/doc/R/html/packages-head-utf8.html
|
||||
share/doc/R/html/packages.html
|
||||
share/doc/R/html/resources.html
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user