emulators/simh: update to 2021.12.11, fixing a dhcp problem.

On a microvax 3900 with qt0 ethernet, dhcp did not work because
a) netbsd doesn't receive broadcasts on qt0 (unless promiscuous mode is set)
b) the dhcp reply was sent as a broadcast.
This update fixes b) which is under control of simh.

Changes since previous snapshot (new to old):

ETHER: Fix NAT dhcp behavior to properly respond to the MAC of the requestor
SCP, makefile: Rename build conditional HAVE_DLOPEN to SIM_HAVE_DLOPEN
SCP: Prefer Posix 'command -v' over 'which'
AltairZ80: Improved vector interrupt implementation
SCSI, VAX & PDP11: Force Read Only attach for CDROM  devices
SCP: Provide commit id information when archived simh content is used
H316: The UDP code doesn't need anything from h316_defs.h.
DISK: Properly allow/disallow containers of reasonable/unreasonavle sizes
DISK: Preserve container dates when adding or removing container meta data
FIO: Add support to set file access and modify times
makefile: Fix minor line ending inconsistencies
makefile: Support both .so and .a link libraries on Linux
FIO: Emit reasonable error message when shm_open() API isn't available locally
PDP8: Fix device conflict warnings to report problems correctly
3b2: Remove glibc-specific longjmp
TIMER: Be less aggressive to disable throttling after initial calibration
H316: Call the host interface TX service routine.
H316: Fix debugging host interface messages.
H316: Signal the host/IMP ready bits in the host interface.
H316: Fix reading messages from the host interface.
H316: Fix host interface word counts.

3 files changed, 21 insertions, 22 deletions

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index d4fe632b090..577afa5727a 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.59 2021/12/08 16:04:18 adam Exp $
+# $NetBSD: Makefile,v 1.60 2021/12/11 14:35:57 rhialto Exp $
 
 DISTNAME=	simh-4.0.0
-PKGNAME=	simh-4.0.0.20211012
-PKGREVISION=	3
+PKGNAME=	simh-4.0.0.20211211
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=simh/}
 GITHUB_PROJECT=	simh
-GITHUB_TAG=	06a8447d26810110a8b168d7525955479bcd3f3a
+GITHUB_TAG=	b35d36407d9316e9d47099b78bff02b1d43c1b15
 
 MAINTAINER=	rhialto@NetBSD.org
 HOMEPAGE=	http://simh.trailing-edge.com/
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index a54bd16b0db..11acc9d22f7 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.35 2021/10/26 10:24:00 nia Exp $
+$NetBSD: distinfo,v 1.36 2021/12/11 14:35:57 rhialto Exp $
 
-BLAKE2s (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = de6c352d3d0d4d5d47b13ee7861782748d5bab4d5988a85ea70d4136600a8504
-SHA512 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 30a2ef10225a7c6a07829ddf7f559748eb8bb42bd4e2e6430da8547642063ff6b1a0729101d80e470259f8607411a1b2a3baa51ec69bac7d1ba4d99ca83a4b3e
-Size (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 29376656 bytes
-SHA1 (patch-makefile) = 03834ab4dabb39ef4d9b275b29a0722ca5dadbac
+BLAKE2s (simh-4.0.0-b35d36407d9316e9d47099b78bff02b1d43c1b15.tar.gz) = 7a881e92efa0f4086dc878e0835b1a9579759e0de4fde7d2c7f0a4f399b54f15
+SHA512 (simh-4.0.0-b35d36407d9316e9d47099b78bff02b1d43c1b15.tar.gz) = 663f300d547b0ab49ba85964cec2790559c136df35508bc51bf26299af1da3856de87a13743b6673e20cf57167356fa3ea15595edb403d2189135a05ae50e27e
+Size (simh-4.0.0-b35d36407d9316e9d47099b78bff02b1d43c1b15.tar.gz) = 29386806 bytes
+SHA1 (patch-makefile) = 883af00fa62cedaf12e14b6aa159f7a85d603891
diff --git a/emulators/simh/patches/patch-makefile b/emulators/simh/patches/patch-makefile
index 8ba39341e3f..271620576ea 100644
--- a/emulators/simh/patches/patch-makefile
+++ b/emulators/simh/patches/patch-makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-makefile,v 1.5 2021/10/19 20:34:48 rhialto Exp $
+$NetBSD: patch-makefile,v 1.6 2021/12/11 14:35:57 rhialto Exp $
 
 Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
 Exclude -flto for clang on NetBSD
@@ -8,7 +8,7 @@ Fix png16 detection.
 Let INCLUDES and LIBRARIES be the sole source for INCPATH and LIBPATH,
 to avoid seeing non-pkgsrc libraries (except MacOS platform).
 
---- makefile.orig	2021-10-13 01:53:56.000000000 +0000
+--- makefile.orig	2021-12-11 02:17:18.000000000 +0000
 +++ makefile
 @@ -298,7 +298,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
        $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)

@@ -73,8 +73,8 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
 +            # LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))

            endif

          endif

-         LIBEXT = so

-@@ -383,7 +383,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+         LIBSOEXT = so

+@@ -384,7 +384,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
          ifeq (SunOS,$(OSTYPE))

            OSNAME = Solaris

            ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))

