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

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

43 files changed, 63 insertions, 483 deletions

diff --git a/archivers/liblzo/files/patch-sum b/archivers/liblzo/files/patch-sum
index 21767553044..ce0bc660b18 100644
--- a/archivers/liblzo/files/patch-sum
+++ b/archivers/liblzo/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 1999/12/22 19:46:23 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:35 danw Exp $
 
-MD5 (patch-aa) = db9cfdab42dba833d1268cc90224d110
+MD5 (patch-aa) = ac6ea2fdce6b48c7c3faf0a033ebc93a
diff --git a/archivers/liblzo/patches/patch-aa b/archivers/liblzo/patches/patch-aa
index b6ecdc4756b..021bb280b44 100644
--- a/archivers/liblzo/patches/patch-aa
+++ b/archivers/liblzo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1999/12/22 19:46:24 rh Exp $
+$NetBSD: patch-aa,v 1.3 2000/05/02 18:48:35 danw Exp $
 
 --- configure.orig	Mon Nov 29 18:37:24 1999
 +++ configure	Wed Dec 22 20:33:48 1999
@@ -18,16 +18,3 @@ $NetBSD: patch-aa,v 1.2 1999/12/22 19:46:24 rh Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -4050,10 +4052,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/archivers/lzop/files/patch-sum b/archivers/lzop/files/patch-sum
index f1fa403393a..99f16937a89 100644
--- a/archivers/lzop/files/patch-sum
+++ b/archivers/lzop/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/08/16 15:42:22 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/02 18:48:35 danw Exp $
 
-MD5 (patch-aa) = 3e97e1afb36458c297f3292385e8aeb5
+MD5 (patch-aa) = 91db3620c9a2b0238e39684e1505a226
diff --git a/archivers/lzop/patches/patch-aa b/archivers/lzop/patches/patch-aa
index 6f9f4352114..6fabe5e9003 100644
--- a/archivers/lzop/patches/patch-aa
+++ b/archivers/lzop/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/16 15:39:23 rh Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/02 18:48:36 danw Exp $
 
 --- configure.orig	Sat Apr 25 18:23:14 1998
 +++ configure	Mon Aug 16 16:00:37 1999
@@ -11,16 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/16 15:39:23 rh Exp $
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  echo "configure:2272: checking for $ac_func" >&5
-@@ -2941,10 +2941,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/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.
diff --git a/corba/ORBit/files/patch-sum b/corba/ORBit/files/patch-sum
index 3c26d55da22..a8809c00514 100644
--- a/corba/ORBit/files/patch-sum
+++ b/corba/ORBit/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.4 1999/11/13 23:57:31 tron Exp $
+$NetBSD: patch-sum,v 1.5 2000/05/02 18:48:37 danw Exp $
 
 MD5 (patch-aa) = 970a8c13fe579d27ad5aa30a7b89f5af
 MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321
-MD5 (patch-ac) = fe026df2a9ecc4445b873b4b07312711
+MD5 (patch-ac) = 5ee45bc357f9093459722e591d358707
 MD5 (patch-ad) = b5a1964a714884369ba9c60790380f69
 MD5 (patch-ae) = 98464c52bd7f89c590bdf08982f2a330
 MD5 (patch-ag) = be7d2b90edbefb47476fad9e650a26e1
diff --git a/corba/ORBit/patches/patch-ac b/corba/ORBit/patches/patch-ac
index e18e50ffbb0..ee0ed1f12b1 100644
--- a/corba/ORBit/patches/patch-ac
+++ b/corba/ORBit/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 1999/10/22 23:35:37 tron Exp $
+$NetBSD: patch-ac,v 1.4 2000/05/02 18:48:37 danw Exp $
 
 --- configure.orig	Tue Sep 28 18:11:49 1999
 +++ configure	Sat Oct 23 00:50:21 1999
@@ -18,33 +18,3 @@ $NetBSD: patch-ac,v 1.3 1999/10/22 23:35:37 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -5164,10 +5166,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"
-@@ -5388,10 +5390,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.
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."
diff --git a/graphics/xsane/files/patch-sum b/graphics/xsane/files/patch-sum
index 7ff38165602..f95bb2e6e60 100644
--- a/graphics/xsane/files/patch-sum
+++ b/graphics/xsane/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/01/06 13:48:11 rh Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/02 18:48:40 danw Exp $
 
-MD5 (patch-aa) = d9ded3d2665d4cdb2976d211bff15a6a
+MD5 (patch-aa) = 25ffddb17d5a34043c5626ac58adf882
 MD5 (patch-ab) = d180e1bee83c3ec706effb9901113fb0
diff --git a/graphics/xsane/patches/patch-aa b/graphics/xsane/patches/patch-aa
index 0a972b2b4cc..93523ee3db7 100644
--- a/graphics/xsane/patches/patch-aa
+++ b/graphics/xsane/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1999/11/11 14:02:09 rh Exp $
+$NetBSD: patch-aa,v 1.4 2000/05/02 18:48:41 danw Exp $
 
 --- configure.orig	Wed Nov  3 19:39:12 1999
 +++ configure	Thu Nov 11 12:36:07 1999
