Update R to 2.2.0

Changes:
 This version contains several changes and additions, mostly incremental.

8 files changed, 20 insertions, 91 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 5613a6cef0b..547d122e6eb 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2005/12/05 20:50:36 rillig Exp $
+# $NetBSD: Makefile,v 1.77 2005/12/11 14:37:12 markd Exp $
 
-DISTNAME=		R-2.1.1
-PKGREVISION=		1
+DISTNAME=		R-2.2.0
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-2/}
 
@@ -31,9 +30,9 @@ CONFIGURE_ARGS+=	--with-tcltk
 CONFIGURE_ARGS+=	--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ARGS+=	--with-tk-config=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 CONFIGURE_ARGS+=	--without-gnome		# not yet stable
-CONFIGURE_ARGS+=	--with-zlib
-CONFIGURE_ARGS+=	--with-bzlib
-CONFIGURE_ARGS+=	--with-pcre
+CONFIGURE_ARGS+=	--with-system-zlib
+CONFIGURE_ARGS+=	--with-system-bzlib
+CONFIGURE_ARGS+=	--with-system-pcre
 
 # Use BLAS (math/blas)
 #
diff --git a/math/R/distinfo b/math/R/distinfo
index d5dc62d0722..13f6f71605b 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.26 2005/12/01 23:12:18 joerg Exp $
+$NetBSD: distinfo,v 1.27 2005/12/11 14:37:12 markd Exp $
 
-SHA1 (R-2.1.1.tar.gz) = e43f743c9ad4147f23cf89c771364168b078a0db
-RMD160 (R-2.1.1.tar.gz) = a850608eb5edb90f426331fd2596ba8fc7175dce
-Size (R-2.1.1.tar.gz) = 12644376 bytes
+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 (patch-aa) = 52f7ca0159087a6a5f319dd5476223785fe75a7a
-SHA1 (patch-ab) = d5919d2864c70cc2d541a62099fca35b5d10bb99
+SHA1 (patch-ab) = b724b549cd9920865c4d4ae60c71dff48c4c0c06
 SHA1 (patch-ac) = ce9e1b9f3de07ea3724a1215cfe648770d5c09ca
 SHA1 (patch-ad) = 83c9b046822b1d350daec8739ca4ee2a6b7e1978
-SHA1 (patch-ae) = 89580496f3614deaa6ef81306e3d2247e46839e6
-SHA1 (patch-af) = 84ab0aec4edd9469e1dcf3eb0b06e898265dae1d
-SHA1 (patch-ag) = caa653a3717c4f1173f431865fbef999f350f211
-SHA1 (patch-ah) = 8c12f620ac4923373771b95010df87eb2587b957
-SHA1 (patch-ai) = 0a893c0cad82acdc8d57d189fcbc5cba639b11b5
 SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952
diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab
index 20f0f9f7983..16d34ff93b5 100644
--- a/math/R/patches/patch-ab
+++ b/math/R/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.17 2005/12/01 23:11:26 joerg Exp $
+$NetBSD: patch-ab,v 1.18 2005/12/11 14:37:12 markd Exp $
 
---- src/main/errors.c.orig	2005-12-01 22:38:35.000000000 +0000
-+++ src/main/errors.c
-@@ -39,7 +39,7 @@ extern void R_ProcessEvents(void);
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
--#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__)
-+#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__)
+--- src/include/Defn.h.orig	2005-09-23 14:05:03.000000000 +1200
++++ src/include/Defn.h
+@@ -982,7 +982,7 @@ extern AccuracyInfo R_AccuracyInfo;
+ # ifdef HAVE_ALLOCA_H
+ #  include <alloca.h>
+ # endif
+-# if !HAVE_DECL_ALLOCA  && !defined(__FreeBSD__)
++# if !HAVE_DECL_ALLOCA  && !defined(__FreeBSD__) && !defined(__DragonFly__)
  extern char *alloca(size_t);
+ # endif
  #endif
- 
diff --git a/math/R/patches/patch-ae b/math/R/patches/patch-ae
deleted file mode 100644
index b88539ff919..00000000000
--- a/math/R/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2005/12/01 23:11:27 joerg Exp $
-
---- src/main/pcre.c.orig	2005-12-01 22:44:25.000000000 +0000
-+++ src/main/pcre.c
-@@ -37,7 +37,7 @@
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
--#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__)
-+#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__)
- extern char *alloca(size_t);
- #endif
- 
diff --git a/math/R/patches/patch-af b/math/R/patches/patch-af
deleted file mode 100644
index a160e707c44..00000000000
--- a/math/R/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.9 2005/12/01 23:11:27 joerg Exp $
-
---- src/main/printarray.c.orig	2005-12-01 22:45:25.000000000 +0000
-+++ src/main/printarray.c
-@@ -45,7 +45,7 @@
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
--#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__)
-+#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__)
- extern char *alloca(size_t);
- #endif
- 
diff --git a/math/R/patches/patch-ag b/math/R/patches/patch-ag
deleted file mode 100644
index 7bc087441e5..00000000000
--- a/math/R/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.9 2005/12/01 23:11:27 joerg Exp $
-
---- src/main/util.c.orig	2005-12-01 22:46:34.000000000 +0000
-+++ src/main/util.c
-@@ -41,7 +41,7 @@
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
--#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__)
-+#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__)
- extern char *alloca(size_t);
- #endif
- 
diff --git a/math/R/patches/patch-ah b/math/R/patches/patch-ah
deleted file mode 100644
index be72532e1c3..00000000000
--- a/math/R/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2005/12/01 23:11:27 joerg Exp $
-
---- src/main/vfonts.c.orig	2005-12-01 22:47:24.000000000 +0000
-+++ src/main/vfonts.c
-@@ -32,7 +32,7 @@
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
--#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__)
-+#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__)
- extern char *alloca(size_t);
- #endif
- 
diff --git a/math/R/patches/patch-ai b/math/R/patches/patch-ai
deleted file mode 100644
index dfbc790504d..00000000000
--- a/math/R/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2005/12/01 23:11:27 joerg Exp $
-
---- src/library/grDevices/src/devPS.c.orig	2005-12-01 22:54:39.000000000 +0000
-+++ src/library/grDevices/src/devPS.c
-@@ -47,7 +47,7 @@ extern int errno;
- 
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
--#elif !defined (__FreeBSD__)
-+#elif !defined (__FreeBSD__) && !defined(__DragonFly__)
- extern char *alloca(size_t);
- #endif
-