Remove patches to deal with two bugs involving configure's handling of

INSTALL which have both been worked around in bsd.pkg.mk now.

4 files changed, 6 insertions, 47 deletions

diff --git a/math/gnumeric/files/patch-sum b/math/gnumeric/files/patch-sum
index 08518ed51b2..769462134b0 100644
--- a/math/gnumeric/files/patch-sum
+++ b/math/gnumeric/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/04/16 15:11:22 rh Exp $
+$NetBSD: patch-sum,v 1.7 2000/05/02 18:48:42 danw Exp $
 
-MD5 (patch-aa) = 489552dc150dc49b0830c87a5188ad7b
+MD5 (patch-aa) = 353694bc5e96370a53de2f8cd04f8fce
 MD5 (patch-ab) = 0014575256b106ac48535a77951c0d8f
diff --git a/math/gnumeric/patches/patch-aa b/math/gnumeric/patches/patch-aa
index 880defc2f45..5c218469e04 100644
--- a/math/gnumeric/patches/patch-aa
+++ b/math/gnumeric/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/04/16 15:11:22 rh Exp $
+$NetBSD: patch-aa,v 1.6 2000/05/02 18:48:42 danw Exp $
 
 --- configure.orig	Thu Apr 13 03:43:02 2000
 +++ configure	Sun Apr 16 08:06:05 2000
@@ -20,16 +20,3 @@ $NetBSD: patch-aa,v 1.5 2000/04/16 15:11:22 rh Exp $
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -6310,10 +6310,12 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
- 
-+if false; then
-   case "$ac_given_INSTALL" in
-   [/$]*) INSTALL="$ac_given_INSTALL" ;;
-   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-   esac
-+fi
- 
-   echo creating "$ac_file"
-   rm -f "$ac_file"
diff --git a/math/octave/files/patch-sum b/math/octave/files/patch-sum
index a6638527409..52fa959cf5d 100644
--- a/math/octave/files/patch-sum
+++ b/math/octave/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/04/28 08:59:36 wennmach Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:42 danw Exp $
 
-MD5 (patch-aa) = 6fde2f854928d3dfa2329ddc3695de71
+MD5 (patch-aa) = 6b7ff860a79a2f0b5ddca6f27701e45d
 MD5 (patch-ac) = 2a6442eada33ed4e4f398e532e1596b3
 MD5 (patch-ae) = 1393f300cc9c83023bc15b03a9450733
 MD5 (patch-af) = 2537d9b77f550c0c8646ddcafff0bcd5
diff --git a/math/octave/patches/patch-aa b/math/octave/patches/patch-aa
index 0dff80e2e6e..6f8318d5488 100644
--- a/math/octave/patches/patch-aa
+++ b/math/octave/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2000/04/28 08:59:36 wennmach Exp $
+$NetBSD: patch-aa,v 1.5 2000/05/02 18:48:42 danw Exp $
 --- configure.orig	Sun Jan 30 03:26:06 2000
 +++ configure	Wed Apr 26 20:36:07 2000
 @@ -5180,7 +5180,7 @@
@@ -24,31 +24,3 @@ $NetBSD: patch-aa,v 1.4 2000/04/28 08:59:36 wennmach Exp $
    echo "configure: warning: $warn_termlibs" 1>&2
  fi
  
-@@ -6182,7 +6180,6 @@
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:6185: checking for a BSD compatible install" >&5
--if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6221,7 +6218,6 @@
-     # removed, or if the path is relative.
-     INSTALL="$ac_install_sh"
-   fi
--fi
- echo "$ac_t""$INSTALL" 1>&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -7209,10 +7205,7 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+    ac_given_INSTALL="${INSTALL}"  
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.