@@ -28,16 +28,3 @@ $NetBSD: patch-aa,v 1.3 1999/11/11 14:02:09 rh Exp $
    for ac_hdr in sane/sane.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -5328,10 +5329,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/mail/balsa/files/patch-sum b/mail/balsa/files/patch-sum
index 7045c670ec6..9efb612da95 100644
--- a/mail/balsa/files/patch-sum
+++ b/mail/balsa/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/04/25 07:07:29 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:41 danw Exp $
 
-MD5 (patch-aa) = 14fed93b017268db5013b42834e77fec
-MD5 (patch-ab) = ea46c12a13d077a766c7ddd718397347
+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/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
deleted file mode 100644
index ce3dd3456f2..00000000000
--- a/mail/balsa/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/04/25 07:07:29 rh Exp $
-
---- configure.orig	Wed Apr 19 05:45:15 2000
-+++ configure	Tue Apr 25 08:39:41 2000
-@@ -6072,10 +6072,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"
-@@ -6345,10 +6347,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/mail/balsa/patches/patch-ab b/mail/balsa/patches/patch-ab
deleted file mode 100644
index fa1dd82e7e3..00000000000
--- a/mail/balsa/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/04/25 07:07:30 rh Exp $
-
---- libmutt/configure.orig	Fri Jan  7 04:00:18 2000
-+++ libmutt/configure	Tue Apr 25 08:41:20 2000
-@@ -3480,10 +3480,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/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.
diff --git a/net/ORBit/files/patch-sum b/net/ORBit/files/patch-sum
index 3c26d55da22..a8809c00514 100644
--- a/net/ORBit/files/patch-sum
+++ b/net/ORBit/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.4 1999/11/13 23:57:31 tron Exp $
+$NetBSD: patch-sum,v 1.5 2000/05/02 18:48:37 danw Exp $
 
 MD5 (patch-aa) = 970a8c13fe579d27ad5aa30a7b89f5af
 MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321
-MD5 (patch-ac) = fe026df2a9ecc4445b873b4b07312711
+MD5 (patch-ac) = 5ee45bc357f9093459722e591d358707
 MD5 (patch-ad) = b5a1964a714884369ba9c60790380f69
 MD5 (patch-ae) = 98464c52bd7f89c590bdf08982f2a330
 MD5 (patch-ag) = be7d2b90edbefb47476fad9e650a26e1
diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac
index e18e50ffbb0..ee0ed1f12b1 100644
--- a/net/ORBit/patches/patch-ac
+++ b/net/ORBit/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 1999/10/22 23:35:37 tron Exp $
+$NetBSD: patch-ac,v 1.4 2000/05/02 18:48:37 danw Exp $
 
 --- configure.orig	Tue Sep 28 18:11:49 1999
 +++ configure	Sat Oct 23 00:50:21 1999
@@ -18,33 +18,3 @@ $NetBSD: patch-ac,v 1.3 1999/10/22 23:35:37 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -5164,10 +5166,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"
-@@ -5388,10 +5390,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.
diff --git a/print/gnome-print/files/patch-sum b/print/gnome-print/files/patch-sum
index ff2421d1011..35cf0fdc3e9 100644
--- a/print/gnome-print/files/patch-sum
+++ b/print/gnome-print/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.8 2000/04/16 15:07:43 rh Exp $
+$NetBSD: patch-sum,v 1.9 2000/05/02 18:48:42 danw Exp $
 
-MD5 (patch-aa) = 096585b540d98446cccab811db88169b
+MD5 (patch-aa) = d48cd018fef0f640f06c5ddaac04a033
 MD5 (patch-ab) = f9a4bccd8d151997db67845244471dd2
 MD5 (patch-ac) = 65698ae5f9ed8d34846c2f2f154b35a1
diff --git a/print/gnome-print/patches/patch-aa b/print/gnome-print/patches/patch-aa
index 9594ce780e9..74847935adb 100644
--- a/print/gnome-print/patches/patch-aa
+++ b/print/gnome-print/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/04/16 15:07:44 rh Exp $
+$NetBSD: patch-aa,v 1.6 2000/05/02 18:48:43 danw Exp $
 
 --- configure.orig	Thu Apr 13 02:52:06 2000
 +++ configure	Sun Apr 16 07:56:42 2000
@@ -21,16 +21,3 @@ $NetBSD: patch-aa,v 1.5 2000/04/16 15:07:44 rh Exp $
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -5081,10 +5082,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/textproc/libxml/files/patch-sum b/textproc/libxml/files/patch-sum
index 2a24b1d5119..3ed136723cc 100644
--- a/textproc/libxml/files/patch-sum
+++ b/textproc/libxml/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.5 2000/01/26 20:32:45 tron Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/02 18:48:43 danw Exp $
 
