test -z $foo -> test -z "$foo"

fixes build on Solaris.

2 files changed, 46 insertions, 25 deletions

diff --git a/math/R/distinfo b/math/R/distinfo
index d3ced707a16..be7bde0a98a 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29 2005/12/29 23:23:53 markd Exp $
+$NetBSD: distinfo,v 1.30 2006/02/04 22:25:06 markd Exp $
 
 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-ac) = 95888e1a7bbd17a7c258973281adf9c702305673
 SHA1 (patch-ad) = 83c9b046822b1d350daec8739ca4ee2a6b7e1978
 SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index ba01294eac8..3cac6ae4175 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,8 +1,29 @@
-$NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
+$NetBSD: patch-ac,v 1.16 2006/02/04 22:25:06 markd Exp $
 
---- configure.orig	2005-06-20 09:02:39.000000000 +0000
+--- configure.orig	2005-12-16 16:07:00.000000000 +1300
 +++ configure
-@@ -2173,7 +2173,7 @@ else
+@@ -1910,17 +1910,17 @@ fi
+ 
+ ## R installation directories
+ 
+-if test -z ${rdocdir}; then
++if test -z "${rdocdir}"; then
+   rdocdir='${rhome}/doc'
+ fi
+ 
+ 
+-if test -z ${rincludedir}; then
++if test -z "${rincludedir}"; then
+   rincludedir='${rhome}/include'
+ fi
+ 
+ 
+-if test -z ${rsharedir}; then
++if test -z "${rsharedir}"; then
+   rsharedir='${rhome}/share'
+ fi
+ 
+@@ -2246,7 +2246,7 @@ else
  fi
  
  if test "${want_R_shlib}" = yes; then
@@ -11,7 +32,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  else
    LIBR=
  fi
-@@ -6413,7 +6413,7 @@ darwin* | rhapsody*)
+@@ -6438,7 +6438,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -20,7 +41,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -8934,7 +8934,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8963,7 +8963,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -29,7 +50,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -9512,7 +9512,7 @@ kfreebsd*-gnu)
+@@ -9541,7 +9541,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -38,7 +59,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -11892,7 +11892,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11921,7 +11921,7 @@ if test -z "$aix_libpath"; then aix_libp
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -47,7 +68,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12599,7 +12599,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12632,7 +12632,7 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -56,7 +77,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13210,7 +13210,7 @@ kfreebsd*-gnu)
+@@ -13243,7 +13243,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -65,7 +86,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -15781,7 +15781,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15814,7 +15814,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -74,7 +95,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -16359,7 +16359,7 @@ kfreebsd*-gnu)
+@@ -16392,7 +16392,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -83,7 +104,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -18128,7 +18128,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18165,7 +18165,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -92,7 +113,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -18706,7 +18706,7 @@ kfreebsd*-gnu)
+@@ -18743,7 +18743,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -101,7 +122,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -21697,13 +21697,13 @@ fi
+@@ -21746,13 +21746,13 @@ fi
      ## only need ncurses if libreadline is not statically linked against it
      unset ac_cv_lib_readline_rl_callback_read_char
  
@@ -119,7 +140,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21742,35 +21742,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21791,35 +21791,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -166,7 +187,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21809,35 +21809,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21858,35 +21858,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -213,7 +234,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21876,25 +21876,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21925,25 +21925,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -246,7 +267,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  
  fi
  
-@@ -27065,6 +27065,7 @@ cat > conftest.c <<EOF
+@@ -27173,6 +27173,7 @@ cat > conftest.c <<EOF
  #else
  # define F77_SYMBOL(x)   x
  #endif
@@ -254,7 +275,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  int main () {
    exit(0);
  }
-@@ -27133,6 +27134,9 @@ cat > conftest.c <<EOF
+@@ -27243,6 +27244,9 @@ cat > conftest.c <<EOF
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -264,7 +285,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  int main () {
    int a[3] = {17, 237, 2000000000}, b[2], res = 0;
    double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -27221,6 +27225,9 @@ typedef struct {
+@@ -27333,6 +27337,9 @@ typedef struct {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -274,7 +295,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
  int main () {
      Rcomplex z[3];
  
-@@ -28047,157 +28054,6 @@ echo "${ECHO_T}no" >&6
+@@ -28170,157 +28177,6 @@ echo "${ECHO_T}no" >&6
  fi
  
      fi
@@ -432,7 +453,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
      if test "${GXX}" = yes; then
        ac_safe=_mieee
  echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5
-@@ -29093,7 +28949,7 @@ fi ;;
+@@ -29210,7 +29066,7 @@ fi ;;
        SHLIB_LIBADD="-lcc_dynamic"
      fi
      ;;
@@ -441,7 +462,7 @@ $NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $
      ## Only sure for FreeBSD 3 and above.
      main_ldflags="-export-dynamic"
      shlib_ldflags="-shared"
-@@ -29151,6 +29007,7 @@ fi ;;
+@@ -29458,6 +29314,7 @@ fi
      fpicflags=
      ;;
    netbsd*)