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, 49 deletions

diff --git a/audio/libaudiofile/files/patch-sum b/audio/libaudiofile/files/patch-sum
index fb2b049341e..68b855b1878 100644
--- a/audio/libaudiofile/files/patch-sum
+++ b/audio/libaudiofile/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/10/22 23:43:15 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:36 danw Exp $
 
-MD5 (patch-aa) = 481f1910abba96eaa5e9150847e131a1
+MD5 (patch-aa) = 1545e7c7b9ea8ddbb01ef9589ddb7b93
 MD5 (patch-ab) = 1ac8bbaf7fc0c6b51c8a72212b0cd7db
diff --git a/audio/libaudiofile/patches/patch-aa b/audio/libaudiofile/patches/patch-aa
index 57a0c502206..e5d4d33fc29 100644
--- a/audio/libaudiofile/patches/patch-aa
+++ b/audio/libaudiofile/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 1999/10/22 23:43:16 tron Exp $
+$NetBSD: patch-aa,v 1.5 2000/05/02 18:48:36 danw Exp $
 
 --- configure.orig	Tue Sep 21 00:05:06 1999
 +++ configure	Fri Oct 22 21:12:54 1999
@@ -19,16 +19,3 @@ $NetBSD: patch-aa,v 1.4 1999/10/22 23:43:16 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -3231,10 +3232,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/audio/xmms/files/patch-sum b/audio/xmms/files/patch-sum
index e3806844073..c07a56c82d1 100644
--- a/audio/xmms/files/patch-sum
+++ b/audio/xmms/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.3 2000/03/16 23:00:52 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/05/02 18:48:36 danw Exp $
 
 MD5 (patch-aa) = 6baf24a23b13f5d17300258c06b8eb7c
 MD5 (patch-ab) = 4030687175bf4bab9bb098150e15323a
 MD5 (patch-ac) = ff78dda0c8c7de0e796a04dd6ba6991c
 MD5 (patch-ad) = 0980675c9c1896eca7188bffd02d7cbd
-MD5 (patch-ae) = 55aa95366499b0f8e03d28900b2765ea
+MD5 (patch-ae) = aa574bde74698dab9e3644e26aae9ba7
 MD5 (patch-af) = 0cb7493fcd03dc2e213a0c4cc0d1e63e
 MD5 (patch-ag) = ff4bbfada5d95d0a083cf60fdf2568bb
 MD5 (patch-ah) = 27624c39b2779ef2b2aaa024510c3bc0
diff --git a/audio/xmms/patches/patch-ae b/audio/xmms/patches/patch-ae
index dc34f212bbb..44c53eae305 100644
--- a/audio/xmms/patches/patch-ae
+++ b/audio/xmms/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2000/03/12 20:36:27 tron Exp $
+$NetBSD: patch-ae,v 1.3 2000/05/02 18:48:36 danw Exp $
 
 --- configure.orig	Mon Jan 31 19:43:50 2000
 +++ configure	Sun Mar 12 21:20:08 2000
@@ -36,33 +36,3 @@ $NetBSD: patch-ae,v 1.2 2000/03/12 20:36:27 tron Exp $
  cat > conftest.$ac_ext <<EOF
  #line 3301 "configure"
  #include "confdefs.h"
-@@ -5311,10 +5313,10 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
- 
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
-+#  case "$ac_given_INSTALL" in
-+#  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#  esac
- 
-   echo creating "$ac_file"
-   rm -f "$ac_file"
-@@ -5535,10 +5537,10 @@
-       *) # 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
-+#  case "$ac_given_INSTALL" in
-+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#        esac
- 
-       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.