Use standard patch format; split up multi-patch into separate files.

7 files changed, 156 insertions, 193 deletions

diff --git a/emulators/pcemu/patches/patch-ac b/emulators/pcemu/patches/patch-ac
index 1b340ddc122..311a1ed8eaa 100644
--- a/emulators/pcemu/patches/patch-ac
+++ b/emulators/pcemu/patches/patch-ac
@@ -1,55 +1,31 @@
-$NetBSD: patch-ac,v 1.2 1999/12/29 01:45:39 wiz Exp $
-*** mfs.c.orig	Wed Jun 22 16:24:51 1994
---- mfs.c	Tue Jan 24 18:41:20 1995
-***************
-*** 319,325 ****
---- 319,327 ----
-  #include <errno.h>
-  #include <sys/param.h>
-  #include <stdlib.h>
-+ #if !__STDC__
-  #include <malloc.h>
-+ #endif
-  
-  #ifdef SOLARIS
-  #include <fcntl.h>
-***************
-*** 327,335 ****
-  #endif
-  
-  #if defined(SGI) || defined(RS6000)
-! #include <sys/statfs.h>
-  #else
-! #include <sys/vfs.h>
-  #endif
-  
-  
---- 329,342 ----
-  #endif
-  
-  #if defined(SGI) || defined(RS6000)
-! # include <sys/statfs.h>
-  #else
-! # include <sys/param.h>
-! # if BSD >= 199103
-! #  include <sys/mount.h>
-! # else
-! #  include <sys/vfs.h>
-! # endif /* new BSD */
-  #endif
-  
-  
-*** mfs.h.orig	Wed Jun 22 16:24:51 1994
---- mfs.h	Tue Jan 24 18:37:18 1995
-***************
-*** 45,51 ****
---- 45,53 ----
-  
-  #include "mfs_link.h"
-  
-+ #if BSD < 199306		/* newer BSDs have it in <stdio.h> */
-  extern char *sys_errlist[];
-+ #endif
-  
-  #if !defined(__hpux) && !defined(SOLARIS) && !defined(SGI) && !defined(RS6000)
-  #define strerror(x) sys_errlist[x]
+$NetBSD: patch-ac,v 1.3 2004/07/09 12:45:03 wiz Exp $
+
+--- mfs.c.orig	1994-06-22 16:24:51.000000000 +0200
++++ mfs.c
+@@ -319,7 +319,9 @@ TODO:
+ #include <errno.h>
+ #include <sys/param.h>
+ #include <stdlib.h>
++#if !__STDC__
+ #include <malloc.h>
++#endif
+ 
+ #ifdef SOLARIS
+ #include <fcntl.h>
+@@ -327,9 +329,14 @@ TODO:
+ #endif
+ 
+ #if defined(SGI) || defined(RS6000)
+-#include <sys/statfs.h>
++# include <sys/statfs.h>
+ #else
+-#include <sys/vfs.h>
++# include <sys/param.h>
++# if BSD >= 199103
++#  include <sys/mount.h>
++# else
++#  include <sys/vfs.h>
++# endif /* new BSD */
+ #endif
+ 
+ 
diff --git a/emulators/pcemu/patches/patch-ad b/emulators/pcemu/patches/patch-ad
index 812b0edd412..c254e2390af 100644
--- a/emulators/pcemu/patches/patch-ad
+++ b/emulators/pcemu/patches/patch-ad
@@ -1,95 +1,32 @@
-$NetBSD: patch-ad,v 1.2 1999/12/29 01:45:39 wiz Exp $
-*** main.c.orig	Wed Jun 22 16:24:50 1994
---- main.c	Tue Jan 24 18:37:18 1995
-***************
-*** 39,44 ****
---- 39,56 ----
-      exit(0);
-  }
-  
-+ static char *set_keymap(char *buf)
-+ {
-+ 	char c;
-+ 	int code;
-+ 	
-+ 	if(sscanf(buf, " %*s %i=%c", &code, &c) != 2)
-+ 		return "usage: keymap code=char";
-+ 	if(put_scan_table(code, (unsigned char)c))
-+ 		return "bad value for keymap";
-+ 	return 0;
-+ }
-+ 
-  
-  void check_error(char *msg, int line)
-  {
-***************
-*** 89,94 ****
---- 101,108 ----
-              check_error(set_update_rate(strtol(value, NULL,10)), line);
-          else if (strcasecmp(keyword,"cursorspeed") == 0)
-              check_error(set_cursor_rate(strtol(value, NULL,10)), line);
-+ 	else if (strcasecmp(keyword,"keymap") == 0)
-+ 		check_error(set_keymap(buffer), line);
-          else
-              check_error("Syntax error in .pcemu file", line);
-      }
-*** xstuff.c.orig	Wed Jun 22 16:24:51 1994
---- xstuff.c	Tue Jan 24 18:37:19 1995
-***************
-*** 316,322 ****
-  }
-  
-  
-! static BYTE scan_table1[] =
-  {
-      0x39, 0x02, 
-  #ifdef KBUK             /* double quotes, hash symbol */
---- 316,322 ----
-  }
-  
-  
-! static BYTE scan_table1[256 - 0x20] =
-  {
-      0x39, 0x02, 
-  #ifdef KBUK             /* double quotes, hash symbol */
-***************
-*** 360,365 ****
---- 360,366 ----
-  #else
-      0x29,
-  #endif
-+     0
-  };
-  
-  
-***************
-*** 458,463 ****
---- 459,474 ----
-              return (scan_table2[i].scan_code);
-  
-      return 0;
-+ }
-+ 
-+ 
-+ int put_scan_table(BYTE code, unsigned char c)
-+ {
-+ 	/* interface to overload scan_table1 from .pcemurc */
-+ 	if(c < ' ' || c >= ' ' + sizeof scan_table1)
-+ 		return 1;
-+ 	scan_table1[c - ' '] = code;
-+ 	return 0;
-  }
-  
-  
-*** xstuff.h.orig	Wed Jun 22 16:24:51 1994
---- xstuff.h	Tue Jan 24 18:37:19 1995
-***************
-*** 17,22 ****
---- 17,23 ----
-  
-  void start_X(void);
-  void end_X(void);
-+ int put_scan_table(BYTE, unsigned char);
-  void process_Xevents(void);
-  void flush_X(void);
-  
+$NetBSD: patch-ad,v 1.3 2004/07/09 12:45:03 wiz Exp $
+
+--- main.c.orig	1994-06-22 16:24:50.000000000 +0200
++++ main.c
+@@ -39,6 +39,18 @@ void exit_emu(void)
+     exit(0);
+ }
+ 
++static char *set_keymap(char *buf)
++{
++	char c;
++	int code;
++	
++	if(sscanf(buf, " %*s %i=%c", &code, &c) != 2)
++		return "usage: keymap code=char";
++	if(put_scan_table(code, (unsigned char)c))
++		return "bad value for keymap";
++	return 0;
++}
++
+ 
+ void check_error(char *msg, int line)
+ {
+@@ -89,6 +101,8 @@ void read_pcemurc(void)
+             check_error(set_update_rate(strtol(value, NULL,10)), line);
+         else if (strcasecmp(keyword,"cursorspeed") == 0)
+             check_error(set_cursor_rate(strtol(value, NULL,10)), line);
++	else if (strcasecmp(keyword,"keymap") == 0)
++		check_error(set_keymap(buffer), line);
+         else
+             check_error("Syntax error in .pcemu file", line);
+     }
diff --git a/emulators/pcemu/patches/patch-ae b/emulators/pcemu/patches/patch-ae
index 09323170e6f..595dfe19be2 100644
--- a/emulators/pcemu/patches/patch-ae
+++ b/emulators/pcemu/patches/patch-ae
@@ -1,11 +1,9 @@
-$NetBSD: patch-ae,v 1.2 1999/12/29 01:45:39 wiz Exp $
-*** programs/config.sys.orig	Mon Mar 27 21:27:23 1995
---- programs/config.sys	Mon Mar 27 22:19:26 1995
-***************
-*** 1,2 ****
-! device=emufs.sys /
-! stacks 9,512
---- 1,3 ----
-! device=\emufs.sys /usr/local/lib/pcemu/C
-! stacks 9,512
-! 
+$NetBSD: patch-ae,v 1.3 2004/07/09 12:45:03 wiz Exp $
+
+--- programs/config.sys.orig	1994-06-22 16:29:25.000000000 +0200
++++ programs/config.sys
+@@ -1,2 +1,3 @@
+-device=emufs.sys /
++device=\emufs.sys /usr/local/lib/pcemu/C
+ stacks 9,512
++
diff --git a/emulators/pcemu/patches/patch-af b/emulators/pcemu/patches/patch-af
index 18fcd7f4fa7..7448d862e1e 100644
--- a/emulators/pcemu/patches/patch-af
+++ b/emulators/pcemu/patches/patch-af
@@ -1,32 +1,20 @@
-$NetBSD: patch-af,v 1.2 1999/12/29 01:45:39 wiz Exp $
-*** cpu.h~	Sun Apr 11 22:45:18 1999
---- cpu.h	Sun Apr 11 22:46:50 1999
-***************
-*** 113,125 ****
-      format and back again. Obviously there is nothing to do for little-endian
-      machines... */
-  
-! #if defined(LITTLE_ENDIAN)
-  #   define ChangeE(x) (WORD)(x)
-  #else
-  #   define ChangeE(x) (WORD)(((x) << 8) | ((BYTE)((x) >> 8)))
-  #endif
-  
-! #if defined(LITTLE_ENDIAN) && !defined(ALIGNED_ACCESS)
-  #   define ReadWord(x) (*(x))
-  #   define WriteWord(x,y) (*(x) = (y))
-  #   define CopyWord(x,y) (*x = *y)
---- 113,125 ----
-      format and back again. Obviously there is nothing to do for little-endian
-      machines... */
-  
-! #if BYTE_ORDER == LITTLE_ENDIAN
-  #   define ChangeE(x) (WORD)(x)
-  #else
-  #   define ChangeE(x) (WORD)(((x) << 8) | ((BYTE)((x) >> 8)))
-  #endif
-  
-! #if BYTE_ORDER == LITTLE_ENDIAN && !defined(ALIGNED_ACCESS)
-  #   define ReadWord(x) (*(x))
-  #   define WriteWord(x,y) (*(x) = (y))
-  #   define CopyWord(x,y) (*x = *y)
+$NetBSD: patch-af,v 1.3 2004/07/09 12:45:03 wiz Exp $
+
+--- cpu.h.orig	1994-06-22 16:24:50.000000000 +0200
++++ cpu.h
+@@ -113,13 +113,13 @@
+     format and back again. Obviously there is nothing to do for little-endian
+     machines... */
+ 
+-#if defined(LITTLE_ENDIAN)
++#if BYTE_ORDER == LITTLE_ENDIAN
+ #   define ChangeE(x) (WORD)(x)
+ #else
+ #   define ChangeE(x) (WORD)(((x) << 8) | ((BYTE)((x) >> 8)))
+ #endif
+ 
+-#if defined(LITTLE_ENDIAN) && !defined(ALIGNED_ACCESS)
++#if BYTE_ORDER == LITTLE_ENDIAN && !defined(ALIGNED_ACCESS)
+ #   define ReadWord(x) (*(x))
+ #   define WriteWord(x,y) (*(x) = (y))
+ #   define CopyWord(x,y) (*x = *y)
diff --git a/emulators/pcemu/patches/patch-ai b/emulators/pcemu/patches/patch-ai
new file mode 100644
index 00000000000..25e4257abf1
--- /dev/null
+++ b/emulators/pcemu/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2004/07/09 12:45:03 wiz Exp $
+
+--- mfs.h.orig	1994-06-22 16:24:51.000000000 +0200
++++ mfs.h
+@@ -45,7 +45,9 @@ typedef unsigned char boolean_t;
+ 
+ #include "mfs_link.h"
+ 
++#if BSD < 199306		/* newer BSDs have it in <stdio.h> */
+ extern char *sys_errlist[];
++#endif
+ 
+ #if !defined(__hpux) && !defined(SOLARIS) && !defined(SGI) && !defined(RS6000)
+ #define strerror(x) sys_errlist[x]
diff --git a/emulators/pcemu/patches/patch-aj b/emulators/pcemu/patches/patch-aj
new file mode 100644
index 00000000000..cf3b8241247
--- /dev/null
+++ b/emulators/pcemu/patches/patch-aj
@@ -0,0 +1,38 @@
+$NetBSD: patch-aj,v 1.1 2004/07/09 12:45:03 wiz Exp $
+
+--- xstuff.c.orig	1994-06-22 16:24:51.000000000 +0200
++++ xstuff.c
+@@ -316,7 +316,7 @@ void flush_X(void)
+ }
+ 
+ 
+-static BYTE scan_table1[] =
++static BYTE scan_table1[256 - 0x20] =
+ {
+     0x39, 0x02, 
+ #ifdef KBUK             /* double quotes, hash symbol */
+@@ -360,6 +360,7 @@ static BYTE scan_table1[] =
+ #else
+     0x29,
+ #endif
++    0
+ };
+ 
+ 
+@@ -461,6 +462,16 @@ static unsigned translate(KeySym key)
+ }
+ 
+ 
++int put_scan_table(BYTE code, unsigned char c)
++{
++	/* interface to overload scan_table1 from .pcemurc */
++	if(c < ' ' || c >= ' ' + sizeof scan_table1)
++		return 1;
++	scan_table1[c - ' '] = code;
++	return 0;
++}
++
++
+ void process_Xevents(void)
+ {    
+ #define KEY_BUFFER_SIZE 100
diff --git a/emulators/pcemu/patches/patch-ak b/emulators/pcemu/patches/patch-ak
new file mode 100644
index 00000000000..8046d4ce982
--- /dev/null
+++ b/emulators/pcemu/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2004/07/09 12:45:03 wiz Exp $
+
+--- xstuff.h.orig	1994-06-22 16:24:51.000000000 +0200
++++ xstuff.h
+@@ -17,6 +17,7 @@
+ 
+ void start_X(void);
+ void end_X(void);
++int put_scan_table(BYTE, unsigned char);
+ void process_Xevents(void);
+ void flush_X(void);
+