Update to version 1.4.1 from PR pkg/15757 by Ray Brownrigg with minor mods

by me.

Changes and bug fixes from 1.3.1 are numerous.  See the NEWS file in
the distribution for details.

5 files changed, 86 insertions, 48 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index dd7ca3b7f8a..d33050edc71 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2001/12/11 22:35:07 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2002/03/01 10:46:53 markd Exp $
 
-DISTNAME=		R-1.3.0
+DISTNAME=		R-1.4.1
 CATEGORIES=		math
 MASTER_SITES=		http://lib.stat.cmu.edu/R/CRAN/src/base/ \
 			http://cran.r-project.org/src/base/ \
diff --git a/math/R/distinfo b/math/R/distinfo
index c6e2c9f47ac..d0139c79eeb 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2001/12/11 22:35:07 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/03/01 10:46:53 markd Exp $
 
-SHA1 (R-1.3.0.tgz) = 9e59492f0f2bb5dbf3e324e9f92046882aa9f344
-Size (R-1.3.0.tgz) = 4423354 bytes
-SHA1 (patch-aa) = 588b85346a942f54bf27de4115ee2d7bbec270cb
-SHA1 (patch-ab) = ef2832039b92a5c5c323b7c61039f2ccd3d067e8
-SHA1 (patch-ac) = 823c7877dfefdf80d163f975a56eaee6500d432f
+SHA1 (R-1.4.1.tgz) = b9e9f4cd4576e62760fe4cc32ffdde04c0d8d2f7
+Size (R-1.4.1.tgz) = 5136906 bytes
+SHA1 (patch-aa) = f2999c2f21d9b95b22c3eebf2d34d524b32cce9d
+SHA1 (patch-ab) = b5b7e1bcc401f74a7271451c62edcce151beeab0
+SHA1 (patch-ac) = ac2df38674129b3ffc0f43963b600e89b3539855
diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
index 5e34f8635a6..14e338139f4 100644
--- a/math/R/patches/patch-aa
+++ b/math/R/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2001/07/23 13:14:44 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2002/03/01 10:46:53 markd Exp $
 
---- configure.in.orig	Sun Jun 17 12:41:20 2001
+--- configure.in.orig	Fri Dec 14 04:16:03 2001
 +++ configure.in
-@@ -380,9 +380,9 @@
+@@ -426,9 +426,9 @@
  if ${use_libmoto}; then
    AC_CHECK_LIB(moto, sin)
  fi
@@ -14,4 +14,12 @@ $NetBSD: patch-aa,v 1.6 2001/07/23 13:14:44 jlam Exp $
 +    AC_CHECK_LIB(ncurses, main)
  ))
  AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_LIB(z, main)
+ 
+@@ -776,6 +776,7 @@
+     main_ldflags="-export-dynamic"
+     ;;
+   netbsd*)
++    fpicflags="-fPIC"
+     if ${CPP} - -dM < /dev/null | grep -q __ELF__; then
+       main_ldflags="-export-dynamic"
+       shlib_ldflags="-shared"
diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab
index d9acfd39238..c92dbc3d6a2 100644
--- a/math/R/patches/patch-ab
+++ b/math/R/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2001/07/23 13:14:44 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2002/03/01 10:46:53 markd Exp $
 
---- acinclude.m4.orig	Sun Jun 17 12:42:16 2001
+--- acinclude.m4.orig   Thu Aug 23 21:15:12 2001
 +++ acinclude.m4
