Update to version 2.1.1 and take maintainership.
For more information, see release information on http://www.r-project.org/ with help from bernd@ and ok robert@,bernd@
This commit is contained in:
mbalmer
parent
3ba21fd18d
commit
a722685d81
@ -1,12 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2004/12/27 07:41:44 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2005/10/08 09:47:36 mbalmer Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= "clone of S, a powerful math/statistics/graphics language"
|
||||
DISTNAME= R-1.9.1
|
||||
DISTNAME= R-2.1.1
|
||||
CATEGORIES= math
|
||||
HOMEPAGE= http://www.r-project.org/
|
||||
|
||||
MAINTAINER= Marc Balmer <mbalmer@openbsd.org>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
@ -14,22 +16,23 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= ICE SM X11 c g2c m ncurses readline z
|
||||
|
||||
MASTER_SITES= http://cran.r-project.org/src/base/R-1/ \
|
||||
http://cran.uk.r-project.org/src/base/R-1/ \
|
||||
http://cran.us.r-project.org/src/base/R-1/ \
|
||||
http://cran.dk.r-project.org/src/base/R-1/
|
||||
EXTRACT_SUFX= .tgz
|
||||
MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \
|
||||
http://cran.uk.r-project.org/src/base/R-2/ \
|
||||
http://cran.us.r-project.org/src/base/R-2/ \
|
||||
http://cran.dk.r-project.org/src/base/R-2/
|
||||
|
||||
USE_X11= Yes
|
||||
MODULES= devel/gettext
|
||||
LIB_DEPENDS= bz2.10::archivers/bzip2 \
|
||||
jpeg.62::graphics/jpeg \
|
||||
png.2::graphics/png \
|
||||
pcre.0::devel/pcre
|
||||
pcre.0::devel/pcre \
|
||||
tcl84.1::lang/tcl/8.4 \
|
||||
tk84.1::x11/tk/8.4
|
||||
|
||||
CONFIGURE_STYLE=gnu dest
|
||||
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/tools
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--with-readline --without-tcltk \
|
||||
--with-readline --with-tcltk \
|
||||
--with-zlib --with-bzlib --with-pcre
|
||||
CONFIGURE_ENV= FFLAGS="${FFLAGS}"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (R-1.9.1.tgz) = c8201425506e5c077ef1936e19ea2f51
|
||||
RMD160 (R-1.9.1.tgz) = 98ae0db3c5ab624192d7ad3ef79d0067d821e918
|
||||
SHA1 (R-1.9.1.tgz) = 3423a1810a6a8d838554e49d54d44b05f5647085
|
||||
SIZE (R-1.9.1.tgz) = 9591217
|
||||
MD5 (R-2.1.1.tar.gz) = e755b0ba5851ec261000af6b5c510335
|
||||
RMD160 (R-2.1.1.tar.gz) = a850608eb5edb90f426331fd2596ba8fc7175dce
|
||||
SHA1 (R-2.1.1.tar.gz) = e43f743c9ad4147f23cf89c771364168b078a0db
|
||||
SIZE (R-2.1.1.tar.gz) = 12644376
|
||||
|
||||
21
math/R/patches/patch-configure
Normal file
21
math/R/patches/patch-configure
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-configure,v 1.3 2005/10/08 09:47:37 mbalmer Exp $
|
||||
--- configure.orig Fri Oct 7 15:27:50 2005
|
||||
+++ configure Fri Oct 7 15:28:31 2005
|
||||
@@ -46580,7 +46580,7 @@ s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF
|
||||
s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
|
||||
s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
|
||||
s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
|
||||
-s,@LIBICONV@,$LIBICONV,;t t
|
||||
+s,@LIBICONV@,$LTLIBICONV,;t t
|
||||
s,@LTLIBICONV@,$LTLIBICONV,;t t
|
||||
s,@INTLBISON@,$INTLBISON,;t t
|
||||
s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
|
||||
@@ -46592,7 +46592,7 @@ s,@GENCAT@,$GENCAT,;t t
|
||||
s,@INTLOBJS@,$INTLOBJS,;t t
|
||||
s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
|
||||
s,@INTLLIBS@,$INTLLIBS,;t t
|
||||
-s,@LIBINTL@,$LIBINTL,;t t
|
||||
+s,@LIBINTL@,$LTLIBINTL,;t t
|
||||
s,@LTLIBINTL@,$LTLIBINTL,;t t
|
||||
s,@POSUB@,$POSUB,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
11
math/R/patches/patch-src_include_R_ext_eventloop_h
Normal file
11
math/R/patches/patch-src_include_R_ext_eventloop_h
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-src_include_R_ext_eventloop_h,v 1.1 2005/10/08 09:47:37 mbalmer Exp $
|
||||
--- src/include/R_ext/eventloop.h.orig Wed Aug 10 15:00:50 2005
|
||||
+++ src/include/R_ext/eventloop.h Wed Aug 10 15:01:10 2005
|
||||
@@ -24,6 +24,7 @@
|
||||
Needed at least on FreeBSD so that fd_set is defined.
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
+#include <sys/time.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
35
math/R/patches/patch-src_main_CommandLineArgs_c
Normal file
35
math/R/patches/patch-src_main_CommandLineArgs_c
Normal file
@ -0,0 +1,35 @@
|
||||
$OpenBSD: patch-src_main_CommandLineArgs_c,v 1.1 2005/10/08 09:47:37 mbalmer Exp $
|
||||
--- src/main/CommandLineArgs.c.orig Wed Aug 10 15:42:50 2005
|
||||
+++ src/main/CommandLineArgs.c Wed Aug 10 15:45:05 2005
|
||||
@@ -182,7 +182,7 @@ R_common_command_line(int *pac, char **a
|
||||
!strcmp(*av, "-V") ||
|
||||
!strcmp(*av, "-n") ||
|
||||
!strcmp(*av, "-v")) {
|
||||
- snprintf(msg, 1024,
|
||||
+ snprintf(msg, sizeof(msg),
|
||||
_("WARNING: option '%s' no longer supported\n"), *av);
|
||||
R_ShowMessage(msg);
|
||||
}
|
||||
@@ -193,7 +193,7 @@ R_common_command_line(int *pac, char **a
|
||||
}
|
||||
else p = &(*av)[12];
|
||||
if (p == NULL) {
|
||||
- snprintf(msg, 1024,
|
||||
+ snprintf(msg, sizeof(msg),
|
||||
_("WARNING: no value given for '%s'\n"), *av);
|
||||
R_ShowMessage(msg);
|
||||
break;
|
||||
@@ -201,11 +201,11 @@ R_common_command_line(int *pac, char **a
|
||||
value = R_Decode2Long(p, &ierr);
|
||||
if(ierr) {
|
||||
if(ierr < 0)
|
||||
- snprintf(msg, 1024,
|
||||
+ snprintf(msg, sizeof(msg),
|
||||
_("WARNING: '%s' value is invalid: ignored\n"),
|
||||
*av);
|
||||
else
|
||||
- sprintf(msg,
|
||||
+ snprintf(msg, sizeof(msg),
|
||||
_("WARNING: %s=%lu'%c': too large and ignored\n"),
|
||||
*av, (unsigned long) value,
|
||||
(ierr == 1) ? 'M': ((ierr == 2) ? 'K' : 'k'));
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_main_Makefile_in,v 1.2 2004/08/08 15:06:24 naddy Exp $
|
||||
--- src/main/Makefile.in.orig Sun Sep 21 02:13:10 2003
|
||||
+++ src/main/Makefile.in Mon Jul 26 19:13:19 2004
|
||||
@@ -88,7 +88,7 @@ R_bin_OBJECTS = $(OBJECTS)
|
||||
## -export-symbols SYMFILE.
|
||||
@USE_LIBTOOL_TRUE@R_bin_LDFLAGS = -export-dynamic
|
||||
## </FIXME>
|
||||
-R_bin_LDADD = @LIBOBJS@ @ALLOCA@ $(RLIBS) $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE)
|
||||
+R_bin_LDADD = @LIBOBJS@ @ALLOCA@ $(RLIBS) $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) -Wl,-E
|
||||
## <NOTE>
|
||||
## Automake would figure this out itself.
|
||||
R_bin_DEPENDENCIES = @LIBOBJS@ @ALLOCA@ $(RLIBS) @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
|
||||
55
math/R/patches/patch-src_main_Rdynload_c
Normal file
55
math/R/patches/patch-src_main_Rdynload_c
Normal file
@ -0,0 +1,55 @@
|
||||
$OpenBSD: patch-src_main_Rdynload_c,v 1.1 2005/10/08 09:47:37 mbalmer Exp $
|
||||
--- src/main/Rdynload.c.orig Fri May 20 14:51:46 2005
|
||||
+++ src/main/Rdynload.c Wed Aug 10 16:11:19 2005
|
||||
@@ -496,7 +496,8 @@ static DllInfo* AddDLL(char *path, int a
|
||||
|
||||
DeleteDLL(path);
|
||||
if(CountDLL == MAX_NUM_DLLS) {
|
||||
- strcpy(DLLerror, _("Maximal number of DLLs reached..."));
|
||||
+ strlcpy(DLLerror, _("Maximal number of DLLs reached..."),
|
||||
+ sizeof(DLLerror));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -548,11 +549,12 @@ DllInfo *R_RegisterDLL(HINSTANCE handle,
|
||||
|
||||
dpath = malloc(strlen(path)+1);
|
||||
if(dpath == NULL) {
|
||||
- strcpy(DLLerror, _("could not allocate space for 'path'"));
|
||||
+ strlcpy(DLLerror, _("could not allocate space for 'path'"),
|
||||
+ sizeof(DLLerror));
|
||||
R_osDynSymbol->closeLibrary(handle);
|
||||
return 0;
|
||||
}
|
||||
- strcpy(dpath, path);
|
||||
+ strlcpy(dpath, path, strlen(path) + 1);
|
||||
|
||||
if(R_osDynSymbol->fixPath)
|
||||
R_osDynSymbol->fixPath(dpath);
|
||||
@@ -560,7 +562,7 @@ DllInfo *R_RegisterDLL(HINSTANCE handle,
|
||||
/* keep only basename from path */
|
||||
p = Rf_strrchr(dpath, FILESEP[0]);
|
||||
if(!p) p = dpath; else p++;
|
||||
- if(strlen(p) < PATH_MAX) strcpy(DLLname, p);
|
||||
+ if(strlen(p) < PATH_MAX) strlcpy(DLLname, p, sizeof(DLLname));
|
||||
else error(_("DLLname '%s' is too long"), p);
|
||||
|
||||
/* remove SHLIB_EXT if present */
|
||||
@@ -582,14 +584,15 @@ addDLL(char *dpath, char *DLLname, HINST
|
||||
int ans = CountDLL;
|
||||
char *name = malloc(strlen(DLLname)+1);
|
||||
if(name == NULL) {
|
||||
- strcpy(DLLerror, _("could not allocate space for 'name'"));
|
||||
+ strlcpy(DLLerror, _("could not allocate space for 'name'"),
|
||||
+ sizeof(DLLname));
|
||||
if(handle)
|
||||
R_osDynSymbol->closeLibrary(handle);
|
||||
free(dpath);
|
||||
return 0;
|
||||
}
|
||||
|
||||
- strcpy(name, DLLname);
|
||||
+ strlcpy(name, DLLname, strlen(DLLname) + 1);
|
||||
LoadedDLL[CountDLL].path = dpath;
|
||||
LoadedDLL[CountDLL].name = name;
|
||||
LoadedDLL[CountDLL].handle = handle;
|
||||
66
math/R/patches/patch-src_main_Renviron_c
Normal file
66
math/R/patches/patch-src_main_Renviron_c
Normal file
@ -0,0 +1,66 @@
|
||||
$OpenBSD: patch-src_main_Renviron_c,v 1.1 2005/10/08 09:47:37 mbalmer Exp $
|
||||
--- src/main/Renviron.c.orig Mon Apr 18 13:34:05 2005
|
||||
+++ src/main/Renviron.c Wed Aug 10 16:13:14 2005
|
||||
@@ -67,10 +67,12 @@ static void Putenv(char *a, char *b)
|
||||
{
|
||||
char *buf, *value, *p, *q, quote='\0';
|
||||
int inquote = 0;
|
||||
+ size_t slen;
|
||||
|
||||
- buf = (char *) malloc((strlen(a) + strlen(b) + 2) * sizeof(char));
|
||||
+ slen = strlen(a) + strlen(b) + 2;
|
||||
+ buf = (char *) malloc(slen);
|
||||
if(!buf) R_Suicide("allocation failure in reading Renviron");
|
||||
- strcpy(buf, a); strcat(buf, "=");
|
||||
+ strlcpy(buf, a, slen); strlcat(buf, "=", slen);
|
||||
value = buf+strlen(buf);
|
||||
|
||||
/* now process the value */
|
||||
@@ -108,7 +110,7 @@ static int process_Renviron(char *filena
|
||||
int errs = 0;
|
||||
|
||||
if (!filename || !(fp = fopen(filename, "r"))) return 0;
|
||||
- snprintf(msg, MSG_SIZE+50,
|
||||
+ snprintf(msg, sizeof(msg),
|
||||
"\n File %s contains invalid line(s)", filename);
|
||||
|
||||
while(fgets(sm, BUF_SIZE, fp)) {
|
||||
@@ -118,7 +120,8 @@ static int process_Renviron(char *filena
|
||||
if(!(p = Rf_strchr(s, '='))) {
|
||||
errs++;
|
||||
if(strlen(msg) < MSG_SIZE) {
|
||||
- strcat(msg, "\n "); strcat(msg, s);
|
||||
+ strlcat(msg, "\n ", sizeof(msg));
|
||||
+ strlcat(msg, s, sizeof(msg));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@@ -130,7 +133,7 @@ static int process_Renviron(char *filena
|
||||
}
|
||||
fclose(fp);
|
||||
if (errs) {
|
||||
- strcat(msg, "\n They were ignored\n");
|
||||
+ strlcat(msg, "\n They were ignored\n", sizeof(msg));
|
||||
R_ShowMessage(msg);
|
||||
}
|
||||
return 1;
|
||||
@@ -146,8 +149,8 @@ void process_system_Renviron()
|
||||
R_ShowMessage("path to system Renviron is too long: skipping");
|
||||
return;
|
||||
}
|
||||
- strcpy(buf, R_Home);
|
||||
- strcat(buf, "/etc/Renviron");
|
||||
+ strlcpy(buf, R_Home, sizeof(buf));
|
||||
+ strlcat(buf, "/etc/Renviron", sizeof(buf));
|
||||
if(!process_Renviron(buf))
|
||||
R_ShowMessage("cannot find system Renviron");
|
||||
}
|
||||
@@ -165,7 +168,7 @@ void process_site_Renviron ()
|
||||
R_ShowMessage("path to Renviron.site is too long: skipping");
|
||||
return;
|
||||
}
|
||||
- snprintf(buf, PATH_MAX, "%s/etc/Renviron.site", R_Home);
|
||||
+ snprintf(buf, sizeof(buf), "%s/etc/Renviron.site", R_Home);
|
||||
process_Renviron(buf);
|
||||
}
|
||||
|
||||
22
math/R/patches/patch-src_main_connections_c
Normal file
22
math/R/patches/patch-src_main_connections_c
Normal file
@ -0,0 +1,22 @@
|
||||
$OpenBSD: patch-src_main_connections_c,v 1.3 2005/10/08 09:47:37 mbalmer Exp $
|
||||
--- src/main/connections.c.orig Sat Jun 18 04:05:02 2005
|
||||
+++ src/main/connections.c Wed Aug 10 15:41:07 2005
|
||||
@@ -190,7 +190,7 @@ int dummy_vfprintf(Rconnection con, cons
|
||||
if(res >= BUFSIZE) { /* res is the desired output length */
|
||||
usedRalloc = TRUE;
|
||||
b = R_alloc(res + 1, sizeof(char));
|
||||
- vsprintf(b, format, ap);
|
||||
+ vsnprintf(b, res + 1, format, ap);
|
||||
} else if(res < 0) { /* just a failure indication -- e.g. Windows */
|
||||
usedRalloc = TRUE;
|
||||
b = R_alloc(100*BUFSIZE, sizeof(char));
|
||||
@@ -3497,7 +3497,8 @@ static Rboolean gzcon_open(Rconnection c
|
||||
|
||||
if(con->canread) {
|
||||
/* read header */
|
||||
- char c, ccc, method, flags, dummy[6];
|
||||
+ signed char c;
|
||||
+ char ccc, method, flags, dummy[6];
|
||||
unsigned char head[2];
|
||||
uInt len;
|
||||
|
||||
12
math/R/patches/patch-src_main_gram_y
Normal file
12
math/R/patches/patch-src_main_gram_y
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_main_gram_y,v 1.1 2005/10/08 09:47:37 mbalmer Exp $
|
||||
--- src/main/gram.y.orig Wed Aug 10 14:41:13 2005
|
||||
+++ src/main/gram.y Wed Aug 10 14:41:58 2005
|
||||
@@ -83,7 +83,7 @@ static int xxcharcount, xxcharsave;
|
||||
|
||||
static int mbcs_get_next(int c, wchar_t *wc)
|
||||
{
|
||||
- int i, res, clen = 1; char s[9];
|
||||
+ int i, res, clen = 1; signed char s[9];
|
||||
mbstate_t mb_st;
|
||||
|
||||
s[0] = c;
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_main_main_c,v 1.2 2004/08/08 15:06:24 naddy Exp $
|
||||
--- src/main/main.c.orig Tue Jun 8 11:24:08 2004
|
||||
+++ src/main/main.c Mon Jul 26 19:13:19 2004
|
||||
@@ -461,7 +461,8 @@ void setup_Rmainloop(void)
|
||||
}
|
||||
#endif
|
||||
#ifdef HAVE_LANGINFO_CODESET
|
||||
- utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
|
||||
+ /* utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0; */
|
||||
+ utf8locale = 0;
|
||||
#endif
|
||||
/* gc_inhibit_torture = 0; */
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_main_platform_c,v 1.2 2004/08/08 15:06:24 naddy Exp $
|
||||
--- src/main/platform.c.orig Mon May 17 23:04:54 2004
|
||||
+++ src/main/platform.c Mon Jul 26 19:13:19 2004
|
||||
@@ -915,7 +915,8 @@ SEXP do_getlocale(SEXP call, SEXP op, SE
|
||||
else SET_STRING_ELT(ans, 0, mkChar(""));
|
||||
UNPROTECT(1);
|
||||
#ifdef HAVE_LANGINFO_CODESET
|
||||
- utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
|
||||
+ /* utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0; */
|
||||
+ utf8locale = 0;
|
||||
#endif
|
||||
return ans;
|
||||
#else
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-src_modules_X11_dataentry_c,v 1.2 2004/08/08 15:06:24 naddy Exp $
|
||||
--- src/modules/X11/dataentry.c.orig Mon Apr 19 07:33:28 2004
|
||||
+++ src/modules/X11/dataentry.c Mon Jul 26 19:13:19 2004
|
||||
@@ -19,14 +19,17 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
+#if 0
|
||||
/* don't use X11 function prototypes (which tend to ...): */
|
||||
#define NeedFunctionPrototypes 0
|
||||
+#endif
|
||||
/* XFree 4.4.0 forgets to define this if NeedFunctionPrototypes=0 */
|
||||
#ifndef _Xconst
|
||||
#define _Xconst const
|
||||
2429
math/R/pkg/PLIST
2429
math/R/pkg/PLIST
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user