defuzz

18 files changed, 96 insertions, 97 deletions

diff --git a/games/crossfire/files/patch-sum b/games/crossfire/files/patch-sum
index d2963a0093b..057f24b5ac2 100644
--- a/games/crossfire/files/patch-sum
+++ b/games/crossfire/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:52 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/27 21:57:11 rh Exp $
 
 MD5 (patch-aa) = 5363f1c35056a3518ca9f38bc019976d
 MD5 (patch-ab) = 4d67345e8e9458b200277307ec9769f4
@@ -10,6 +10,6 @@ MD5 (patch-ag) = 7dff97e395e9d9771bc75fbc704b71b8
 MD5 (patch-ah) = 2f7eca14649954bcc43d72f54124b04e
 MD5 (patch-ai) = 229acdde5bf017869d978c4895aa8c1b
 MD5 (patch-aj) = e18072caf69a5e5d77f13fc2042159ba
-MD5 (patch-ak) = e4ef6f8bdfb1c69834de486011eecbb8
+MD5 (patch-ak) = 619ab8cb68f080d74cec6d98aab660a0
 MD5 (patch-al) = ba3bc5dd5b1613aeef235a5c96573a28
 MD5 (patch-am) = 2c0c502f65c55eb43ad895864810023b
diff --git a/games/crossfire/patches/patch-ak b/games/crossfire/patches/patch-ak
index 5c10daa3159..50977c00818 100644
--- a/games/crossfire/patches/patch-ak
+++ b/games/crossfire/patches/patch-ak
@@ -1,14 +1,22 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 10:40:39 agc Exp $
+$NetBSD: patch-ak,v 1.3 1999/11/27 21:57:11 rh Exp $
 
---- include/global.h.orig	Fri Feb 20 03:46:32 1998
-+++ include/global.h	Fri Feb 20 03:46:32 1998
-@@ -50,3 +50,3 @@
- #include "structs.h"
+--- include/global.h.orig	Sat May 16 05:27:10 1998
++++ include/global.h	Sat Nov 27 22:55:21 1999
+@@ -51,7 +51,7 @@
+ 
+ #include "funcpoint.h"
+ 
 -#if defined(RPLAY_SOUND) && !defined(__CEXTRACT__)
 +#if defined(RPLAY_SND) && !defined(__CEXTRACT__)
  #include <rplay.h> /* RPLAY structure */
-@@ -163,3 +163,3 @@
+ #endif
+ 
+@@ -166,7 +166,7 @@
+          *inv_magic_face, *inv_unpaid_face;
+ 
  
 -#ifdef RPLAY_SOUND
 +#ifdef RPLAY_SND
  EXTERN RPLAY	*sound_table[NROF_SOUNDS];
+ #endif
+ 
diff --git a/graphics/kdegraphics/files/patch-sum b/graphics/kdegraphics/files/patch-sum
index 1807ba7ccd4..5643ac95a4f 100644
--- a/graphics/kdegraphics/files/patch-sum
+++ b/graphics/kdegraphics/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.4 1999/10/09 20:14:09 jlam Exp $
+$NetBSD: patch-sum,v 1.5 1999/11/27 22:23:17 rh Exp $
 
-MD5 (patch-aa) = c13972030d3908c8eab78488960f06b9
+MD5 (patch-aa) = 0358c62c143dbb865f039affa92fbca2
 MD5 (patch-ab) = 72a89da589137f5495fdf6122226d97d
 MD5 (patch-ac) = fdbc331b1e85bdaefb7b1fdc06827c8e
 MD5 (patch-ad) = f972d1778a8b5b6fd2240f5d6a305ef4
diff --git a/graphics/kdegraphics/patches/patch-aa b/graphics/kdegraphics/patches/patch-aa
index 93f99bfeac5..db082707258 100644
--- a/graphics/kdegraphics/patches/patch-aa
+++ b/graphics/kdegraphics/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.6 1999/09/30 07:50:01 tron Exp $
+$NetBSD: patch-aa,v 1.7 1999/11/27 22:23:17 rh Exp $
 
---- kdvi/dvi.h.orig  Thu Sep 30 00:11:49 1999
-+++ kdvi/dvi.h       Thu Sep 30 00:13:01 1999
+--- kdvi/dvi.h.orig	Sat Nov 27 23:19:40 1999
++++ kdvi/dvi.h	Sat Nov 27 23:19:40 1999
 @@ -60,3 +60,7 @@
- #define        EREFL           251
+ #define	EREFL		251
  
- #define        TRAILER         223     /* Trailing bytes at end of file */
+ #define	TRAILER		223	/* Trailing bytes at end of file */
 +
 +#ifdef __SVR4
 +#define NeedVarargsPrototypes  1
