Update R to version 2.8.0. Diff from Daniel Dickman <didickman@gmail.com>

with some tweaks from me.
This commit is contained in:
mbalmer 2008-10-26 23:04:00 +00:00
parent 75dda415b6
commit a6d9b896ef
8 changed files with 246 additions and 92 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.29 2008/09/10 20:50:31 martynas Exp $
# $OpenBSD: Makefile,v 1.30 2008/10/26 23:04:00 mbalmer Exp $
SHARED_ONLY= Yes
COMMENT= clone of S, a powerful math/statistics/graphics language
DISTNAME= R-2.6.2
PKGNAME= ${DISTNAME}p3
SHARED_LIBS= Rlapack 26.2 \
Rblas 26.2
DISTNAME= R-2.8.0
SHARED_LIBS= Rlapack 28.0 \
Rblas 28.0
CATEGORIES= math
HOMEPAGE= http://www.r-project.org/

View File

@ -1,5 +1,5 @@
MD5 (R-2.6.2.tar.gz) = EJnL8CxiTOtFnZu8TQ0USA==
RMD160 (R-2.6.2.tar.gz) = eVbChKrTwtT8hdVmtF4rowjf/vs=
SHA1 (R-2.6.2.tar.gz) = PQaxLL8dqyXd11lSIVfmzGqOrhk=
SHA256 (R-2.6.2.tar.gz) = c2RBW7KzghEKC5TEyJSxx7AyVh2tixRWzCc4KtSW/gM=
SIZE (R-2.6.2.tar.gz) = 15569391
MD5 (R-2.8.0.tar.gz) = UhPJZErsmEJ4tmnfGmOizg==
RMD160 (R-2.8.0.tar.gz) = Hh/Xx2rxUPINQD+whc16yNkJ61U=
SHA1 (R-2.8.0.tar.gz) = rUg7LPIF4liRs3wQn5P5X+ASoxQ=
SHA256 (R-2.8.0.tar.gz) = PxJZh+2YjMxzI02kwNrujHnqyBr/ZuENnK65YW13wZ0=
SIZE (R-2.8.0.tar.gz) = 16558443

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2008/07/26 14:59:45 martynas Exp $
--- configure.orig Wed Jan 30 12:43:09 2008
+++ configure Sat Jul 26 13:46:26 2008
@@ -63184,7 +63184,7 @@ LIBTHREAD!$LIBTHREAD$ac_delim
$OpenBSD: patch-configure,v 1.9 2008/10/26 23:04:00 mbalmer Exp $
--- configure.orig Mon Oct 20 08:12:53 2008
+++ configure Sat Oct 25 22:43:34 2008
@@ -60660,7 +60660,7 @@ LIBTHREAD!$LIBTHREAD$ac_delim
LTLIBTHREAD!$LTLIBTHREAD$ac_delim
LIBMULTITHREAD!$LIBMULTITHREAD$ac_delim
LTLIBMULTITHREAD!$LTLIBMULTITHREAD$ac_delim
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2008/07/26 14:59:45 martynas Exp $
LTLIBICONV!$LTLIBICONV$ac_delim
INTLBISON!$INTLBISON$ac_delim
GLIBC21!$GLIBC21$ac_delim
@@ -63244,7 +63244,7 @@ GENCAT!$GENCAT$ac_delim
@@ -60679,7 +60679,7 @@ GENCAT!$GENCAT$ac_delim
INTLOBJS!$INTLOBJS$ac_delim
INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
INTLLIBS!$INTLLIBS$ac_delim

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_main_CommandLineArgs_c,v 1.4 2007/10/07 17:54:54 mbalmer Exp $
--- src/main/CommandLineArgs.c.orig Wed Sep 5 00:13:27 2007
+++ src/main/CommandLineArgs.c Sun Oct 7 09:58:19 2007
@@ -196,7 +196,7 @@ R_common_command_line(int *pac, char **argv, Rstart Rp
$OpenBSD: patch-src_main_CommandLineArgs_c,v 1.5 2008/10/26 23:04:00 mbalmer Exp $
--- src/main/CommandLineArgs.c.orig Sun Sep 21 22:05:26 2008
+++ src/main/CommandLineArgs.c Sat Oct 25 22:43:34 2008
@@ -192,7 +192,7 @@ R_common_command_line(int *pac, char **argv, Rstart Rp
!strcmp(*av, "-V") ||
!strcmp(*av, "-n") ||
!strcmp(*av, "-v")) {
@ -10,7 +10,7 @@ $OpenBSD: patch-src_main_CommandLineArgs_c,v 1.4 2007/10/07 17:54:54 mbalmer Exp
_("WARNING: option '%s' no longer supported\n"), *av);
R_ShowMessage(msg);
}
@@ -207,7 +207,7 @@ R_common_command_line(int *pac, char **argv, Rstart Rp
@@ -203,7 +203,7 @@ R_common_command_line(int *pac, char **argv, Rstart Rp
}
else p = &(*av)[12];
if (p == NULL) {
@ -19,7 +19,7 @@ $OpenBSD: patch-src_main_CommandLineArgs_c,v 1.4 2007/10/07 17:54:54 mbalmer Exp
_("WARNING: no value given for '%s'\n"), *av);
R_ShowMessage(msg);
break;
@@ -215,7 +215,7 @@ R_common_command_line(int *pac, char **argv, Rstart Rp
@@ -211,7 +211,7 @@ R_common_command_line(int *pac, char **argv, Rstart Rp
value = R_Decode2Long(p, &ierr);
if(ierr) {
if(ierr < 0)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_main_Rdynload_c,v 1.4 2007/10/07 17:54:54 mbalmer Exp $
--- src/main/Rdynload.c.orig Wed Sep 5 00:13:27 2007
+++ src/main/Rdynload.c Sun Oct 7 09:58:19 2007
@@ -533,7 +533,8 @@ static DllInfo* AddDLL(char *path, int asLocal, int no
$OpenBSD: patch-src_main_Rdynload_c,v 1.5 2008/10/26 23:04:00 mbalmer Exp $
--- src/main/Rdynload.c.orig Sun Sep 21 22:05:25 2008
+++ src/main/Rdynload.c Sat Oct 25 23:31:38 2008
@@ -533,7 +533,8 @@ static DllInfo* AddDLL(const char *path, int asLocal,
DeleteDLL(path);
if(CountDLL == MAX_NUM_DLLS) {
@ -43,7 +43,7 @@ $OpenBSD: patch-src_main_Rdynload_c,v 1.4 2007/10/07 17:54:54 mbalmer Exp $
+ strlcpy(DLLerror, _("could not allocate space for 'name'"),
+ sizeof(DLLname));
if(handle)
R_osDynSymbol->closeLibrary(handle);
R_osDynSymbol->closeLibrary(handle);
free(dpath);
return 0;
}

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_main_connections_c,v 1.7 2008/07/26 14:59:45 martynas Exp $
--- src/main/connections.c.orig Fri Feb 8 12:45:41 2008
+++ src/main/connections.c Sat Jul 26 13:46:26 2008
@@ -1980,7 +1980,7 @@ static int text_vfprintf(Rconnection con, const char *
$OpenBSD: patch-src_main_connections_c,v 1.8 2008/10/26 23:04:00 mbalmer Exp $
--- src/main/connections.c.orig Sun Sep 21 22:05:25 2008
+++ src/main/connections.c Sat Oct 25 22:48:16 2008
@@ -2269,7 +2269,7 @@ static int text_vfprintf(Rconnection con, const char *
b = R_alloc(res + already + 1, sizeof(char));
strcpy(b, this->lastline);
p = b + already;
- vsprintf(p, format, ap);
+ vsnprintf(p, res + already + 1, format, ap);
} else if(res < 0) { /* just a failure indication -- e.g. Windows */
} else if(res < 0) { /* just a failure indication */
#define NBUFSIZE (already + 100*BUFSIZE)
usedRalloc = TRUE;
@@ -3938,7 +3938,8 @@ static Rboolean gzcon_open(Rconnection con)
@@ -4370,7 +4370,8 @@ static Rboolean gzcon_open(Rconnection con)
if(con->canread) {
/* read header */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_main_gram_y,v 1.4 2007/10/07 17:54:54 mbalmer Exp $
--- src/main/gram.y.orig Wed Sep 5 00:13:27 2007
+++ src/main/gram.y Sun Oct 7 09:58:19 2007
@@ -173,7 +173,7 @@ static size_t ucstomb(char *s, const wchar_t wc, mbsta
$OpenBSD: patch-src_main_gram_y,v 1.5 2008/10/26 23:04:00 mbalmer Exp $
--- src/main/gram.y.orig Tue Oct 7 02:05:09 2008
+++ src/main/gram.y Sat Oct 25 22:43:34 2008
@@ -99,7 +99,7 @@ static PROTECT_INDEX srindex;
static int mbcs_get_next(int c, wchar_t *wc)
{

File diff suppressed because it is too large Load Diff