@@ -83,7 +83,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
            endif

            LIBEXT = so

            OS_LDFLAGS += -lsocket -lnsl

-@@ -392,27 +392,27 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -393,27 +393,27 @@ ifeq (${WIN32},)  #*nix Environments (&&
              OS_CCDEFS += -I/opt/sfw/include

            endif

            ifeq (libsfw,$(shell if ${TEST} -d /opt/sfw/lib; then echo libsfw; fi))

@@ -119,7 +119,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
                endif

              else

                ifneq (,$(findstring Haiku,$(OSTYPE)))

-@@ -423,9 +423,9 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -424,9 +424,9 @@ ifeq (${WIN32},)  #*nix Environments (&&
                  ifeq ($(HAIKU_ARCH),x86_gcc2)

                    $(error Unsupported arch x86_gcc2. Run setarch x86 and retry)

                  endif

@@ -132,7 +132,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
                  OS_LDFLAGS += -lnetwork

                else

                  ifeq (,$(findstring NetBSD,$(OSTYPE)))

-@@ -433,7 +433,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -434,7 +434,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
                      LDSEARCH :=$(shell LANG=C; ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')

                    endif

                    ifneq (,$(LDSEARCH))

@@ -141,7 +141,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
                    else

                      ifeq (,$(strip $(LPATH)))

                        $(info *** Warning ***)

-@@ -445,22 +445,22 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -446,22 +446,22 @@ ifeq (${WIN32},)  #*nix Environments (&&
                        $(info *** Warning *** variable.)

                        $(info *** Warning ***)

                      else

@@ -172,7 +172,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
              endif

              ifneq (,$(findstring NetBSD,$(OSTYPE))$(findstring FreeBSD,$(OSTYPE))$(findstring AIX,$(OSTYPE)))

                LIBEXT = so

-@@ -484,12 +484,12 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -488,12 +488,12 @@ ifeq (${WIN32},)  #*nix Environments (&&
      endif

      ifeq (,$(filter /lib/,$(LIBPATH)))

        ifeq (existlib,$(shell if $(TEST) -d /lib/; then echo existlib; fi))

@@ -187,7 +187,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
        endif

      endif

      export CPATH = $(subst $() $(),:,$(INCPATH))

-@@ -598,9 +598,9 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -602,9 +602,9 @@ ifeq (${WIN32},)  #*nix Environments (&&
      OS_CCDEFS += -DHAVE_UTIME

    endif

    ifneq (,$(call find_include,png))

@@ -199,7 +199,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
        $(info using libpng: $(call find_lib,png) $(call find_include,png))

        ifneq (,$(call find_include,zlib))

          ifneq (,$(call find_lib,z))

-@@ -790,7 +790,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -794,7 +794,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
            NETWORK_FEATURES = - dynamic networking support using libpcap components from www.tcpdump.org and locally installed libpcap.${LIBEXT}

            $(info using libpcap: $(call find_include,pcap))

          else

@@ -208,7 +208,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
            LIBEXT = a

            ifneq (,$(call find_lib,$(PCAPLIB)))

              $(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))

-@@ -1185,11 +1185,11 @@ ifneq (,$(UNSUPPORTED_BUILD))

+@@ -1189,11 +1189,11 @@ ifneq (,$(UNSUPPORTED_BUILD))

  endif

  ifneq ($(DEBUG),)

    CFLAGS_G = -g -ggdb -g3

@@ -222,7 +222,7 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
      GCC_OPTIMIZERS_CMD = ${GCC} --help

      NO_LTO = 1

    else

-@@ -1197,7 +1197,7 @@ else

+@@ -1201,7 +1201,7 @@ else

      ifeq (Darwin,$(OSTYPE))

        CFLAGS_O += -O4 -flto -fwhole-program

      else