update to 1.9.1; from Chris Kuethe <ckuethe@ualberta.ca>

math/R/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2004/04/28 21:40:31 naddy Exp $
+# $OpenBSD: Makefile,v 1.9 2004/08/08 15:06:23 naddy Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"clone of S, a powerful math/statistics/graphics language"
-DISTNAME=	R-1.9.0
+DISTNAME=	R-1.9.1
 CATEGORIES=    	math
 HOMEPAGE=	http://www.r-project.org/
 

math/R/distinfo

@@ -1,3 +1,3 @@
-MD5 (R-1.9.0.tgz) = 79ae9d20a7bed94d7c92504c8c130310
-RMD160 (R-1.9.0.tgz) = 671283fc4f9d60d19a72ea9691a604eb5006a6aa
-SHA1 (R-1.9.0.tgz) = 7b74c59838fb4a4129a21bbcbe1c83eeed7ac4b9
+MD5 (R-1.9.1.tgz) = c8201425506e5c077ef1936e19ea2f51
+RMD160 (R-1.9.1.tgz) = 98ae0db3c5ab624192d7ad3ef79d0067d821e918
+SHA1 (R-1.9.1.tgz) = 3423a1810a6a8d838554e49d54d44b05f5647085

math/R/patches/patch-src_main_Makefile_in

@@ -1,6 +1,6 @@
-# $OpenBSD: patch-src_main_Makefile_in,v 1.1 2003/05/17 04:46:04 ian Exp $
---- src/main/Makefile.in.orig	Sat Jan 25 17:04:59 2003
-+++ src/main/Makefile.in	Sat May 17 00:29:57 2003
+$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

math/R/patches/patch-src_main_main_c

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_main_main_c,v 1.1 2004/04/28 21:40:31 naddy Exp $
---- src/main/main.c.orig	2004-04-14 14:50:53.000000000 -0600
-+++ src/main/main.c	2004-04-14 14:54:11.000000000 -0600
-@@ -460,7 +460,8 @@ void setup_Rmainloop(void)
+$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_NL_LANGINFO
+ #ifdef HAVE_LANGINFO_CODESET
 -    utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
-+    // utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
++    /* utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0; */
 +    utf8locale = 0;
  #endif
      /* gc_inhibit_torture = 0; */

math/R/patches/patch-src_main_platform_c

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_main_platform_c,v 1.1 2004/04/28 21:40:31 naddy Exp $
---- src/main/platform.c.orig	2004-04-14 14:54:25.000000000 -0600
-+++ src/main/platform.c	2004-04-14 14:54:50.000000000 -0600
+$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_NL_LANGINFO
+ #ifdef HAVE_LANGINFO_CODESET
 -    utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
-+    // utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
++    /* utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0; */
 +    utf8locale = 0;
  #endif    
      return ans;

math/R/patches/patch-src_modules_X11_dataentry_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_modules_X11_dataentry_c,v 1.1 2004/04/28 21:40:31 naddy Exp $
---- src/modules/X11/dataentry.c.orig	2004-04-14 14:57:20.000000000 -0600
-+++ src/modules/X11/dataentry.c	2004-04-14 15:47:29.000000000 -0600
-@@ -19,6 +19,7 @@
+$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
   */
  
@@ -9,11 +9,13 @@ $OpenBSD: patch-src_modules_X11_dataentry_c,v 1.1 2004/04/28 21:40:31 naddy Exp
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #endif
-@@ -26,7 +27,6 @@
+ 
  #include <stdlib.h>
  
++#if 0
  /* don't use X11 function prototypes (which tend to ...): */
--#define NeedFunctionPrototypes 0
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
+ #define NeedFunctionPrototypes 0
++#endif
+ /* XFree 4.4.0 forgets to define this if NeedFunctionPrototypes=0 */
+ #ifndef _Xconst
+ #define _Xconst const