emulators/simh: update to 4.0.0.2022-04-01

- adds PDP10-KS emulator
- adds SEL32 emulator
- adds IMLAC emulator
- adds TT2500 emulator
- various coverity fixes
and many more small things.

3 files changed, 25 insertions, 26 deletions

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 2d89aa6326c..0cbcc1d2119 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.62 2022/03/28 10:53:05 tnn Exp $
+# $NetBSD: Makefile,v 1.63 2022/04/03 14:33:42 rhialto Exp $
 
 DISTNAME=	simh-4.0.0
-PKGNAME=	simh-4.0.0.20211212
-PKGREVISION=	1
+PKGNAME=	simh-4.0.0.20220401
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=simh/}
 GITHUB_PROJECT=	simh
-GITHUB_TAG=	40d46093853ed3d7e16331bfec713f4cfdea50fd
+GITHUB_TAG=	b8015349e269b45880b7c0a199a07c12f1cf746f
 
 MAINTAINER=	rhialto@NetBSD.org
 HOMEPAGE=	http://simh.trailing-edge.com/
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index 455b8544079..1c668d1814c 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.37 2021/12/29 15:53:35 rhialto Exp $
+$NetBSD: distinfo,v 1.38 2022/04/03 14:33:42 rhialto Exp $
 
-BLAKE2s (simh-4.0.0-40d46093853ed3d7e16331bfec713f4cfdea50fd.tar.gz) = 713d9100588bf4207ff1a0b52b22c4ab634901b1c8be90f131d395b211540b08
-SHA512 (simh-4.0.0-40d46093853ed3d7e16331bfec713f4cfdea50fd.tar.gz) = 96dadc430acae5e5b4f1fc33c734deb74a935e0eace26da44534037f72bc463df95aac5247ee92eeac59bfaeb6e94a07bc7d5e5bcb920f4a5df89f88a53aa74b
-Size (simh-4.0.0-40d46093853ed3d7e16331bfec713f4cfdea50fd.tar.gz) = 29384641 bytes
-SHA1 (patch-makefile) = 883af00fa62cedaf12e14b6aa159f7a85d603891
+BLAKE2s (simh-4.0.0-b8015349e269b45880b7c0a199a07c12f1cf746f.tar.gz) = c783024ee94dd44d34e57192616ab930f7a42d122606c96b9a86013beb564197
+SHA512 (simh-4.0.0-b8015349e269b45880b7c0a199a07c12f1cf746f.tar.gz) = e5b397689cc68b7fcb188f1ace60d3c75c1f42e05445e4089504ecac47dd48672d7902edfa5cac3963b77b5f710bd7293aef11b3452db6a8c5bf0a7f7f0ae60b
+Size (simh-4.0.0-b8015349e269b45880b7c0a199a07c12f1cf746f.tar.gz) = 31256354 bytes
+SHA1 (patch-makefile) = a532dde8a12d359cd66a2447ed95812cc0dd5dbe
diff --git a/emulators/simh/patches/patch-makefile b/emulators/simh/patches/patch-makefile
index 271620576ea..8af6303ddcd 100644
--- a/emulators/simh/patches/patch-makefile
+++ b/emulators/simh/patches/patch-makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-makefile,v 1.6 2021/12/11 14:35:57 rhialto Exp $
+$NetBSD: patch-makefile,v 1.7 2022/04/03 14:33:42 rhialto Exp $
 
 Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
 Exclude -flto for clang on NetBSD
@@ -8,9 +8,9 @@ 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-12-11 02:17:18.000000000 +0000
+--- makefile.orig	2022-04-01 19:37:11.000000000 +0000
 +++ makefile
-@@ -298,7 +298,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -307,7 +307,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)

      endif

    endif

@@ -18,8 +18,8 @@ to avoid seeing non-pkgsrc libraries (except MacOS platform).
 +  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 -DSIM_ASYNCH_IO 

-@@ -339,16 +339,16 @@ ifeq (${WIN32},)  #*nix Environments (&&
+     OS_CCDEFS += -D_GNU_SOURCE -DSIM_ASYNCH_IO 

+@@ -348,16 +348,16 @@ ifeq (${WIN32},)  #*nix Environments (&&
      ifeq (Darwin,$(OSTYPE))

        OSNAME = OSX

        LIBEXT = dylib

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

        ifeq (HomeBrew,$(or $(shell if ${TEST} -d /usr/local/Cellar; then echo HomeBrew; fi),$(shell if ${TEST} -d /opt/homebrew/Cellar; then echo HomeBrew; fi)))

          ifeq (local,$(shell if $(TEST) -d /usr/local/Cellar; then echo local; fi))

-@@ -356,8 +356,8 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -365,8 +365,8 @@ ifeq (${WIN32},)  #*nix Environments (&&
          else

            HBPATH = /opt/homebrew

          endif

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

      else

        ifeq (Linux,$(OSTYPE))

-@@ -367,15 +367,15 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -376,15 +376,15 @@ ifeq (${WIN32},)  #*nix Environments (&&
          ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))

            ifeq (Android,$(shell uname -o))

              ifneq (,$(shell if ${TEST} -d ${PREFIX}/lib; then echo prefixlib; fi))

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

          endif

          LIBSOEXT = so

-@@ -384,7 +384,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -393,7 +393,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

-@@ -393,27 +393,27 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -402,27 +402,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)))

-@@ -424,9 +424,9 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -433,9 +433,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)))

-@@ -434,7 +434,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -443,7 +443,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 ***)

-@@ -446,22 +446,22 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -455,22 +455,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

-@@ -488,12 +488,12 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -497,12 +497,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))

-@@ -602,9 +602,9 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -611,9 +611,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))

-@@ -794,7 +794,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+@@ -803,7 +803,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))

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

+@@ -1198,11 +1198,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

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

+@@ -1210,7 +1210,7 @@ else

      ifeq (Darwin,$(OSTYPE))

        CFLAGS_O += -O4 -flto -fwhole-program

      else