-@@ -456,6 +456,9 @@
+@@ -467,6 +467,9 @@
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index 509cbb25374..996ce3a8aa2 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,8 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
-
---- configure.orig	Fri Jun 22 06:32:10 2001
-+++ configure	Tue Dec 11 17:10:49 2001
-@@ -6973,6 +6973,9 @@
+--- configure.orig	Fri Dec 14 04:16:06 2001
++++ configure	Fri Mar  1 11:20:58 2002
+@@ -7126,6 +7126,9 @@
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -12,15 +10,25 @@ $NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
  int main () {
    int a[3] = {17, 237, 2000000000}, b[2], res = 0;
    double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -7676,16 +7679,16 @@
+@@ -7199,6 +7202,9 @@
+ # define F77_SYMBOL(x)   x
+ #endif
+ 
++int MAIN_ () { return 0; }
++int MAIN__ () { return 0; }
++
+ typedef struct {
+         double r;
+         double i;
+@@ -7938,16 +7944,16 @@
  fi
  
  fi
 -echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
--echo "configure:7681: checking for main in -lncurses" >&5
+-echo "configure:7943: checking for main in -lncurses" >&5
 -ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
-+echo "configure:7684: checking for main in -ltermcap" >&5
++echo "configure:7945: checking for main in -ltermcap" >&5
 +ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -29,12 +37,12 @@ $NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
 -LIBS="-lncurses  $LIBS"
 +LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 7689 "configure"
-+#line 7692 "configure"
+-#line 7951 "configure"
++#line 7953 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -7707,26 +7710,26 @@
+@@ -7969,26 +7975,26 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -51,10 +59,10 @@ $NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
--echo "configure:7722: checking for main in -ltermcap" >&5
+-echo "configure:7984: checking for main in -ltermcap" >&5
 -ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6
-+echo "configure:7725: checking for main in -ltermlib" >&5
++echo "configure:7986: checking for main in -ltermlib" >&5
 +ac_lib_var=`echo termlib'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -63,12 +71,12 @@ $NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
 -LIBS="-ltermcap  $LIBS"
 +LIBS="-ltermlib  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 7730 "configure"
-+#line 7733 "configure"
+-#line 7992 "configure"
++#line 7994 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -7748,26 +7751,26 @@
+@@ -8010,26 +8016,26 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -85,10 +93,10 @@ $NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6
--echo "configure:7763: checking for main in -ltermlib" >&5
+-echo "configure:8025: checking for main in -ltermlib" >&5
 -ac_lib_var=`echo termlib'_'main | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
-+echo "configure:7766: checking for main in -lncurses" >&5
++echo "configure:8027: checking for main in -lncurses" >&5
 +ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -97,12 +105,12 @@ $NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
 -LIBS="-ltermlib  $LIBS"
 +LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 7771 "configure"
-+#line 7774 "configure"
+-#line 8033 "configure"
++#line 8035 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -7789,13 +7792,13 @@
+@@ -8051,13 +8057,13 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -118,39 +126,61 @@ $NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
  
  else
    echo "$ac_t""no" 1>&6
-@@ -10587,10 +10590,9 @@
+@@ -10887,10 +10893,9 @@
    ac_cv_sizeof_long=4
  else
    cat > conftest.$ac_ext <<EOF
--#line 10591 "configure"
-+#line 10594 "configure"
+-#line 10891 "configure"
++#line 10893 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -#include <sys/types.h>
  main()
  {
    FILE *f=fopen("conftestval", "w");
-@@ -10627,10 +10629,9 @@
+@@ -10899,7 +10904,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:10903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long=`cat conftestval`
+ else
+@@ -10919,7 +10924,7 @@
+ 
+ 
+ echo $ac_n "checking size of long long""... $ac_c" 1>&6
+-echo "configure:10923: checking size of long long" >&5
++echo "configure:10924: checking size of long long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10927,10 +10932,9 @@
    ac_cv_sizeof_long_long=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 10631 "configure"
-+#line 10633 "configure"
+-#line 10931 "configure"
++#line 10932 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -#include <sys/types.h>
  main()
  {
    FILE *f=fopen("conftestval", "w");
-@@ -10667,10 +10668,9 @@
-   ac_cv_sizeof_long_double=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 10671 "configure"
-+#line 10672 "configure"
+@@ -10970,7 +10974,6 @@
+ #line 10971 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -#include <sys/types.h>
  main()
  {
    FILE *f=fopen("conftestval", "w");
+@@ -11683,6 +11686,7 @@
+     main_ldflags="-export-dynamic"
+     ;;
+   netbsd*)
++    fpicflags="-fPIC"
+     if ${CPP} - -dM < /dev/null | grep -q __ELF__; then
+       main_ldflags="-export-dynamic"
+       shlib_ldflags="-shared"