-MD5 (patch-aa) = dfcb4d7eb4344724546e14d6a2b17915
+MD5 (patch-aa) = 37c21c65350149052a4d214ee087eb36
 MD5 (patch-ab) = 389cb7beae37255f391c7581ea28a03c
 MD5 (patch-ac) = 41af8fe941a7cfe891f9cccd579943ce
diff --git a/textproc/libxml/patches/patch-aa b/textproc/libxml/patches/patch-aa
index 72c84e994b7..f084acb4263 100644
--- a/textproc/libxml/patches/patch-aa
+++ b/textproc/libxml/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1999/07/31 19:02:04 rh Exp $
+$NetBSD: patch-aa,v 1.3 2000/05/02 18:48:43 danw Exp $
 
 --- configure.orig	Thu Jul 15 16:48:03 1999
 +++ configure	Fri Jul 30 18:15:28 1999
@@ -13,16 +13,3 @@ $NetBSD: patch-aa,v 1.2 1999/07/31 19:02:04 rh Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -2951,10 +2953,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/x11/gnome-libs/files/patch-sum b/x11/gnome-libs/files/patch-sum
index 37c5128e07d..0402c5683a8 100644
--- a/x11/gnome-libs/files/patch-sum
+++ b/x11/gnome-libs/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.11 2000/04/29 04:46:27 mycroft Exp $
+$NetBSD: patch-sum,v 1.12 2000/05/02 18:48:43 danw Exp $
 
-MD5 (patch-aa) = 9455a6bfa147f9ccecc16ebe8c666dc4
+MD5 (patch-aa) = 715bc6cdaf104758be2302ab29f086e7
 MD5 (patch-ab) = 911491cf3e32ffa67008d8d617f24a08
 MD5 (patch-ac) = 2234ccfc4f168c91bb2fc8686ed0590c
 MD5 (patch-ad) = c39cc321a208c5bf22aa8d07af9dd1a4
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 150c9f4040e..36492a10c14 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2000/03/13 22:25:47 tron Exp $
+$NetBSD: patch-aa,v 1.9 2000/05/02 18:48:43 danw Exp $
 
 --- configure.orig	Tue Feb 22 15:29:37 2000
 +++ configure	Mon Mar 13 23:08:16 2000
@@ -30,33 +30,3 @@ $NetBSD: patch-aa,v 1.8 2000/03/13 22:25:47 tron Exp $
  GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
  GNOME_IDLDIR='-I${datadir}/idl'
  
-@@ -11093,10 +11095,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"
-@@ -11366,10 +11368,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.
diff --git a/x11/gtk--/files/patch-sum b/x11/gtk--/files/patch-sum
index a69b35cf014..f3d5536884c 100644
--- a/x11/gtk--/files/patch-sum
+++ b/x11/gtk--/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/11/14 23:36:26 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:44 danw Exp $
 
-MD5 (patch-af) = 920eecbca989dd5ed85237ad30d30a32
+MD5 (patch-af) = e6234d2aabb5c84c3217c86cb86551a0
 MD5 (patch-ag) = f506e01307364cead73593ec109895ee
 MD5 (patch-ah) = f65a029f379fbf8274f297d501c1c0e8
diff --git a/x11/gtk--/patches/patch-af b/x11/gtk--/patches/patch-af
index fb8a0a75fc6..f96a7b85cc6 100644
--- a/x11/gtk--/patches/patch-af
+++ b/x11/gtk--/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 1999/11/14 23:36:27 tron Exp $
+$NetBSD: patch-af,v 1.3 2000/05/02 18:48:44 danw Exp $
 
 --- configure.orig	Tue Sep 28 22:07:12 1999
 +++ configure	Sun Nov 14 22:59:48 1999
@@ -18,16 +18,3 @@ $NetBSD: patch-af,v 1.2 1999/11/14 23:36:27 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -4166,10 +4168,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/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index aeda1ad2bf4..0b7bb95b7e4 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.6 2000/03/12 22:30:07 tron Exp $
+$NetBSD: patch-sum,v 1.7 2000/05/02 18:48:44 danw Exp $
 
-MD5 (patch-aa) = 6f3fcbfbec56d0800ce638430c89ee5b
+MD5 (patch-aa) = 1349b1c8498056c8aea8d7d2615ed4e9
 MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade
 MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189
 MD5 (patch-ad) = dec2132522595c59687fa3af05b75462
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 2d2cbf236b2..c2621dc2b33 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.16 2000/03/12 22:30:07 tron Exp $
+$NetBSD: patch-aa,v 1.17 2000/05/02 18:48:44 danw Exp $
 
 --- configure.orig	Wed Feb 16 12:28:06 2000
 +++ configure	Sun Mar 12 22:45:47 2000
@@ -38,16 +38,3 @@ $NetBSD: patch-aa,v 1.16 2000/03/12 22:30:07 tron Exp $
  
  
  echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
-@@ -6902,10 +6904,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"