Update R to version 2.6.0

Many new features, changes and bug fixes. See lib/R/doc/NEWS for details.

2 files changed, 136 insertions, 116 deletions

diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa
index 9845ad87bc3..2683b8c4724 100644
--- a/math/R/patches/patch-aa
+++ b/math/R/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2007/03/14 11:50:35 markd Exp $
+$NetBSD: patch-aa,v 1.18 2007/11/03 20:14:40 markd Exp $
 
---- configure.ac.orig	2006-12-04 10:37:52.000000000 +1300
+--- configure.ac.orig	2007-09-21 14:05:04.000000000 +1200
 +++ configure.ac
-@@ -255,7 +255,7 @@ AC_ARG_ENABLE([BLAS-shlib],
+@@ -260,7 +260,7 @@ AC_ARG_ENABLE([BLAS-shlib],
  [use_blas_shlib="unset"])
  
  if test "${want_R_shlib}" = yes; then
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.17 2007/03/14 11:50:35 markd Exp $
  else
    LIBR=
  fi
-@@ -653,9 +653,9 @@ if test "${use_readline}" = yes; then
+@@ -672,9 +672,9 @@ if test "${use_readline}" = yes; then
    if test "${use_readline}" = no; then
      ## only need ncurses if libreadline is not statically linked against it
      unset ac_cv_lib_readline_rl_callback_read_char
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.17 2007/03/14 11:50:35 markd Exp $
      AC_CHECK_LIB(readline, rl_callback_read_char)
      use_readline="${ac_cv_lib_readline_rl_callback_read_char}"
    fi
-@@ -798,13 +798,6 @@ case "${host_cpu}" in
+@@ -817,13 +817,6 @@ case "${host_cpu}" in
        R_PROG_CC_FLAG([-ieee_with_inexact],
                       R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact]))
      fi
@@ -38,8 +38,8 @@ $NetBSD: patch-aa,v 1.17 2007/03/14 11:50:35 markd Exp $
      if test "${GXX}" = yes; then
        R_PROG_CXX_FLAG([-mieee],
                        R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee]))
-@@ -1327,6 +1320,7 @@ rm -f libconftest${DYLIB_EXT} conftest.c
-     fpicflags=
+@@ -1380,6 +1373,7 @@ rm -f libconftest${DYLIB_EXT} conftest.c
+     fcpicflags=
      ;;
    netbsd*)
 +    fpicflags="-fPIC"
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index 01a2fd34ab7..3456002e022 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
+$NetBSD: patch-ac,v 1.20 2007/11/03 20:14:40 markd Exp $
 
---- configure.orig	2006-12-07 00:16:29.000000000 +1300
+--- configure.orig	2007-09-26 14:06:08.000000000 +1200
 +++ configure
-@@ -2085,7 +2085,7 @@ else
- fi;
+@@ -2659,7 +2659,7 @@ fi
+ 
  
  if test "${want_R_shlib}" = yes; then
 -  LIBR="-L\$(R_HOME)/lib\$(R_ARCH) -lR"
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  else
    LIBR=
  fi
-@@ -6799,7 +6799,7 @@ darwin* | rhapsody*)
+@@ -8432,7 +8432,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -9324,7 +9324,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11104,7 +11104,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -9902,7 +9902,7 @@ kfreebsd*-gnu)
+@@ -11682,7 +11682,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -12283,7 +12283,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14170,7 +14170,7 @@ if test -z "$aix_libpath"; then aix_libp
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12994,7 +12994,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14881,7 +14881,7 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13605,7 +13605,7 @@ kfreebsd*-gnu)
+@@ -15492,7 +15492,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -65,7 +65,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -16176,7 +16176,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18170,7 +18170,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -74,7 +74,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -16754,7 +16754,7 @@ kfreebsd*-gnu)
+@@ -18748,7 +18748,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -83,7 +83,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -18527,7 +18527,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -20548,7 +20548,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -92,7 +92,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -19105,7 +19105,7 @@ kfreebsd*-gnu)
+@@ -21126,7 +21126,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -101,16 +101,16 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -22139,13 +22139,13 @@ fi
+@@ -24329,13 +24329,13 @@ fi
      ## only need ncurses if libreadline is not statically linked against it
      unset ac_cv_lib_readline_rl_callback_read_char
  
--echo "$as_me:$LINENO: checking for main in -lncurses" >&5
--echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for main in -lncurses" >&5
+-echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_ncurses_main+set}" = set; then
-+echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
-+echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6
-+if test "${ac_cv_lib_termcap+set}" = set; then
++{ echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
++echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6; }
++if test "${ac_cv_lib_termcap_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -119,7 +119,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22184,35 +22184,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -24386,36 +24386,36 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -129,18 +129,19 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_lib_ncurses_main=no
-+ac_cv_lib_termcap_main=no
+-	ac_cv_lib_ncurses_main=no
++	ac_cv_lib_termcap_main=no
  fi