diff --git a/graphics/sane/files/patch-sum b/graphics/sane/files/patch-sum
index 9490778de61..a5cc19e24f2 100644
--- a/graphics/sane/files/patch-sum
+++ b/graphics/sane/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:11 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/27 22:27:37 rh Exp $
 
 MD5 (patch-aa) = a98114db4f2cef1b570314cf950d729f
-MD5 (patch-ab) = 9204600beeb70e3f23713467469e01f1
+MD5 (patch-ab) = 6684bff447363003e74ff05c4b43b1c4
diff --git a/graphics/sane/patches/patch-ab b/graphics/sane/patches/patch-ab
index f84ff6239f1..26e69c09ebf 100644
--- a/graphics/sane/patches/patch-ab
+++ b/graphics/sane/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.4 1998/11/28 20:59:58 frueauf Exp $
+$NetBSD: patch-ab,v 1.5 1999/11/27 22:27:38 rh Exp $
 
---- configure.orig	Sun Nov 22 05:04:59 1998
-+++ configure	Sat Nov 28 12:09:07 1998
-@@ -1621,7 +1621,7 @@
+--- configure.orig	Sat Apr 17 22:22:38 1999
++++ configure	Sat Nov 27 23:25:39 1999
+@@ -1622,7 +1622,7 @@
  EOF
- if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
 +  eval "ac_cv_lib_$ac_lib_var=no"
  else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
-@@ -3676,8 +3676,8 @@
+@@ -3680,8 +3680,8 @@
    echo "disabling DC210 backend (failed to find JPEG library)"
    DC210=
  else
diff --git a/mbone/rat/files/patch-sum b/mbone/rat/files/patch-sum
index 45fbbeb37a0..f098f67f02a 100644
--- a/mbone/rat/files/patch-sum
+++ b/mbone/rat/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:11 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/27 22:41:18 rh Exp $
 
 MD5 (patch-aa) = 0dd446f89f9d481357b65165acb44f8f
 MD5 (patch-ab) = 8c9c6dfe8563fbfaf2df1323e7c56478
-MD5 (patch-ac) = 6f636db4003635a1ac38be4373322afe
+MD5 (patch-ac) = c69a67248ce1dfe9c5d0987f230ffc2a
 MD5 (patch-ad) = 9e0284f02699d024517cdce8cdd50ec3
 MD5 (patch-ae) = f64f47b318e4881dfcf9ed79bf62d89b
 MD5 (patch-af) = 21d121d8043ba843c7d1e5d3b550cf89
diff --git a/mbone/rat/patches/patch-ac b/mbone/rat/patches/patch-ac
index 969e82fb09c..6f73f9edb55 100644
--- a/mbone/rat/patches/patch-ac
+++ b/mbone/rat/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 1998/11/05 02:46:09 mycroft Exp $
+$NetBSD: patch-ac,v 1.3 1999/11/27 22:41:18 rh Exp $
 
---- src/gsm_code.c.orig	Sat Aug 15 15:16:48 1998
-+++ src/gsm_code.c	Wed Nov  4 21:27:03 1998
+--- src/gsm_code.c.orig	Sat Nov 27 23:38:15 1999
++++ src/gsm_code.c	Sat Nov 27 23:38:16 1999
 @@ -7,6 +7,7 @@
- /* $Header: /cvsroot/pkgsrc/mbone/rat/patches/patch-ac,v 1.2 1998/11/05 02:46:09 mycroft Exp $ */
+ /* $Header: /cvsroot/pkgsrc/mbone/rat/patches/patch-ac,v 1.3 1999/11/27 22:41:18 rh Exp $ */
  
  #include	<stdlib.h>
 +#include	<string.h>
diff --git a/misc/colorls/files/patch-sum b/misc/colorls/files/patch-sum
index 183a48f6d59..635dd73f7dd 100644
--- a/misc/colorls/files/patch-sum
+++ b/misc/colorls/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:13 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/27 22:55:07 rh Exp $
 
-MD5 (patch-aa) = 5b15655afa150f6ff6b2a9e075514f5f
-MD5 (patch-ab) = 17f0946cc50e64cca57bc27f55d4e08a
+MD5 (patch-aa) = 5d977b9fde78c8d486ba766844f6490a
+MD5 (patch-ab) = 53ee232062410f1ffb9a6f1c237620c0
 MD5 (patch-ac) = fec3d1d3572f1e7074753a6a63f25f52
 MD5 (patch-ad) = 7a7e920b7dad97d39162bd1bd31e8408
 MD5 (patch-ae) = 5d139b67e849d2f5f4ffe13910443ab0
diff --git a/misc/colorls/patches/patch-aa b/misc/colorls/patches/patch-aa
index 99a4ab15d16..1c7da9eea52 100644
--- a/misc/colorls/patches/patch-aa
+++ b/misc/colorls/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:10:12 agc Exp $
+$NetBSD: patch-aa,v 1.5 1999/11/27 22:55:07 rh Exp $
 
