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

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

12 files changed, 16 insertions, 125 deletions

diff --git a/devel/bonobo/files/patch-sum b/devel/bonobo/files/patch-sum
index 3dfc59d7e95..8e73d2e02e3 100644
--- a/devel/bonobo/files/patch-sum
+++ b/devel/bonobo/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/01/02 15:15:16 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/02 18:48:37 danw Exp $
 
-MD5 (patch-aa) = 58b085e18a3afd80acd9bec2efb6bf1d
 MD5 (patch-ab) = d8fde37adbb970401c00589afd577c1a
diff --git a/devel/bonobo/patches/patch-aa b/devel/bonobo/patches/patch-aa
deleted file mode 100644
index 8426768a2b6..00000000000
--- a/devel/bonobo/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/01/02 15:15:16 rh Exp $
-
---- configure.orig	Mon Sep 27 22:32:28 1999
-+++ configure	Sun Jan  2 14:41:09 2000
-@@ -5323,10 +5323,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"
-@@ -5596,10 +5598,13 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
-+
-+if false; then
-   case "$ac_given_INSTALL" in
-         [/$]*) INSTALL="$ac_given_INSTALL" ;;
-         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-         esac
-+fi
- 
-       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.
diff --git a/devel/glib/files/patch-sum b/devel/glib/files/patch-sum
index e73164ffcdf..1c8d2f2ce1e 100644
--- a/devel/glib/files/patch-sum
+++ b/devel/glib/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.5 2000/03/12 22:24:07 tron Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/02 18:48:37 danw Exp $
 
 MD5 (patch-aa) = f0f79c4b4966ceb121bd12f240e5aef6
 MD5 (patch-ab) = 9037429c991ff06f71a81e91c1e963f7
 MD5 (patch-ac) = cd3b59c2ee386ad8bd293b09adca1ba6
-MD5 (patch-ad) = 848f6f27ef61d243dbce4dee0636e0ae
+MD5 (patch-ad) = d3d70525dc7433fdc962feac7992c4f9
 MD5 (patch-ae) = f4182beff6eedc691d74330a54dbb63b
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
index c6cb9bee580..b5367e8f030 100644
--- a/devel/glib/patches/patch-ad
+++ b/devel/glib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.9 2000/03/12 22:24:07 tron Exp $
+$NetBSD: patch-ad,v 1.10 2000/05/02 18:48:38 danw Exp $
 
 --- configure.orig	Wed Feb 16 12:14:08 2000
 +++ configure	Sun Mar 12 22:26:00 2000
@@ -24,16 +24,3 @@ $NetBSD: patch-ad,v 1.9 2000/03/12 22:24:07 tron Exp $
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
  exec 5>>./config.log
-@@ -5796,10 +5799,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/devel/gtexinfo/files/patch-sum b/devel/gtexinfo/files/patch-sum
index 2a3afa75286..049406ec662 100644
--- a/devel/gtexinfo/files/patch-sum
+++ b/devel/gtexinfo/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/01/20 11:48:03 agc Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:39 danw Exp $
 
 MD5 (patch-aa) = ef43cb391dfa3ee1a01b7ea533d42e47
 MD5 (patch-ab) = b4f21f670a33dc7a6d6f0b5bf18cae14
@@ -6,4 +6,4 @@ MD5 (patch-ac) = 74f13b6637e046c9fd1886c52c6dafdf
 MD5 (patch-ad) = 320d2d96e5c29655056c5400e538b834
 MD5 (patch-ae) = 72a588de899da899daf7a8d4da1575aa
 MD5 (patch-af) = 990a7730d8115426662d2d678a99860e
-MD5 (patch-ag) = b0bc330985fcb3c6b4a8565bb82ccc7f
+MD5 (patch-ag) = 5d291b43639f413c40ba2e692bc4223f
diff --git a/devel/gtexinfo/patches/patch-ag b/devel/gtexinfo/patches/patch-ag
index 5ebc0ca699e..956f32335fc 100644
--- a/devel/gtexinfo/patches/patch-ag
+++ b/devel/gtexinfo/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 1999/03/04 14:56:44 agc Exp $
+$NetBSD: patch-ag,v 1.4 2000/05/02 18:48:39 danw Exp $
 
 Don't check ncurses lib - just use standard curses.
 Install files into share hierarchy
@@ -25,17 +25,3 @@ Don't assume that we're using the install.sh script - comment out
  		 INTLDEPS='$(top_builddir)/intl/libintl.a'
  		 INTLLIBS=$INTLDEPS
  		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -3990,10 +3990,13 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
- 
-+# do not assume that we're using the install.sh script...
-+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/devel/guile-gtk/files/patch-sum b/devel/guile-gtk/files/patch-sum
index 34be595eaa1..23aaa5628ad 100644
--- a/devel/guile-gtk/files/patch-sum
+++ b/devel/guile-gtk/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/04/12 06:58:09 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:39 danw Exp $
 
-MD5 (patch-aa) = d655b4995bd6ac155912fe7cb9376c92
+MD5 (patch-aa) = 8639ad22d0903f08634fd64eeda2f5ee
 MD5 (patch-ab) = d28b87615af6c07fcc7a5a79933f103d
diff --git a/devel/guile-gtk/patches/patch-aa b/devel/guile-gtk/patches/patch-aa
index a46d495176c..a63638843f4 100644
--- a/devel/guile-gtk/patches/patch-aa
+++ b/devel/guile-gtk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/20 11:58:46 rh Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/02 18:48:39 danw Exp $
 
 --- configure.orig	Sun Oct 17 01:16:57 1999
 +++ configure	Sun Dec 19 18:46:02 1999
@@ -36,16 +36,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/20 11:58:46 rh Exp $
     LIBTOOL_IS_WINNING="#t"
     echo "$ac_t""yes" 1>&6
  else
-@@ -2854,10 +2856,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/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index 8cde1cc7ec7..f1e44f7a6ea 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/09/02 21:35:51 christos Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:40 danw Exp $
 
-MD5 (patch-aa) = f47278bd27bfc99145be98ea23da3329
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
deleted file mode 100644
index 65dd08326fc..00000000000
--- a/devel/libtool/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.7 1999/09/02 21:35:51 christos Exp $
-
---- configure.orig	Fri Jul  2 12:01:56 1999
-+++ configure	Fri Aug 20 18:22:00 1999
-@@ -1853,10 +1853,13 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
-+      if [ -z "$ac_given_INSTALL" ]; then
-+	ac_given_INSTALL="$INSTALL"
-+      fi
-+      case "$ac_given_INSTALL" in
-         [/$]*) INSTALL="$ac_given_INSTALL" ;;
-         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+      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.
diff --git a/devel/m4/files/patch-sum b/devel/m4/files/patch-sum
index febcec9d80b..64b291c0b02 100644
--- a/devel/m4/files/patch-sum
+++ b/devel/m4/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:38 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/02 18:48:40 danw Exp $
 
 MD5 (patch-aa) = 4f56576d060572a9f76a1231c17c9395
 MD5 (patch-ab) = 044d236782955d9dfdd70ca776ce71e3
-MD5 (patch-ac) = 53e7c1b4fe5e278d464bf476923b08ee
diff --git a/devel/m4/patches/patch-ac b/devel/m4/patches/patch-ac
deleted file mode 100644
index 1780aa85a4d..00000000000
--- a/devel/m4/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/03/05 10:05:46 agc Exp $
-
-Don't try to put dots in front of an absolute pathname.
-
---- configure	1999/03/05 09:57:49	1.1
-+++ configure	1999/03/05 09:59:04
-@@ -1996,10 +1996,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"
-   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."