- rm -f conftest.err conftest.$ac_objext \
+ 
+ rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
--echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6; }
 -if test $ac_cv_lib_ncurses_main = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
++echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6; }
 +if test $ac_cv_lib_termcap_main = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define HAVE_LIBNCURSES 1
@@ -152,11 +153,11 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  
  else
  
--echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
--echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
+-echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_termcap_main+set}" = set; then
-+echo "$as_me:$LINENO: checking for main in -ltermlib" >&5
-+echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -ltermlib" >&5
++echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_termlib_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -166,7 +167,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22251,35 +22251,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -24466,36 +24466,36 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -176,18 +177,19 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_lib_termcap_main=no
-+ac_cv_lib_termlib_main=no
+-	ac_cv_lib_termcap_main=no
++	ac_cv_lib_termlib_main=no
  fi
- rm -f conftest.err conftest.$ac_objext \
+ 
+ rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6; }
 -if test $ac_cv_lib_termcap_main = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5
++echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6; }
 +if test $ac_cv_lib_termlib_main = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define HAVE_LIBTERMCAP 1
@@ -199,11 +201,11 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  
  else
  
--echo "$as_me:$LINENO: checking for main in -ltermlib" >&5
--echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for main in -ltermlib" >&5
+-echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_termlib_main+set}" = set; then
-+echo "$as_me:$LINENO: checking for main in -lncurses" >&5
-+echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lncurses" >&5
++echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_ncurses_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -213,7 +215,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22318,25 +22318,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -24546,26 +24546,26 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -223,18 +225,19 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_lib_termlib_main=no
-+ac_cv_lib_ncurses_main=no
+-	ac_cv_lib_termlib_main=no
++	ac_cv_lib_ncurses_main=no
  fi
- rm -f conftest.err conftest.$ac_objext \
+ 
+ rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5
--echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6; }
 -if test $ac_cv_lib_termlib_main = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
++echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6; }
 +if test $ac_cv_lib_ncurses_main = yes; then
    cat >>confdefs.h <<_ACEOF
 -#define HAVE_LIBTERMLIB 1
@@ -246,7 +249,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  
  fi
  
-@@ -27973,6 +27973,7 @@ cat > conftest.c <<EOF
+@@ -32398,6 +32398,7 @@ cat > conftest.c <<EOF
  #else
  # define F77_SYMBOL(x)   x
  #endif
@@ -254,7 +257,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  int main () {
    exit(0);
  }
