There haven't been any simh releases in years, so convert this package

to take a snapshot from github. Update to 7964e2b72d9.

Changes: too many to list them all, full list of changes is available at
https://github.com/simh/simh/blob/master/README.md

Highlights:
- many new simulators
- simulator front panel API
- VAXstation video display simulation using SDL
- UDP and NAT packet transports
- scripting support

5 files changed, 47 insertions, 69 deletions

diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index 8ad550dda82..2b3ae5abb04 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.16 2016/06/18 11:26:56 ryoon Exp $
+$NetBSD: patch-aa,v 1.17 2016/12/18 11:11:28 hans Exp $
 
 Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
 Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
@@ -6,21 +6,35 @@ Make -O2 conditional so can be overridden by environment
 
 --- makefile.orig	2012-04-23 16:28:04.000000000 +0000
 +++ makefile
-@@ -63,7 +63,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
-     OSNAME = windows-build
-   endif
-   GCC_VERSION = $(shell $(GCC) -v /dev/null 2>&1 | grep 'gcc version' | awk '{ print $$3 }')
--  LTO_EXCLUDE_VERSIONS = 
-+  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
-   PCAPLIB = pcap
-   ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
-     OS_CCDEFS = -D_GNU_SOURCE
-@@ -300,7 +300,7 @@ ifneq ($(DEBUG),)
-   CFLAGS_O = -O0
-   BUILD_FEATURES = - debugging support
- else
--  CFLAGS_O = -O2
-+  CFLAGS_O ?= -O2
-   LDFLAGS_O = 
-   GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
-   ifneq (3,$(GCC_MAJOR_VERSION))
+@@ -187,7 +187,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
+       endif

+     endif

+   endif

+-  LTO_EXCLUDE_VERSIONS = 

++  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0

+   PCAPLIB = pcap

+   ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?

+     OS_CCDEFS = -D_GNU_SOURCE

+@@ -903,11 +903,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
+ endif

+ ifneq ($(DEBUG),)

+   CFLAGS_G = -g -ggdb -g3

+-  CFLAGS_O = -O0

++  CFLAGS_O ?= -O0

+   BUILD_FEATURES = - debugging support

+ else

+   ifneq (clang,$(findstring clang,$(COMPILER_NAME)))

+-    CFLAGS_O = -O2

++    CFLAGS_O ?= -O2

+     ifeq (Darwin,$(OSTYPE))

+       NO_LTO = 1

+     endif

+@@ -916,7 +916,7 @@ else
+     ifeq (Darwin,$(OSTYPE))

+       CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program

+     else

+-      CFLAGS_O := -O2 -fno-strict-overflow 

++      CFLAGS_O ?= -O2 -fno-strict-overflow 

+     endif

+   endif

+   LDFLAGS_O = 

diff --git a/emulators/simh/patches/patch-ab b/emulators/simh/patches/patch-ab
deleted file mode 100644
index 0e86c61ec0e..00000000000
--- a/emulators/simh/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2012/06/16 14:58:36 abs Exp $
-
---- sim_ether.c.orig	2012-03-30 15:30:26.000000000 +0000
-+++ sim_ether.c
-@@ -806,6 +806,8 @@ void eth_show_dev (FILE* st, ETH_DEV* de
- #include <sys/ioctl.h> 
- #include <net/if.h> 
- #include <linux/if_tun.h> 
-+#elif defined(__sun)
-+#undef USE_TAP_NETWORK
- #elif defined(USE_BSDTUNTAP)
- #include <sys/types.h>
- #include <net/if_types.h>
diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac
deleted file mode 100644
index 8ef1fa02503..00000000000
--- a/emulators/simh/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2012/06/16 14:58:36 abs Exp $
-
---- sim_console.c.orig	2012-03-18 08:40:08.000000000 +0000
-+++ sim_console.c
-@@ -430,7 +430,7 @@ for (i = 0; i < sec; i++) {             
-     if (tmxr_poll_conn (&sim_con_tmxr) >= 0) {          /* poll connect */
-         sim_con_ldsc.rcve = 1;                          /* rcv enabled */
-         if (i) {                                        /* if delayed */
--            printf ("Running\n");                       /* print transition */
-+            printf ("Running\r\n");                       /* print transition */
-             fflush (stdout);
-             }
-         return SCPE_OK;                                 /* ready to proceed */
-@@ -439,7 +439,7 @@ for (i = 0; i < sec; i++) {             
-     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");
-         fflush (stdout);
-         }
-     sim_os_sleep (1);                                   /* wait 1 second */
diff --git a/emulators/simh/patches/patch-sim__ether.c b/emulators/simh/patches/patch-sim__ether.c
new file mode 100644
index 00000000000..c05ab6fdb5f
--- /dev/null
+++ b/emulators/simh/patches/patch-sim__ether.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-sim__ether.c,v 1.1 2016/12/18 11:11:28 hans Exp $
+
+SunOS needs sys/ioctl.h for FIONBIO definition.
+
+--- sim_ether.c.orig	2016-11-22 10:24:26.000000000 +0100
++++ sim_ether.c
+@@ -366,6 +366,7 @@
+ */

+ 

+ #include <ctype.h>

++#include <sys/ioctl.h>

+ #include "sim_ether.h"

+ #include "sim_sock.h"

+ #include "sim_timer.h"

diff --git a/emulators/simh/patches/patch-sim__timer.h b/emulators/simh/patches/patch-sim__timer.h
deleted file mode 100644
index 53112b39e15..00000000000
--- a/emulators/simh/patches/patch-sim__timer.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sim__timer.h,v 1.1 2012/07/16 00:14:33 abs Exp $
-
-Relax granularity check to allow setting idle on a machine with HZ 100
-
---- sim_timer.h.orig	2008-11-21 20:06:34.000000000 +0000
-+++ sim_timer.h
-@@ -35,7 +35,7 @@
- #define SIM_TMAX        500                             /* max timer makeup */
- 
- #define SIM_IDLE_CAL    10                              /* ms to calibrate */
--#define SIM_IDLE_MAX    10                              /* max granularity idle */
-+#define SIM_IDLE_MAX    20                              /* max granularity idle */
- #define SIM_IDLE_STMIN  10                              /* min sec for stability */
- #define SIM_IDLE_STDFLT 20                              /* dft sec for stability */
- #define SIM_IDLE_STMAX  600                             /* max sec for stability */