---- Makefile.orig	Sat Sep 24 04:55:51 1994
-+++ Makefile	Thu May 21 15:44:37 1998
+--- Makefile.orig	Sat Nov 27 23:51:20 1999
++++ Makefile	Sat Nov 27 23:51:22 1999
 @@ -1,7 +1,10 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/2/93
- #	$Id: patch-aa,v 1.4 1998/08/07 11:10:12 agc Exp $
+ #	$Id: patch-aa,v 1.5 1999/11/27 22:55:07 rh Exp $
  
 -PROG=	ls
 +PROG=	colorls
diff --git a/misc/colorls/patches/patch-ab b/misc/colorls/patches/patch-ab
index e4fcf65de33..61f493147af 100644
--- a/misc/colorls/patches/patch-ab
+++ b/misc/colorls/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:10:12 agc Exp $
+$NetBSD: patch-ab,v 1.5 1999/11/27 22:55:07 rh Exp $
 
---- colorls.1.orig	Thu May 21 15:42:07 1998
-+++ colorls.1	Thu May 21 15:42:09 1998
+--- colorls.1.orig	Sat Nov 27 23:53:51 1999
++++ colorls.1	Sat Nov 27 23:53:52 1999
 @@ -36,16 +36,24 @@
- .\"	Id: patch-ab,v 1.3 1998/05/21 14:06:37 frueauf Exp
+ .\"	$Id: patch-ab,v 1.5 1999/11/27 22:55:07 rh Exp $
  .\"
  .Dd July 29, 1994
 -.Dt LS 1
diff --git a/misc/pty-redir/files/patch-sum b/misc/pty-redir/files/patch-sum
index c4f63e4359d..f2df185c795 100644
--- a/misc/pty-redir/files/patch-sum
+++ b/misc/pty-redir/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:18 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/27 22:59:27 rh Exp $
 
-MD5 (patch-aa) = e43febc227df56c28095b7b9eb8b8790
+MD5 (patch-aa) = 32de022b2c2ee83d242ffc6a2799b52b
diff --git a/misc/pty-redir/patches/patch-aa b/misc/pty-redir/patches/patch-aa
index c88661bb4f8..094e0603e79 100644
--- a/misc/pty-redir/patches/patch-aa
+++ b/misc/pty-redir/patches/patch-aa
@@ -1,28 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/04/08 20:04:16 tron Exp $
-*** pty-redir.c.orig    Sat Feb 20 17:29:59 1999
---- pty-redir.c Sat Feb 20 17:34:14 1999
-***************
-*** 72,78 ****
-      return fd;
-  }
-  
-! void main(int argc,char *argv[])
-  {
-        int fd;
-        char a,b;
---- 72,78 ----
-      return fd;
-  }
-  
-! int main(int argc,char *argv[])
-  {
-        int fd;
-        char a,b;
-***************
-*** 106,109 ****
---- 106,110 ----
-                        exit(-2);
-                }
-        }
-+       exit(0);
-  }
+$NetBSD: patch-aa,v 1.2 1999/11/27 22:59:27 rh Exp $
+
+--- pty-redir.c.orig	Sat Nov 27 23:57:41 1999
++++ pty-redir.c	Sat Nov 27 23:57:41 1999
+@@ -72,7 +72,7 @@
+     return fd;
+ }
+ 
+-void main(int argc,char *argv[])
++int main(int argc,char *argv[])
+ {
+ 	int fd;
+ 	char a,b;
+@@ -106,4 +106,5 @@
+ 			exit(-2);
+ 		}
+ 	}
++      exit(0);
+ }
diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum
index 1dbb098189a..6d4bebc2eb3 100644
--- a/www/apache/files/patch-sum
+++ b/www/apache/files/patch-sum
@@ -1,12 +1,12 @@
-$NetBSD: patch-sum,v 1.2 1999/11/21 22:09:28 tron Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/27 22:52:08 rh Exp $
 
 MD5 (patch-aa) = bc5b9953696e7f125962e96bb68ef49c
 MD5 (patch-ab) = 4b835238ed8e929366119786655a0ffc
 MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069
 MD5 (patch-af) = ef50e09f4691dd62b0671761f1a864c4
-MD5 (patch-ah) = c3e3a232e0c5028a15dea4473bf39955
-MD5 (patch-aj) = e4878583ffc2957e50c25d3d22d1d4db
+MD5 (patch-ah) = 84442daefda2e2afc68caf6c41daaffa
+MD5 (patch-aj) = c6131c00d8dd5b810a0e48c91839157c
 MD5 (patch-ak) = 8f5c8212b6925fb05e3af6c32f990d87