-@@ -28043,6 +28044,9 @@ cat > conftest.c <<EOF
+@@ -32475,6 +32476,9 @@ cat > conftest.c <<EOF
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -264,7 +267,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  int main () {
    int a[3] = {17, 237, 2000000000}, b[2], res = 0;
    double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -28133,6 +28137,9 @@ typedef struct {
+@@ -32572,6 +32576,9 @@ typedef struct {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -274,15 +277,15 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  int main () {
      Rcomplex z[3];
  
-@@ -28528,157 +28535,6 @@ echo "${ECHO_T}no" >&6
+@@ -33739,183 +33746,6 @@ echo "${ECHO_T}no" >&6; }
  fi
  
      fi
 -    if test "${G77}" = yes; then
 -      ac_safe=_mieee
--echo "$as_me:$LINENO: checking whether ${F77} accepts -mieee" >&5
--echo $ECHO_N "checking whether ${F77} accepts -mieee... $ECHO_C" >&6
--if eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\" = set"; then
+-{ echo "$as_me:$LINENO: checking whether ${F77} accepts -mieee" >&5
+-echo $ECHO_N "checking whether ${F77} accepts -mieee... $ECHO_C" >&6; }
+-if { as_var=r_cv_prog_f77_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_ext=f
@@ -298,24 +301,36 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -324,9 +339,10 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--eval "r_cv_prog_f77_flag_${ac_safe}=no"
+-	eval "r_cv_prog_f77_flag_${ac_safe}=no"
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -FFLAGS="${r_save_FFLAGS}"
 -ac_ext=c
@@ -339,8 +355,8 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -fi
 -
 -if eval "test \"`echo '$r_cv_prog_f77_flag_'$ac_safe`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -  separator=""
 -test -z "${separator}" && separator=" "
 -if test -z "${R_XTRA_FFLAGS}"; then
@@ -349,15 +365,15 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -  R_XTRA_FFLAGS="${R_XTRA_FFLAGS}${separator}-mieee"
 -fi
 -else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -fi
 -
 -    else
 -      ac_safe=_fpe3
--echo "$as_me:$LINENO: checking whether ${F77} accepts -fpe3" >&5
--echo $ECHO_N "checking whether ${F77} accepts -fpe3... $ECHO_C" >&6
--if eval "test \"\${r_cv_prog_f77_flag_${ac_safe}+set}\" = set"; then
+-{ echo "$as_me:$LINENO: checking whether ${F77} accepts -fpe3" >&5
+-echo $ECHO_N "checking whether ${F77} accepts -fpe3... $ECHO_C" >&6; }
+-if { as_var=r_cv_prog_f77_flag_${ac_safe}; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_ext=f
@@ -373,24 +389,36 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -399,9 +427,10 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--eval "r_cv_prog_f77_flag_${ac_safe}=no"
+-	eval "r_cv_prog_f77_flag_${ac_safe}=no"
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -FFLAGS="${r_save_FFLAGS}"
 -ac_ext=c
@@ -414,8 +443,8 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -fi
 -
 -if eval "test \"`echo '$r_cv_prog_f77_flag_'$ac_safe`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -  separator=""
 -test -z "${separator}" && separator=" "
 -if test -z "${R_XTRA_FFLAGS}"; then
@@ -424,15 +453,15 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 -  R_XTRA_FFLAGS="${R_XTRA_FFLAGS}${separator}-fpe3"
 -fi
 -else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -fi
 -
 -    fi
      if test "${GXX}" = yes; then
        ac_safe=_mieee
- echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
-@@ -29013,7 +28869,7 @@ _ACEOF
+ { echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
+@@ -34380,7 +34210,7 @@ _ACEOF
      if test "${GCC}" = yes; then
        ## only Apple build of gcc supports (and needs?) -no-cpp-precomp
        ${CC} --version|grep Apple >/dev/null 2>/dev/null
@@ -441,7 +470,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
          separator=""
  test -z "${separator}" && separator=" "
  if test -z "${R_XTRA_CPPFLAGS}"; then
-@@ -30053,7 +29909,7 @@ echo "$as_me: WARNING: Use of flat names
+@@ -35551,7 +35381,7 @@ echo "$as_me: WARNING: Use of flat names
        SHLIB_LIBADD="-lcc_dynamic"
      fi
      ;;
@@ -450,24 +479,24 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
      ## Only sure for FreeBSD 3 and above.
      main_ldflags="-export-dynamic"
      shlib_ldflags="-shared"
-@@ -30141,6 +29997,7 @@ echo "$as_me: WARNING: Use of flat names
-     fpicflags=
+@@ -35640,6 +35470,7 @@ echo "$as_me: WARNING: Use of flat names
+     fcpicflags=
      ;;
    netbsd*)
 +    fpicflags="-fPIC"
      if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
        main_ldflags="-export-dynamic"
        shlib_ldflags="-shared"
-@@ -30240,7 +30097,7 @@ fi
+@@ -35739,7 +35570,7 @@ fi
  : ${FPICFLAGS="${fpicflags}"}
  if test -z "${FPICFLAGS}"; then
    case "${host_os}" in
--    aix*|irix*|mingw*|osf*)
-+    aix*|irix*|mingw*|osf*|darwin*)
+-    aix*|cygwin*|irix*|mingw*|osf*)
++    aix*|cygwin*|irix*|mingw*|osf*|darwin*)
        ;;
      *)
        { echo "$as_me:$LINENO: WARNING: I could not determine FPICFLAGS." >&5
-@@ -36377,6 +36234,15 @@ cat > conftest.c <<EOF
+@@ -42894,6 +42725,15 @@ cat > conftest.c <<EOF
  #endif
  extern void F77_SYMBOL(test1)(int *iflag);
  
@@ -483,7 +512,7 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  int main () {
    int iflag;
    F77_SYMBOL(test1)(&iflag);
-@@ -36441,6 +36307,14 @@ else
+@@ -42958,6 +42798,14 @@ else
  #else
  # define F77_SYMBOL(x)   x
  #endif
@@ -498,12 +527,3 @@ $NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
  void F77_SYMBOL(xerbla)(char *srname, int *info)
  {}
  void blas_set () {
-@@ -39649,7 +39523,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
- 
-   r_save_LIBS=${LIBS}
--  if test "$want_utf8_support" == yes ; then
-+  if test "$want_utf8_support" = yes ; then
-     LIBS="${LIBS} ${X_LIBS}"
- 
-