From debce1df894d72767997dada975d90c0ff5f1a8e Mon Sep 17 00:00:00 2001
From: form <form@openbsd.org>
Date: Mon, 10 Jun 2002 02:37:10 +0000
Subject: [PATCH] update to 2.9.10

---
 emulators/simh/Makefile                        |  6 +++---
 emulators/simh/distinfo                        |  6 +++---
 .../patches/patch-AltairZ80_altairz80_cpu_c    |  8 ++++----
 emulators/simh/patches/patch-Makefile          | 18 ++++++++++++++----
 emulators/simh/patches/patch-scp_c             | 10 +++++-----
 emulators/simh/patches/patch-sim_sock_c        | 14 +++++++-------
 6 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 7d65daf8fbb..d2f89a4d718 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.26 2002/05/06 06:27:53 form Exp $
+# $OpenBSD: Makefile,v 1.27 2002/06/10 02:37:10 form Exp $
 # $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
 
 COMMENT=		"PDP, IBM 1401, Nova and other CPUs simulator"
 
-DISTNAME=		simh-2.9.9
+DISTNAME=		simh-2.9.10
 CATEGORIES=		emulators
 NEED_VERSION=		1.515
 MASTER_SITES=		http://simh.trailing-edge.com/sources/
-DISTFILES=		simhv29-9.zip
+DISTFILES=		simhv29-10.zip
 
 HOMEPAGE=		http://simh.trailing-edge.com/
 
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index 025474cf722..e46f50ebaf5 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,3 +1,3 @@
-MD5 (simhv29-9.zip) = 02e4d7949407c8f595d36cdeb39723e1
-RMD160 (simhv29-9.zip) = 55a57acfae5ea022024181b1d3f46eb3dee748b2
-SHA1 (simhv29-9.zip) = 9a9bc5ad06657752f90cfb7cc4bc6b0901f27915
+MD5 (simhv29-10.zip) = 7a5a9ba69bdcce65f4508e89edde90a3
+RMD160 (simhv29-10.zip) = e1db975f3e7cdc8f00317c9dda8a1b3731bf8874
+SHA1 (simhv29-10.zip) = c7cf90c84eaa6e80f3415498f96ac0f2d3aa479f
diff --git a/emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c b/emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c
index 4377befa807..0299f25ed65 100644
--- a/emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c
+++ b/emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-AltairZ80_altairz80_cpu_c,v 1.1 2002/04/08 02:47:42 form Exp $
---- AltairZ80/altairz80_cpu.c.orig	Mon Apr  8 10:33:51 2002
-+++ AltairZ80/altairz80_cpu.c	Mon Apr  8 10:34:19 2002
+$OpenBSD: patch-AltairZ80_altairz80_cpu_c,v 1.2 2002/06/10 02:37:10 form Exp $
+--- AltairZ80/altairz80_cpu.c.orig	Thu May  9 11:08:18 2002
++++ AltairZ80/altairz80_cpu.c	Mon Jun 10 09:25:40 2002
 @@ -5,7 +5,7 @@
  */
  
@@ -8,5 +8,5 @@ $OpenBSD: patch-AltairZ80_altairz80_cpu_c,v 1.1 2002/04/08 02:47:42 form Exp $
 -#include "altairZ80_defs.h"
 +#include "altairz80_defs.h"
  
- #define PCQ_SIZE	64				/* must be 2**n */
+ #define PCQ_SIZE	64													/* must be 2**n											*/
  #define PCQ_MASK	(PCQ_SIZE - 1)
diff --git a/emulators/simh/patches/patch-Makefile b/emulators/simh/patches/patch-Makefile
index d071243a8e2..6003bbfae83 100644
--- a/emulators/simh/patches/patch-Makefile
+++ b/emulators/simh/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.4 2002/04/08 02:47:42 form Exp $
+$OpenBSD: patch-Makefile,v 1.5 2002/06/10 02:37:10 form Exp $
 --- Makefile.orig	Sun Feb 17 13:50:26 2002
-+++ Makefile	Mon Apr  8 10:29:57 2002
++++ Makefile	Mon Jun 10 09:30:22 2002
 @@ -3,9 +3,9 @@
  # Note: -O2 is sometimes broken in GCC when setjump/longjump is being
  # used. Try -O2 only with released simulators.
@@ -13,7 +13,17 @@ $OpenBSD: patch-Makefile,v 1.4 2002/04/08 02:47:42 form Exp $
  
  
  #
