Regenerate two patch files, to ensure they can be applied without a

fuzz factor, and rtemove the fuzz factor definition from the package
makefile.

4 files changed, 16 insertions, 18 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 9f03573b775..7c5e6847a27 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 1999/11/12 11:17:02 agc Exp $
+# $NetBSD: Makefile,v 1.38 1999/11/22 11:23:41 agc Exp $
 
 DISTNAME=	gtk+-1.2.6
 CATEGORIES=	x11
@@ -27,8 +27,6 @@ CPPFLAGS=	-I${LOCALBASE}/include				# libintl.h
 LDFLAGS=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib	# -lintl
 PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
 
-PATCH_FUZZ_FACTOR=	-F1
-
 # The following ensures that `gtk-config --libs' includes the correct linker
 # flags for linking the X11 libs.
 #
diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index 792db8b26bb..641c61f7191 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.4 1999/10/22 23:35:04 tron Exp $
+$NetBSD: patch-sum,v 1.5 1999/11/22 11:23:43 agc Exp $
 
-MD5 (patch-aa) = 8e41de0b36ae3d362a29eb1fe7f42212
+MD5 (patch-aa) = 1f57688999f57cb137d329a7b6e6ed83
 MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade
 MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189
 MD5 (patch-ad) = dec2132522595c59687fa3af05b75462
-MD5 (patch-ae) = 64ca7aa504acc04b1f15f1caf62a88ee
+MD5 (patch-ae) = 6ea976db6fcdc0143dd048024f044894
 MD5 (patch-af) = c3ac2a236275341e06d6a6566b876759
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 244d638d0f8..7653a3ea4ac 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.14 1999/10/22 23:35:04 tron Exp $
+$NetBSD: patch-aa,v 1.15 1999/11/22 11:23:43 agc Exp $
 
---- configure.orig	Mon Aug 23 23:31:31 1999
-+++ configure	Sun Aug 29 00:36:21 1999
+--- configure.orig	Thu Oct  7 18:52:16 1999
++++ configure	Mon Nov 22 11:20:03 1999
 @@ -22,8 +22,8 @@
  #
  GTK_MAJOR_VERSION=1
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.14 1999/10/22 23:35:04 tron Exp $
  GTK_BINARY_AGE=6
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
  ac_help="$ac_help
-@@ -1389,6 +1389,7 @@
+@@ -1391,6 +1391,7 @@
  
  
  # Check for any special flags to pass to ltconfig.
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.14 1999/10/22 23:35:04 tron Exp $
  libtool_flags="--cache-file=$cache_file"
  test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
  test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-@@ -1541,6 +1542,7 @@
+@@ -1543,6 +1544,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.14 1999/10/22 23:35:04 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -4076,7 +4078,7 @@
+@@ -4087,7 +4089,7 @@
  
  # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.14 1999/10/22 23:35:04 tron Exp $
  
  
  echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
-@@ -6990,10 +6992,12 @@
+@@ -6897,10 +6899,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/x11/gtk/patches/patch-ae b/x11/gtk/patches/patch-ae
index f3c2a9d1e98..436a4a58021 100644
--- a/x11/gtk/patches/patch-ae
+++ b/x11/gtk/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1 1999/01/16 04:18:02 tron Exp $
+$NetBSD: patch-ae,v 1.2 1999/11/22 11:23:43 agc Exp $
 
---- gdk/gdkimage.c.orig	Mon Jan  4 10:33:27 1999
-+++ gdk/gdkimage.c	Sat Jan 16 02:01:30 1999
-@@ -18,12 +18,14 @@
-  */
+--- gdk/gdkimage.c.orig	Fri Sep  3 19:56:57 1999
++++ gdk/gdkimage.c	Mon Nov 22 11:12:23 1999
+@@ -26,12 +26,14 @@
+ 
  #include <config.h>
  
 +#ifdef __linux__