Update simh to V3.8-1. Reviewd by obache@ in PR pkg/43363 filed by me.

---
Change Log For V3.8-1

SCP and libraries:

 * Fixed bug in DETACH ALL if called at simulator exit (from Dave Bryan)
 * Fixed bug in DO command handling of null arguments (from Dave Bryan)
 * Fixed bug in DO handling of \\ (literal backslash) (from Dave Bryan)
 * Fixed warnings in help printouts

HP2100 (all changes from Dave Bryan)

 * Corrected DMS violation register set conditions
 * JSB to 0/1 with W5 out and fence = 0 erroneously causes MP abort
 * Fixed DJP, SJP, and UJP jump target validation
 * BACI: Fixed STC,C losing interrupt request on BREAK
 * MPX: Implemented 12792C eight-channel terminal multiplexer
 * MT: Fixed missing flag after CLR command
 * PIF: Implemented 12620A/12936A Privileged Interrupt Fences

IBM 1401:

 * Fixed bug in ZA and ZS (from Bob Abeles)
 * Fixed tape indicator implementation (from Bob Abeles)
 * Added missing magtape modifier A (from Van Snyder)
 * Added -n (no rewind) option to BOOT (from Van Snyder)
 * Fixed bug to mask input to 6b on read (from Bob Abeles)

PDP11:

 * Moved all Unibus/Qbus support routines to common I/O library
 * Fxed bug in ASHP left overflow calc
 * Fixed bug in DIVx

VAX:

 * Fxed bug in ASHP left overflow calc
 * Fixed bug in DIVx
 * Resync time of day clock on any clock reset
---

Also some pkgsrc fixes, including Linux build:
 * add MAKE_FLAGS in pkgsrc Makefile to define USE_NETWORK in dist makefile
 * reorganize patch-aa for makefile to reduce diffs:
  * use gmake (USE_TOOLS+=gmake in Makefile)
  * check OSTYPE properly (so that it also builds on Linux)
  * use "else <conditional-directive>" for OSTYPE checks
  * revert previous gcc -> ${CC} change since -std=c99 seems mandatory
 * update patch-ac for upstream cosmetics (for "set telnet" using raw mode)
 * remove patch-ad for inline definitions since upstream has disabled it
 * remove INSTALL_DATA_DIR as suggested by pkglint

Tested on NetBSD/i386 -current and CentOS 5.4 i386.

5 files changed, 37 insertions, 116 deletions

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 87e09a87bbf..fb0753ce904 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/08/25 11:57:45 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/05/28 13:21:26 tsutsui Exp $
 #
 
-DISTNAME=	simhv38-0
-PKGNAME=	simh-3.8.0
+DISTNAME=	simhv38-1
+PKGNAME=	simh-3.8.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
@@ -14,6 +14,8 @@ COMMENT=	Bob Supnik's historical computer simulator
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	gmake
+
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6
 
 WRKSRC=			${WRKDIR}
@@ -27,6 +29,7 @@ BUILDLINK_TRANSFORM+=	rm:-O2
 INSTALLATION_DIRS=	bin share/simh share/doc/simh
 
 MAKE_FILE=		makefile
+MAKE_FLAGS+=		USE_NETWORK=YES
 
 post-extract:
 	${MKDIR} ${WRKSRC}/BIN
