R-2.5.0

math/R/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2007/01/23 12:06:02 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.19 2007/04/26 20:26:12 mbalmer Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"clone of S, a powerful math/statistics/graphics language"
-DISTNAME=	R-2.4.1
-SHARED_LIBS=	Rlapack 24.0 \
-		Rblas	24.1
+DISTNAME=	R-2.5.0
+SHARED_LIBS=	Rlapack 25.0 \
+		Rblas	25.0
 
 CATEGORIES=    	math
 HOMEPAGE=	http://www.r-project.org/
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xt c g2c m ncurses readline tcl84
+WANTLIB=		ICE SM X11 Xt c g2c m ncurses readline tcl84 Xmu
 
 MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
 		http://cran.uk.r-project.org/src/base/R-2/ \
@@ -25,7 +25,7 @@ MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
 		http://cran.dk.r-project.org/src/base/R-2/
 
 USE_X11=	Yes
-MODULES=	devel/gettext
+#MODULES=	devel/gettext
 LIB_DEPENDS=	jpeg.>=62::graphics/jpeg \
 		tk84.>=1:tk-8.4.*:x11/tk/8.4
 

math/R/distinfo

@@ -1,5 +1,5 @@
-MD5 (R-2.4.1.tar.gz) = krM/0sPncNWVwaRyiJIw1Q==
-RMD160 (R-2.4.1.tar.gz) = KgPMgbhw1ZSmlenrHndyA3nGAZQ=
-SHA1 (R-2.4.1.tar.gz) = WrCiminDXcLLBsh1U55itXUDx2I=
-SHA256 (R-2.4.1.tar.gz) = T/ks/SkGTbWZeO8RyV3YikBA7UmE/c4p/LXVeD/pAos=
-SIZE (R-2.4.1.tar.gz) = 14570344
+MD5 (R-2.5.0.tar.gz) = uQiGY/xTnAWaz68Z1tkKaQ==
+RMD160 (R-2.5.0.tar.gz) = rhR3UoG1Oi/8WCl37sTDbGvcUE8=
+SHA1 (R-2.5.0.tar.gz) = p1u7WY1/lXrsPEvnnxgqkG+xRUE=
+SHA256 (R-2.5.0.tar.gz) = UlBMdwD4+ICJGzRiL3OkHd5m4HUqhVLSuN9chXVqju8=
+SIZE (R-2.5.0.tar.gz) = 15117375

math/R/patches/patch-configure

@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2006/11/11 18:52:12 mbalmer Exp $
---- configure.orig	Tue Oct  3 12:01:50 2006
-+++ configure	Tue Oct  3 18:12:02 2006
-@@ -51979,7 +51979,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
-@@ -51991,7 +51991,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,@XTRA_INTL_CPPFLAGS@,$XTRA_INTL_CPPFLAGS,;t t

math/R/patches/patch-src_main_Renviron_c

@@ -1,70 +0,0 @@
-$OpenBSD: patch-src_main_Renviron_c,v 1.2 2006/11/11 18:52:12 mbalmer Exp $
---- src/main/Renviron.c.orig	Mon Apr 10 00:19:51 2006
-+++ src/main/Renviron.c	Tue Oct  3 20:04:28 2006
-@@ -126,10 +126,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 */
-@@ -181,7 +183,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;
- 	}
-@@ -193,7 +196,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;
-@@ -210,10 +213,10 @@ void process_system_Renviron()
-         R_ShowMessage("path to system Renviron is too long: skipping");
-         return;
-     }
--    strcpy(buf, R_Home);
--    strcat(buf, "/etc/");
--    strcat(buf, R_ARCH);
--    strcat(buf, "/Renviron");
-+    strlcpy(buf, R_Home, sizeof(buf));
-+    strlcat(buf, "/etc/", sizeof(buf));
-+    strlcat(buf, R_ARCH, sizeof(buf));
-+    strlcat(buf, "/Renviron", sizeof(buf));
- #else
-     if(strlen(R_Home) + strlen("/etc/Renviron") > PATH_MAX - 1) {
- 	R_ShowMessage("path to system Renviron is too long: skipping");
-@@ -239,7 +242,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);
- }
- 
-@@ -259,7 +262,7 @@ void process_user_Renviron()
- 	s = getenv("R_USER");
- 	if(!s) s = getenv("HOME");
- 	if(!s) return;
--	snprintf(buf, 1024, "%s/.Renviron", s);
-+	snprintf(buf, sizeof(buf), "%s/.Renviron", s);
- 	s = buf;
-     }
- #endif