Make this compile on NetBSD-current

Silence some obvious warnings
Fix a typo

4 files changed, 44 insertions, 22 deletions

diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
index 01d5bb137ad..d18cacada0e 100644
--- a/emulators/hercules/distinfo
+++ b/emulators/hercules/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.6 2004/05/29 23:32:19 kristerw Exp $
+$NetBSD: distinfo,v 1.7 2004/06/13 14:03:28 agc Exp $
 
 SHA1 (hercules-2.11.tar.gz) = ec84388e29cfd070055afa5fc11a33c896f2333a
 Size (hercules-2.11.tar.gz) = 616554 bytes
 SHA1 (patch-aa) = b2b9b1685730ab0ffb74c9d4a6dd027b925d0080
 SHA1 (patch-ab) = ea2802d8752411e964ba150d3a54f64a40fc2e70
-SHA1 (patch-ac) = 59bfb3d67ab88a580a252245c3089d0952b4da56
+SHA1 (patch-ac) = 454ac972ad54f19f139033abe8ccabdbb0c3f88b
 SHA1 (patch-ad) = dab44fa2ee216a8250c40675211126f61039abf3
 SHA1 (patch-ae) = 14aafa5462a858e44c00ea6d43efd0f1cfef190e
 SHA1 (patch-af) = 759ad1ee2737ed8021b5a5fd956851677e99879a
 SHA1 (patch-ag) = 6dcec345641bdde0c617da10f57b6f2dd6b702ac
-SHA1 (patch-ah) = ede54de0b63ebf02a9589cc57a5c41d4693ee8ef
+SHA1 (patch-ah) = 06e03dc32c91ab5d3125a3b5489d15ef5c1e144c
 SHA1 (patch-aj) = b4beda52ced42d6d58f02b24c0eaf56109eab092
-SHA1 (patch-ak) = b727b0fad00ee546854cfbc4342e4c759fe7b0d2
+SHA1 (patch-ak) = 5b594849074ac410f2b8c93f2df0dca874b4533a
 SHA1 (patch-al) = 60d90ed9c1476b8fcf0a905a8316f3aec9108169
 SHA1 (patch-am) = 4626f39156ac2beccd9911f795aff6f9fe7b997b
 SHA1 (patch-an) = 3c36e9745316ef84caf60ba66b541b7cc3007377
diff --git a/emulators/hercules/patches/patch-ac b/emulators/hercules/patches/patch-ac
index ba36a14ef90..e45ea816b42 100644
--- a/emulators/hercules/patches/patch-ac
+++ b/emulators/hercules/patches/patch-ac
@@ -1,10 +1,26 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/19 12:35:21 agc Exp $
+$NetBSD: patch-ac,v 1.2 2004/06/13 14:03:28 agc Exp $
 
 Linux tape handling.
 
---- hercules.h	2001/02/19 11:13:51	1.1
-+++ hercules.h	2001/02/19 11:52:42
-@@ -935,6 +935,56 @@
+--- hercules.h	2004-06-13 14:44:50.000000000 +0100
++++ hercules.h	2004-06-13 14:47:06.000000000 +0100
+@@ -34,6 +34,7 @@
+  #include <byteswap.h>
+ #endif
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/resource.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+@@ -110,6 +111,7 @@
+ #define HAVE_STRUCT_TIMESPEC
+ #endif
+ #include <pthread.h>
++#include <sched.h>
+ #ifdef WIN32
+ #undef DWORD
+ #endif
+@@ -935,6 +937,56 @@
  #define CCKD_OPEN_RD           2
  #define CCKD_OPEN_RW           3
  
diff --git a/emulators/hercules/patches/patch-ah b/emulators/hercules/patches/patch-ah
index e8b2d65a1c2..df0474a03f5 100644
--- a/emulators/hercules/patches/patch-ah
+++ b/emulators/hercules/patches/patch-ah
@@ -1,14 +1,20 @@
-$NetBSD: patch-ah,v 1.1 2001/02/26 14:49:35 agc Exp $
+$NetBSD: patch-ah,v 1.2 2004/06/13 14:03:28 agc Exp $
 
-Fix for coredump on exit on NetBSD from Wolfgang Solfrank
+Silence some compiler warnings
 
---- hercules.h	2001/02/26 14:36:15	1.1
-+++ hercules.h	2001/02/26 14:40:28
-@@ -110,6 +110,7 @@
- #define HAVE_STRUCT_TIMESPEC
- #endif
- #include <pthread.h>
-+#include <sched.h>
- #ifdef WIN32
- #undef DWORD
- #endif
+--- featall.h	2004/06/13 13:54:33	1.1
++++ featall.h	2004/06/13 13:55:55
+@@ -20,11 +20,11 @@
+ #define OPTION_NO_INLINE_DAT		/* Performance option	     */
+ #undef	OPTION_NO_INLINE_VSTORE 	/* Performance option	     */
+ #undef	OPTION_NO_LINUX_INTERRUPT_PATCH /* Linux performance	     */
+-#undef  OPTION_FOOTPRINT_BUFFER     256 /* Size must be a power of 2 */
++#undef  OPTION_FOOTPRINT_BUFFER     /* (256) Size must be a power of 2 */
+ #undef  OPTION_INSTRUCTION_COUNTING	/* First use trace and count */
+ #define OPTION_CKD_KEY_TRACING		/* Trace CKD search keys     */
+ #define OPTION_NO_DEVICE_THREAD 	/* Separate threads for I/O  */
+-#undef	OPTION_CMPSC_DEBUGLVL	      3 /* 1=Exp 2=Comp 3=Both debug */
++#undef	OPTION_CMPSC_DEBUGLVL	      /* (3) 1=Exp 2=Comp 3=Both debug */
+ 
+ #define FEATURE_ALD_FORMAT            0
+ 
diff --git a/emulators/hercules/patches/patch-ak b/emulators/hercules/patches/patch-ak
index 256d4d0b6eb..1517dd688fa 100644
--- a/emulators/hercules/patches/patch-ak
+++ b/emulators/hercules/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2001/03/23 16:20:56 agc Exp $
+$NetBSD: patch-ak,v 1.2 2004/06/13 14:03:28 agc Exp $
 
-Patch from WOlfgang Solfrank:
+Patch from Wolfgang Solfrank:
 
 Disabling the O_SYNC option when opening printer or punch.