-@@ -140,8 +140,8 @@ ALTAIR_OPT = -I ${ALTAIRD}
+@@ -103,7 +103,8 @@ HP2100_OPT = -I ${HP2100D}
+ 
+ I1401D = I1401/
+ I1401 = ${I1401D}i1401_lp.c ${I1401D}i1401_cpu.c ${I1401D}i1401_iq.c \
+-	${I1401D}i1401_cd.c ${I1401D}i1401_mt.c ${I1401D}i1401_sys.c
++	${I1401D}i1401_cd.c ${I1401D}i1401_dp.c ${I1401D}i1401_mt.c \
++	${I1401D}i1401_sys.c
+ I1401_OPT = -I ${I1401D}
+ 
+ 
+@@ -140,8 +141,8 @@ ALTAIR_OPT = -I ${ALTAIRD}
  
  
  ALTAIRZ80D = AltairZ80/
@@ -24,7 +34,7 @@ $OpenBSD: patch-Makefile,v 1.4 2002/04/08 02:47:42 form Exp $
  ALTAIRZ80_OPT = -I ${ALTAIRZ80D}
  
  #
-@@ -158,87 +158,87 @@ all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 $
+@@ -158,87 +159,87 @@ all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 $
  # Individual builds
  #
  ${BIN}pdp1 : ${PDP1} ${SIM}
diff --git a/emulators/simh/patches/patch-scp_c b/emulators/simh/patches/patch-scp_c
index 5db45a602ff..5930096b4cc 100644
--- a/emulators/simh/patches/patch-scp_c
+++ b/emulators/simh/patches/patch-scp_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-scp_c,v 1.4 2002/03/07 05:40:45 form Exp $
---- scp.c.orig	Thu Mar  7 11:22:34 2002
-+++ scp.c	Thu Mar  7 11:30:28 2002
-@@ -417,7 +417,10 @@ if ((argc > 1) && argv[1]) {				/* cmd f
+$OpenBSD: patch-scp_c,v 1.5 2002/06/10 02:37:10 form Exp $
+--- scp.c.orig	Sat May 18 13:26:12 2002
++++ scp.c	Mon Jun 10 09:25:40 2002
+@@ -423,7 +423,10 @@ if ((argc > 1) && argv[1]) {				/* cmd f
  do {	printf ("sim> ");				/* prompt */
  	cptr = read_line (cbuf, CBUFSIZE, stdin);	/* read command line */
  	stat = SCPE_UNK;
@@ -13,7 +13,7 @@ $OpenBSD: patch-scp_c,v 1.4 2002/03/07 05:40:45 form Exp $
  	if (*cptr == 0) continue;			/* ignore blank */
  	if (sim_log) fprintf (sim_log, "sim> %s\n", cbuf); /* log cmd */
  	cptr = get_glyph (cptr, gbuf, 0);		/* get command glyph */
-@@ -1439,7 +1442,7 @@ for (i = 1; (dptr = sim_devices[i]) != N
+@@ -1478,7 +1481,7 @@ for (i = 1; (dptr = sim_devices[i]) != N
  		    (UNIT_ATT + UNIT_SEQ))
  			fseek (uptr -> fileref, uptr -> pos, SEEK_SET);  }  }
  stop_cpu = 0;
diff --git a/emulators/simh/patches/patch-sim_sock_c b/emulators/simh/patches/patch-sim_sock_c
index ad34896f2d2..0cf0272f9e9 100644
--- a/emulators/simh/patches/patch-sim_sock_c
+++ b/emulators/simh/patches/patch-sim_sock_c
@@ -1,12 +1,12 @@
-$OpenBSD: patch-sim_sock_c,v 1.1 2002/03/26 07:37:21 form Exp $
---- sim_sock.c.orig	Tue Mar 26 12:45:29 2002
-+++ sim_sock.c	Tue Mar 26 12:46:25 2002
-@@ -129,7 +129,7 @@ return newsock;						/* got it! */
+$OpenBSD: patch-sim_sock_c,v 1.2 2002/06/10 02:37:10 form Exp $
+--- sim_sock.c.orig	Mon Jun 10 09:24:34 2002
++++ sim_sock.c	Mon Jun 10 09:24:43 2002
+@@ -130,7 +130,7 @@ return newsock;						/* got it! */
  SOCKET sim_accept_conn (SOCKET master, UNIT *uptr, uint32 *ipaddr)
  {
  int32 sta;
 -#if defined (macintosh) 
 +#if defined (macintosh) || defined(USE_SOCKLEN_T)
- socklen_t size; 
- #else 
- size_t size; 
+ socklen_t size;
+ #elif defined (__EMX__)
+ int size;