Update R to 1.4.1, removing patches that are now incorporated into R

and a few which are not really needed due to autoconfig.

math/R/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2001/12/09 06:25:32 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.5 2002/02/06 13:44:37 ian Exp $
 
 # R, a clone of the S-Plus (based on AT&T S) statistical package 
 
 COMMENT=	"clone of S, a powerful math/statistics/graphics language"
-DISTNAME=		R-1.2.2
+DISTNAME=		R-1.4.1
 CATEGORIES=     	math
 NEED_VERSION=		1.359
 

math/R/patches/patch-Makeconf.in

@@ -1,11 +1,11 @@
-$OpenBSD: patch-Makeconf.in,v 1.2 2001/09/28 02:57:56 pvalchev Exp $
+$OpenBSD: patch-Makeconf.in,v 1.3 2002/02/06 13:44:37 ian Exp $
 
 Their scripts use "install -u root" internally, to cp scripts and include
 files, f'gosh sakes. Try to make it honor ${SUDO} for these.
 
---- Makeconf.in.orig	Sat Jan 27 14:48:35 2001
-+++ Makeconf.in	Thu Sep 27 02:11:12 2001
-@@ -26,11 +26,11 @@ F2CFLAGS = @F2CFLAGS@
+--- Makeconf.in.orig	Tue Feb  5 18:47:34 2002
++++ Makeconf.in	Tue Feb  5 18:48:24 2002
+@@ -28,10 +28,10 @@ GETWD = @GETWD@
  GNOMEUI_LIBS = @GNOMEUI_LIBS@
  GNOME_LIBDIR = @GNOME_LIBDIR@
  GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
@@ -13,12 +13,10 @@ files, f'gosh sakes. Try to make it honor ${SUDO} for these.
 -INSTALL_DATA = @INSTALL_DATA@
 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
--INSTALL_DIR = ${INSTALL} -d
 +INSTALL = ${SUDO} @INSTALL@
 +INSTALL_DATA = ${SUDO} @INSTALL_DATA@
 +INSTALL_PROGRAM = ${SUDO} @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = ${SUDO} @INSTALL_SCRIPT@
-+INSTALL_DIR = ${SUDO} ${INSTALL} -d
+ INSTALL_DIR = ${INSTALL} -d
+ JAVAC = @JAVAC@
  LATEX = @LATEX@
- LDFLAGS = @LDFLAGS@
- LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@

math/R/patches/patch-acinclude_m4

@@ -1,13 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.1 2001/09/28 02:57:56 pvalchev Exp $
---- acinclude.m4.orig	Fri Feb  9 14:28:07 2001
-+++ acinclude.m4	Thu Sep 27 17:44:02 2001
-@@ -456,6 +456,9 @@ EOF
- 
- extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
- 
-+int MAIN_ () { return 0; }
-+int MAIN__ () { return 0; }
-+
- int main () {
-   int a[3] = {17, 237, 2000000000}, b[2], res = 0;
-   double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];

math/R/patches/patch-aclocal_m4

@@ -1,67 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/28 02:57:56 pvalchev Exp $
---- aclocal.m4.orig	Thu Sep 27 17:48:27 2001
-+++ aclocal.m4	Thu Sep 27 17:48:29 2001
-@@ -1,6 +1,6 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
- 
--dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-@@ -368,6 +368,9 @@ EOF
- 
- extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
- 
-+int MAIN_ () { return 0; }
-+int MAIN__ () { return 0; }
-+
- int main () {
-   int a[3] = {17, 237, 2000000000}, b[2], res = 0;
-   double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -4293,7 +4296,7 @@ dnl End: ***
- 
- # Define a conditional.
- 
--AC_DEFUN(AM_CONDITIONAL,
-+AC_DEFUN([AM_CONDITIONAL],
- [AC_SUBST($1_TRUE)
- AC_SUBST($1_FALSE)
- if $2; then
-@@ -4313,7 +4316,7 @@ fi])
- dnl Usage:
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
- 
--AC_DEFUN(AM_INIT_AUTOMAKE,
-+AC_DEFUN([AM_INIT_AUTOMAKE],
- [AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
-@@ -4341,7 +4344,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
- # Check to make sure that the build environment is sane.
- #
- 
--AC_DEFUN(AM_SANITY_CHECK,
-+AC_DEFUN([AM_SANITY_CHECK],
- [AC_MSG_CHECKING([whether build environment is sane])
- # Just in case
- sleep 1
-@@ -4382,7 +4385,7 @@ AC_MSG_RESULT(yes)])
- 
- dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
- dnl The program must properly implement --version.
--AC_DEFUN(AM_MISSING_PROG,
-+AC_DEFUN([AM_MISSING_PROG],
- [AC_MSG_CHECKING(for working $2)
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
-@@ -4398,7 +4401,7 @@ AC_SUBST($1)])
- 
- # Like AC_CONFIG_HEADER, but automatically create stamp file.
- 
--AC_DEFUN(AM_CONFIG_HEADER,
-+AC_DEFUN([AM_CONFIG_HEADER],
- [AC_PREREQ([2.12])
- AC_CONFIG_HEADER([$1])
- dnl When config.status generates a header, we must update the stamp-h file.

math/R/patches/patch-main-arithmetic.c

@@ -1,27 +0,0 @@
-$OpenBSD: patch-main-arithmetic.c,v 1.1.1.1 2001/03/22 03:26:32 ian Exp $
-
-OpenBSD seems to be the only common platform that still hides the
-"struct exception" definition in math.h unless you define __LIBM_PRIVATE.
-But since this is a math interpreter and wants to be pretty chummy with
-the mathlib, perhaps it is not such a bad thing for them to want to
-diddle the struct exception object.
-
-I changed the comment to remind that Arith.h includes math.h, since math.h
-is *also* included in the expected Rmath.h, but the second inclusion (as
-per most system header files) is a no-op.
-
-													-- Ian
-
---- src/main/arithmetic.c.orig	Tue Mar  6 17:58:18 2001
-+++ src/main/arithmetic.c	Tue Mar  6 18:27:38 2001
-@@ -22,7 +22,9 @@
- #include <config.h>
- #endif
- 
--#include "Defn.h"		/*-> Arith.h */
-+#define __LIBM_PRIVATE	/* OpenBSD */
-+#include "Defn.h"		/*-> Arith.h -> math.h */
-+#undef __LIBM_PRIVATE	
- #define MATHLIB_PRIVATE
- #include <Rmath.h>
- #undef MATHLIB_PRIVATE