-MD5 (patch-al) = 392b4228824401ad7d1676d2054fa1d6
-MD5 (patch-am) = 0c970f2338262248f41fcd8ebfde0bce
+MD5 (patch-al) = e5472cc7cfcf3f01b311204311870c21
+MD5 (patch-am) = 1ecf62d9594b2ca51e291096443dfbb2
 MD5 (patch-an) = 2fb334639042640cbb2bd1d13bbcce32
diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah
index eb8516f607d..3028ee5c944 100644
--- a/www/apache/patches/patch-ah
+++ b/www/apache/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.1 1998/12/03 17:23:53 tv Exp $
+$NetBSD: patch-ah,v 1.2 1999/11/27 22:52:09 rh Exp $
 
---- src/modules/standard/mod_so.c.orig	Sat Sep 19 08:27:24 1998
-+++ src/modules/standard/mod_so.c	Thu Dec  3 07:59:19 1998
-@@ -289,6 +296,9 @@
-     void *handle;
+--- src/modules/standard/mod_so.c.orig	Sat Nov 27 23:46:32 1999
++++ src/modules/standard/mod_so.c	Sat Nov 27 23:46:34 1999
+@@ -306,6 +306,9 @@
+     ap_os_dso_handle_t handle;
      char *file;
  
 +/* XXX Hack: ask dlopen() without translating for ServerRoot. */
diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj
index 431f5653223..3cd870ac81e 100644
--- a/www/apache/patches/patch-aj
+++ b/www/apache/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.2 1999/05/23 21:16:52 tv Exp $
+$NetBSD: patch-aj,v 1.3 1999/11/27 22:52:09 rh Exp $
 
---- conf/httpd.conf-dist.orig	Thu Dec  3 11:05:29 1998
-+++ conf/httpd.conf-dist	Thu Dec  3 11:07:26 1998
-@@ -18,7 +18,16 @@
- # binary.
+--- conf/httpd.conf-dist.orig	Sat Nov 27 23:46:36 1999
++++ conf/httpd.conf-dist	Sat Nov 27 23:46:36 1999
+@@ -199,7 +199,16 @@
+ # the order below without expert advice.
  #
  # Example:
 -# LoadModule foo_module libexec/mod_foo.so
@@ -18,5 +18,5 @@ $NetBSD: patch-aj,v 1.2 1999/05/23 21:16:52 tv Exp $
 +AddModule mod_ssl.c
 +</IfDefine>
  
- # ServerType is either inetd, or standalone.
- 
+ #
+ # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache/patches/patch-al b/www/apache/patches/patch-al
index 21a94d4b7ce..3e55333823a 100644
--- a/www/apache/patches/patch-al
+++ b/www/apache/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.1 1998/12/05 00:00:09 tv Exp $
+$NetBSD: patch-al,v 1.2 1999/11/27 22:52:09 rh Exp $
 
---- src/os/unix/os.c.orig	Fri Dec  4 18:53:48 1998
-+++ src/os/unix/os.c	Fri Dec  4 18:54:00 1998
-@@ -119,7 +119,7 @@
- #elif defined(RHAPSODY)
+--- src/os/unix/os.c.orig	Sat Nov 27 23:46:39 1999
++++ src/os/unix/os.c	Sat Nov 27 23:46:40 1999
+@@ -126,7 +126,7 @@
+ #elif defined(HAVE_DYLD)
      NSUnLinkModule(handle,FALSE);
  
 -#else
diff --git a/www/apache/patches/patch-am b/www/apache/patches/patch-am
index 82325745f69..fcd43871cd5 100644
--- a/www/apache/patches/patch-am
+++ b/www/apache/patches/patch-am
@@ -1,9 +1,9 @@
-$NetBSD: patch-am,v 1.3 1999/04/30 17:05:20 tv Exp $
+$NetBSD: patch-am,v 1.4 1999/11/27 22:52:09 rh Exp $
 
---- src/ap/ap_hook.c.orig	Mon Dec  7 10:31:53 1998
-+++ src/ap/ap_hook.c	Mon Dec  7 10:32:48 1998
-@@ -705,6 +705,15 @@
-         *((int *)v_rc) = ((int(*)(void *, void *, void *, int))(hf->hf_ptr))(v1, v2, v3, v4);
+--- src/ap/ap_hook.c.orig	Sat Nov 27 23:46:41 1999
++++ src/ap/ap_hook.c	Sat Nov 27 23:46:43 1999
+@@ -740,6 +740,15 @@
+         *((int *)v_rc) = ((int(*)(void *, void *, void *, int, void *))(hf->hf_ptr))(v1, v2, v3, v4, v5);
          rc = (*((int *)v_rc) != he->he_modeval.v_int);
      }
 +    else if (he->he_sig == AP_HOOK_SIG5(int, ptr, ptr, ptr, ptr)) {