@@ -37,9 +40,7 @@ do-install:
 		${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
 		fi ;							\
 	done)
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simh
 	${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/simh
 	(cd ${WRKSRC} && for TXT in *.txt */*.txt; do			\
 		${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh;		\
 	done)
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index 9a42dfc4a0d..617fe3ad1ca 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.14 2008/11/20 21:30:05 chuck Exp $
+$NetBSD: distinfo,v 1.15 2010/05/28 13:21:26 tsutsui Exp $
 
-SHA1 (simhv38-0.zip) = e1afbebede7dc4b2e0f7b13fca3ee6aa8d34f9c1
-RMD160 (simhv38-0.zip) = f1986d45f9b17a905957d1dca4eaa70098a7cae6
-Size (simhv38-0.zip) = 2775593 bytes
-SHA1 (patch-aa) = 427aa8eca1f1ac17f9279708e666d066b24dde7e
+SHA1 (simhv38-1.zip) = 5eac2f8e50be11600727983e05072690a7066702
+RMD160 (simhv38-1.zip) = f085c52ec92425f84f65b3f3605cb7aba8be7b32
+Size (simhv38-1.zip) = 2954982 bytes
+SHA1 (patch-aa) = 88567baeed5af2d834b105935ea1c8706dab1133
 SHA1 (patch-ab) = 85b36e3d92a2bfbd886dbb2e08a0af967edeb0bd
-SHA1 (patch-ac) = 78ecdc9abe248eb8c9a1dc3c297a4a7e5eb812d6
-SHA1 (patch-ad) = 4ab9108d50bc89b41aea3efdf58cc95089137937
+SHA1 (patch-ac) = 16673f3bb5c42cdfd0497cd1f0657cbbe3bbecdb
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index 57e5fbc4b4b..a2cc9899953 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,83 +1,29 @@
-$NetBSD: patch-aa,v 1.8 2008/11/01 05:15:42 obache Exp $
+$NetBSD: patch-aa,v 1.9 2010/05/28 13:21:26 tsutsui Exp $
 
---- makefile.orig	2008-06-06 06:00:46.000000000 +0000
+--- makefile.orig	2008-11-19 12:53:48.000000000 +0000
 +++ makefile
-@@ -1,32 +1,36 @@
- #
- # CC Command
- #
--ifeq ($(WIN32),)
-+#ifeq ($(WIN32),)
+@@ -5,17 +5,17 @@
    #Unix Environments
--  ifneq (,$(findstring solaris,$(OSTYPE)))
--    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
--  else
+   ifneq (,$(findstring solaris,$(OSTYPE)))
+     OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
++  else ifneq (,$(findstring darwin,$(OSTYPE)))
++    OS_CCDEFS = -D_GNU_SOURCE
++  else ifneq (,$(findstring linux,$(OSTYPE)))
++    OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
+   else
 -    ifneq (,$(findstring darwin,$(OSTYPE)))
 -      OS_CCDEFS = -D_GNU_SOURCE
 -    else
 -      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
 -    endif
--  endif
++    OS_CCDEFS = -lm -D_GNU_SOURCE
+   endif
 -  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
--  ifeq ($(USE_NETWORK),)
--  else
++  CC = gcc -std=c99 -U__STRICT_ANSI__ -g -O2 $(OS_CCDEFS) -I .
+   ifeq ($(USE_NETWORK),)
+   else
 -    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
--  endif
--else
--  #Win32 Environments
--  LDFLAGS = -lm -lwsock32 -lwinmm
--  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
--  EXE = .exe
--  ifeq ($(USE_NETWORK),)
--  else
--    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
--  endif
--endif
-+#  ifneq (,$(findstring solaris,$(OSTYPE)))
-+#    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
-+#  else
-+#    ifneq (,$(findstring darwin,$(OSTYPE)))
-+#      OS_CCDEFS = -D_GNU_SOURCE
-+#    else
-+#      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
-+#    endif
-+#  endif
-+#  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
-+CC ?= gcc
-+CC := ${CC} -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
-+#
-+#  ifeq ($(USE_NETWORK),)
-+#  else
-+#    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-+     NETWORK_OPT = -DUSE_NETWORK -lpcap
-+#  endif
-+#else
-+#  #Win32 Environments
-+#  LDFLAGS = -lm -lwsock32 -lwinmm
-+#  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
-+#  EXE = .exe
-+#  ifeq ($(USE_NETWORK),)
-+#  else
-+#    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
-+#  endif
-+#endif
- 
- #
- # Common Libraries
-@@ -259,11 +263,11 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp
- all : ${ALL}
- 
- clean :
--ifeq ($(WIN32),)
--	${RM} ${BIN}*
--else
--	if exist BIN\*.exe del /q BIN\*.exe
--endif
-+#ifeq ($(WIN32),)
-+	rm ${BIN}*
-+#else
-+#	if exist BIN\*.exe del /q BIN\*.exe
-+#endif
- 
- #
- # Individual builds
++    NETWORK_OPT = -DUSE_NETWORK -lpcap
+   endif
+ else
+   #Win32 Environments
diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac
index 99030ff7c69..4b38c32ba97 100644
--- a/emulators/simh/patches/patch-ac
+++ b/emulators/simh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2008/11/01 05:15:42 obache Exp $
+$NetBSD: patch-ac,v 1.6 2010/05/28 13:21:26 tsutsui Exp $
 
---- sim_console.c.orig	2006-10-01 14:26:58.000000000 +0200
+--- sim_console.c.orig	2008-11-20 04:50:44.000000000 +0000
 +++ sim_console.c
-@@ -391,7 +391,7 @@ for (i = 0; i < sec; i++) {             
+@@ -429,7 +429,7 @@
      if (tmxr_poll_conn (&sim_con_tmxr) >= 0) {          /* poll connect */
          sim_con_ldsc.rcve = 1;                          /* rcv enabled */
          if (i) {                                        /* if delayed */
@@ -11,9 +11,9 @@ $NetBSD: patch-ac,v 1.5 2008/11/01 05:15:42 obache Exp $
              fflush (stdout);
              }
          return SCPE_OK;                                 /* ready to proceed */
-@@ -399,7 +399,7 @@ for (i = 0; i < sec; i++) {             
-     c = sim_os_poll_kbd ();                             /* check for stop char */
-     if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP;
+@@ -438,7 +438,7 @@
+     if ((c == SCPE_STOP) || stop_cpu)
+         return SCPE_STOP;
      if ((i % 10) == 0) {                                /* Status every 10 sec */
 -        printf ("Waiting for console Telnet connection\n");
 +        printf ("Waiting for console Telnet connection\r\n");
diff --git a/emulators/simh/patches/patch-ad b/emulators/simh/patches/patch-ad
deleted file mode 100644
index 6c09a775a99..00000000000
--- a/emulators/simh/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/11/20 21:30:05 chuck Exp $
-
---- sim_defs.h.orig	2008-11-20 15:36:35.000000000 -0500
-+++ sim_defs.h	2008-11-20 15:40:40.000000000 -0500
-@@ -164,7 +164,20 @@
- /* Inlining */
- 
- #if defined (__GNUC__)                                  /* GCC */
-+
-+#if defined(__APPLE_CC__) && (__APPLE_CC__ > 5400) && \
-+	(__APPLE_CC__ < 5488) && (__STDC_VERSION__ >= 199901L) && \
-+	!defined(__GNUC_STDC_INLINE__)
-+/* old versions of xcode (3.0) don't define this, and they should... */
-+#define __GNUC_STDC_INLINE__
-+#endif
-+
-+#ifdef __GNUC_STDC_INLINE__
-+#define SIM_INLINE extern inline
-+#else
- #define SIM_INLINE inline
-+#endif
-+
- #elif defined (_MSC_VER)                                /* Microsoft C Compilers */
- #define SIM_INLINE __inline
- #else                                                   /* default */