Update R to 2.2.1

USER-VISIBLE CHANGES

    o   options("expressions") has been reduced to 1000: the limit
        of 5000 introduced in 2.1.0 was liable to give crashes from C
        stack overflow.


NEW FEATURES

    o   Use of 'pch' (e.g. in points) in the symbol font 5 is now
        interpreted in the single-byte encoding used by that font.
        Similarly, strwidth now recognizes that font 5 has a different
        encoding from that of the locale.  (These are likely to affect
        the answer only in MBCS locales such as UTF-8.)

    o   The URW font metrics have been updated to versions from late
        2002 which cover more glyphs, including Cyrillic.

    o   New postscript encodings for CP1250 (Windows East European),
        ISO Latin-7 (8859-13, Latvian, Lithuanian and Maori), Cyrillic
        (8859-5), KOI8-R, KOI8-U and CP1251.

    o   configure has more support for the Intel and Portland Group
        compilers on ix86 and x86_64 Linux.

    o   R CMD INSTALL will clean up if interrupted (e.g. by ctrl-C from
        the keyboard).

    o   There is now a comprehensive French translation of the messages,
        thanks to Philippe Grosjean.


DEPRECATED & DEFUNCT

    o   The undocumented use of atan() with two arguments is deprecated:
        instead use atan2() (as documented).

    o   The 'vfont' argument of axis() and mtext() is deprecated
        (it currently warns and does nothing).

    o   The function mauchley.test() is deprecated (was a misspelling)
        and replaced by mauchly.test()

Many BUG FIXES

3 files changed, 6 insertions, 32 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 547d122e6eb..7512ef54565 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2005/12/11 14:37:12 markd Exp $
+# $NetBSD: Makefile,v 1.78 2005/12/29 23:23:53 markd Exp $
 
-DISTNAME=		R-2.2.0
+DISTNAME=		R-2.2.1
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-2/}
 
diff --git a/math/R/distinfo b/math/R/distinfo
index 27fa61e389e..d3ced707a16 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.28 2005/12/19 12:51:50 markd Exp $
+$NetBSD: distinfo,v 1.29 2005/12/29 23:23:53 markd Exp $
 
-SHA1 (R-2.2.0.tar.gz) = ebaafa21036877b4ee3d4de9d85cce20f5cf9cbc
-RMD160 (R-2.2.0.tar.gz) = 9f54eb83c34565cbc483d2ffcc7dcae730ca674a
-Size (R-2.2.0.tar.gz) = 13307492 bytes
+SHA1 (R-2.2.1.tar.gz) = 537e0b89b8de55c1156474c76c19c1fcc210f756
+RMD160 (R-2.2.1.tar.gz) = b63b6c5ef1db27a879783460b0ecb6de0d4bba18
+Size (R-2.2.1.tar.gz) = 13665367 bytes
 SHA1 (patch-aa) = 52f7ca0159087a6a5f319dd5476223785fe75a7a
 SHA1 (patch-ab) = b724b549cd9920865c4d4ae60c71dff48c4c0c06
 SHA1 (patch-ac) = ce9e1b9f3de07ea3724a1215cfe648770d5c09ca
 SHA1 (patch-ad) = 83c9b046822b1d350daec8739ca4ee2a6b7e1978
-SHA1 (patch-ae) = 1253bbd786dc912650598c4f11177de00a259fec
 SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952
diff --git a/math/R/patches/patch-ae b/math/R/patches/patch-ae
deleted file mode 100644
index 3e01881b54d..00000000000
--- a/math/R/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2005/12/19 12:51:50 markd Exp $
-
---- src/nmath/log1p.c.orig	2005-07-28 08:10:05.000000000 +1200
-+++ src/nmath/log1p.c
-@@ -98,16 +98,17 @@ double log1p(double x)
- 	-.33410026677731010351377066666666e-30,
- 	+.63533936180236187354180266666666e-31,
-     };
--    const static double xmin = -1 + sqrt(1/DBL_EPSILON);/*was sqrt(d1mach(4)); */
- 
- #ifdef NOMORE_FOR_THREADS
-     static int nlnrel = 0;
-+    static double xmin = 0.0;
- 
--    if (nlnrel == 0) {/* initialize chebychev coefficients */
-+    if (xmin == 0.0) xmin = -1 + sqrt(DBL_EPSILON);/*was sqrt(d1mach(4)); */
-+    if (nlnrel == 0) /* initialize chebychev coefficients */
- 	nlnrel = chebyshev_init(alnrcs, 43, DBL_EPSILON/20);/*was .1*d1mach(3)*/
--    }
- #else
- # define nlnrel 22
-+    const static double xmin = -0.999999985;
- /* 22: for IEEE double precision where DBL_EPSILON =  2.22044604925031e-16 */
- #endif
-