Thu Oct 14 19:12:56 2021 UTC ()
emulators/simh: update to snapshot dated 2021-10-12.

Since there are no simh releases there are also no release notes to summarize.
The previous snapshot was over 3 years ago: 2018-09-19.

A somewhat controversial change with some people is that simh now
appends a "footer" block to disk image files, containing metadata
(struct simh_disk_footer).  ATTACH -r <disk_unit> <filename> will avoid
this but makes the device read-only.

New information from the README.md file:

    DO <stdin>                  Invokes a nested DO command with input from the
                                running console.
    RUNLIMIT			Bound simulator execution time
    TAR                         Manipulate file archives
    CURL                        Access URLs from the web

Changes in the built emulator models:
- several new VAX models (vax8200, vaxstation{3100,4000}*, infoserver*)
- several new PDP-10 models (pdp10-{ka,ki,kl})
- new: pdp6
- Intel-Systems: Merge MDS, SDK, OEM simulators into Intel-MDS simulator

The files ka655x.bin and vmb.exe are no longer installed since they are
not required for operation (they are built into the VAX models that use
them), and it is strange to single out these ROM images out of over 30 to
install.  LOAD -r can load alternative versions.


(rhialto)
diff -r1.6 -r1.7 pkgsrc/emulators/simh/DESCR
diff -r1.56 -r1.57 pkgsrc/emulators/simh/Makefile
diff -r1.32 -r1.33 pkgsrc/emulators/simh/distinfo
diff -r1.3 -r1.4 pkgsrc/emulators/simh/patches/patch-makefile
diff -r1.1 -r0 pkgsrc/emulators/simh/patches/patch-sim__ether.c
cvs diff -r1.6 -r1.7 pkgsrc/emulators/simh/DESCR (expand / switch to unified diff)

--- pkgsrc/emulators/simh/DESCR 2020/03/27 15:55:15 1.6
+++ pkgsrc/emulators/simh/DESCR 2021/10/14 19:12:55 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1Bob Supnik's historical computer simulator, including: 1Bob Supnik's historical computer simulator, including:
2 2
3 3b2 alpha altair altairz80 b5000 besm6 cdc1700 eclipse gri 3 3b2 alpha altair altairz80 b5000 besm6 cdc1700 eclipse gri
4 h316 hp2100 hp3000 i1401 i1620 i650 i7000 i7094 ibm1130 4 h316 hp2100 hp3000 i1401 i1620 i650 i7000 i7094 ibm1130
5 intel-systems id16 id32 lgp nova pdp1 pdp10 pdp11 pdp18b 5 intel-systems id16 id32 lgp nova pdp1 pdp6 pdp10 pdp11 pdp18b
6 pdp4 pdp7 pdp8 pdp9 s3 sage sds ssem tx0 vax 6 pdp4 pdp7 pdp8 pdp9 s3 sage sds ssem tx0 vax
7 7
8See http://www.netbsd.org/ports/vax/emulator-howto.html on how to 8See http://www.netbsd.org/ports/vax/emulator-howto.html on how to
9install NetBSD/vax on simh! 9install NetBSD/vax on simh!
cvs diff -r1.56 -r1.57 pkgsrc/emulators/simh/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/Makefile 2021/09/08 21:05:02 1.56
+++ pkgsrc/emulators/simh/Makefile 2021/10/14 19:12:55 1.57
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.56 2021/09/08 21:05:02 nia Exp $ 1# $NetBSD: Makefile,v 1.57 2021/10/14 19:12:55 rhialto Exp $
2 2
3DISTNAME= simh-4.0.0 3DISTNAME= simh-4.0.0
4PKGNAME= simh-4.0.0.20180919 4PKGNAME= simh-4.0.0.20211012
5PKGREVISION= 3 
6CATEGORIES= emulators 5CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/}
8GITHUB_PROJECT= simh 7GITHUB_PROJECT= simh
9GITHUB_TAG= 0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3 8GITHUB_TAG= 06a8447d26810110a8b168d7525955479bcd3f3a
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= rhialto@NetBSD.org
12HOMEPAGE= http://simh.trailing-edge.com/ 11HOMEPAGE= http://simh.trailing-edge.com/
13COMMENT= Bob Supniks historical computer simulator 12COMMENT= Bob Supniks historical computer simulator
14LICENSE= mit 13LICENSE= mit
15 14
16DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf 15DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
17 16
18USE_TOOLS+= gmake 17USE_TOOLS+= gmake
19 18
20BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9 19BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9
21 20
22.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
23 22
24BUILDLINK_TRANSFORM+= rm:-flto 23BUILDLINK_TRANSFORM+= rm:-flto
@@ -28,60 +27,65 @@ BUILDLINK_TRANSFORM+= rm:-fwhole-program @@ -28,60 +27,65 @@ BUILDLINK_TRANSFORM+= rm:-fwhole-program
28BUILDLINK_TRANSFORM+= rm:-O2 27BUILDLINK_TRANSFORM+= rm:-O2
29.endif 28.endif
30 29
31# Needed for PDP11/pdp11_dc.c on gcc 4.1.3 30# Needed for PDP11/pdp11_dc.c on gcc 4.1.3
32.if (${MACHINE_ARCH} == "vax") 31.if (${MACHINE_ARCH} == "vax")
33CFLAGS+= -fforce-addr 32CFLAGS+= -fforce-addr
34.endif 33.endif
35 34
36CFLAGS.SunOS+= -DBSD_COMP 35CFLAGS.SunOS+= -DBSD_COMP
37LDFLAGS.SunOS+= -lm 36LDFLAGS.SunOS+= -lm
38 37
39LDFLAGS.Linux+= -lm -pthread -lrt 38LDFLAGS.Linux+= -lm -pthread -lrt
40 39
41INSTALLATION_DIRS= bin share/simh share/doc/simh 40INSTALLATION_DIRS= bin share/simh share/simh/TX-0 share/doc/simh
42 41
43MAKE_FILE= makefile 42MAKE_FILE= makefile
44INCLUDES= ${PREFIX:Q}/include:\ 43INCLUDES= ${PREFIX:Q}/include:\
45 ${BUILDLINK_PREFIX.SDL2:Q}/include/SDL2:\ 44 ${BUILDLINK_PREFIX.SDL2:Q}/include/SDL2:\
46 ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\ 45 ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\
47 ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\ 46 ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\
48 ${BUILDLINK_PREFIX.png:Q}/include:\ 47 ${BUILDLINK_PREFIX.png:Q}/include:\
49 /usr/include 48 /usr/include
50LIBRARIES= ${PREFIX:Q}/lib:\ 49LIBRARIES= ${PREFIX:Q}/lib:\
51 ${BUILDLINK_PREFIX.SDL2:Q}/lib${LIBABISUFFIX}:\ 50 ${BUILDLINK_PREFIX.SDL2:Q}/lib${LIBABISUFFIX}:\
52 ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\ 51 ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
53 ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\ 52 ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
54 ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\ 53 ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\
55 /usr/lib${LIBABISUFFIX} 54 /usr/lib${LIBABISUFFIX}
56MAKE_ENV+= INCLUDES=${INCLUDES:Q} 55MAKE_ENV+= INCLUDES=${INCLUDES:Q}
57MAKE_ENV+= LIBRARIES=${LIBRARIES:Q} 56MAKE_ENV+= LIBRARIES=${LIBRARIES:Q}
58MAKE_ENV+= GCC=${CC:Q} 57MAKE_ENV+= GCC=${CC:Q}
59MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q} 58MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
60MAKE_ENV+= FONTPATH=/usr/pkg/share/fonts/X11/TTF 59MAKE_ENV+= FONTPATH=/usr/pkg/share/fonts/X11/TTF
61 60
62BUILD_TARGET= all besm6 61BUILD_TARGET= TESTS=0 all
63 62
64post-extract: 63post-extract:
65 ${MKDIR} ${WRKSRC}/BIN 64 ${MKDIR} ${WRKSRC}/BIN
66 65
67do-install: 66do-install:
68 (cd ${WRKSRC}/BIN && for BIN in *; do \ 67 (cd ${WRKSRC}/BIN && for BIN in *; do \
69 if [ -f $$BIN ] ; then \ 68 if [ -f $$BIN ] ; then \
70 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \ 69 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
71 fi ; \ 70 fi ; \
72 done) 71 done)
73 72
74 ${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh 73 ${INSTALL_DATA} ${WRKSRC}/TX-0/*.bin ${DESTDIR}${PREFIX}/share/simh/TX-0
75 ${INSTALL_DATA} ${WRKSRC}/VAX/vmb.exe ${DESTDIR}${PREFIX}/share/simh 
76 (cd ${WRKSRC} && for TXT in *.txt */*.txt; do \ 74 (cd ${WRKSRC} && for TXT in *.txt */*.txt; do \
77 ${INSTALL_DATA} "$$TXT" ${DESTDIR}${PREFIX}/share/doc/simh; \ 75 ${INSTALL_DATA} "$$TXT" ${DESTDIR}${PREFIX}/share/doc/simh; \
78 done) 76 done)
79 77
 78# Note: tests require shm (/var/shm is a tmpfs) for the uc15.
 79# They are part of the build and can't be run separately.
 80do-test:
 81 cd ${WRKSRC} && ${TEST_MAKE_CMD} clean
 82 cd ${WRKSRC} && ${TEST_MAKE_CMD} all
 83
80.include "../../devel/SDL2/buildlink3.mk" 84.include "../../devel/SDL2/buildlink3.mk"
81.include "../../fonts/SDL2_ttf/buildlink3.mk" 85.include "../../fonts/SDL2_ttf/buildlink3.mk"
82.include "../../devel/pcre/buildlink3.mk" 86.include "../../devel/pcre/buildlink3.mk"
83.include "../../graphics/png/buildlink3.mk" 87.include "../../graphics/png/buildlink3.mk"
84.include "../../net/libpcap/buildlink3.mk" 88.include "../../net/libpcap/buildlink3.mk"
85.include "../../mk/dlopen.buildlink3.mk" 89.include "../../mk/dlopen.buildlink3.mk"
86.include "../../mk/pthread.buildlink3.mk" 90.include "../../mk/pthread.buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 91.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32 -r1.33 pkgsrc/emulators/simh/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/simh/distinfo 2021/10/07 13:49:38 1.32
+++ pkgsrc/emulators/simh/distinfo 2021/10/14 19:12:55 1.33
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.32 2021/10/07 13:49:38 nia Exp $ 1$NetBSD: distinfo,v 1.33 2021/10/14 19:12:55 rhialto Exp $
2 2
3RMD160 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 0b2ad6107006f89b0ca66ddc556c2f00df56937c 3RMD160 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 139a3ac95eefbfb6c2298c24386d02f832dffe94
4SHA512 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 1c17430e74022cb5a9aebc784dc1a223fbbe323799ab528a9c788db8e3dbad01b7635da3c3dc158fcd28103c5fc462ce0fc3e9cdd90c298ff6ecdeb3dfd5f0a8 4SHA512 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 30a2ef10225a7c6a07829ddf7f559748eb8bb42bd4e2e6430da8547642063ff6b1a0729101d80e470259f8607411a1b2a3baa51ec69bac7d1ba4d99ca83a4b3e
5Size (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 12077046 bytes 5Size (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 29376656 bytes
6SHA1 (patch-makefile) = 6e07d6fb406a455a93447facfc93c79da7de74a6 6SHA1 (patch-makefile) = b9142225e4d19ef8d7223f6fdf342aa51c9a2e75
7SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790 
cvs diff -r1.3 -r1.4 pkgsrc/emulators/simh/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/patches/patch-makefile 2020/02/18 16:49:50 1.3
+++ pkgsrc/emulators/simh/patches/patch-makefile 2021/10/14 19:12:56 1.4
@@ -1,46 +1,55 @@ @@ -1,46 +1,55 @@
1$NetBSD: patch-makefile,v 1.3 2020/02/18 16:49:50 joerg Exp $ 1$NetBSD: patch-makefile,v 1.4 2021/10/14 19:12:56 rhialto Exp $
2 2
3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6) 3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
4Exclude -flto for clang on NetBSD 4Exclude -flto for clang on NetBSD
5Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1) 5Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
 6NO_LTO=1 is in effect for gcc and clang, except Darwin.
6Make -O2 conditional so can be overridden by environment 7Make -O2 conditional so can be overridden by environment
7Fix SDL2 detection 8Fix png16 detection
8 9
9--- makefile.orig 2018-09-20 05:36:48.-00145232 +0000 10--- makefile.orig 2021-10-07 06:38:08.000000000 +0000
10+++ makefile 11+++ makefile
11@@ -217,7 +217,7 @@ ifeq ($(WIN32),) #*nix Environments (&& 12@@ -298,7 +298,7 @@ ifeq (${WIN32},) #*nix Environments (&&
12 $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)  13 $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
13 endif  14 endif
14 endif  15 endif
15- LTO_EXCLUDE_VERSIONS =  16- LTO_EXCLUDE_VERSIONS =
16+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0  17+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
17 PCAPLIB = pcap  18 PCAPLIB = pcap
18 ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?  19 ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
19 OS_CCDEFS = -D_GNU_SOURCE  20 OS_CCDEFS = -D_GNU_SOURCE -DSIM_ASYNCH_IO
20@@ -1039,20 +1039,23 @@ ifneq (,$(UNSUPPORTED_BUILD))  21@@ -598,9 +598,9 @@ ifeq (${WIN32},) #*nix Environments (&&
 22 OS_CCDEFS += -DHAVE_UTIME
 23 endif
 24 ifneq (,$(call find_include,png))
 25- ifneq (,$(call find_lib,png))
 26+ ifneq (,$(call find_lib,png16))
 27 OS_CCDEFS += -DHAVE_LIBPNG
 28- OS_LDFLAGS += -lpng
 29+ OS_LDFLAGS += -lpng16
 30 $(info using libpng: $(call find_lib,png) $(call find_include,png))
 31 ifneq (,$(call find_include,zlib))
 32 ifneq (,$(call find_lib,z))
 33@@ -1185,11 +1185,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
21 endif  34 endif
22 ifneq ($(DEBUG),)  35 ifneq ($(DEBUG),)
23 CFLAGS_G = -g -ggdb -g3  36 CFLAGS_G = -g -ggdb -g3
24- CFLAGS_O = -O0  37- CFLAGS_O = -O0
25+ CFLAGS_O ?= -O0  38+ CFLAGS_O ?= -O0
26 BUILD_FEATURES = - debugging support  39 BUILD_FEATURES = - debugging support
27 else  40 else
28 ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))  41 ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
29- CFLAGS_O = -O0  42- CFLAGS_O = -O2 -fno-strict-overflow
30+ CFLAGS_O ?= -O0  43+ CFLAGS_O ?= -O2 -fno-strict-overflow
31 ifeq (Darwin,$(OSTYPE))  44 GCC_OPTIMIZERS_CMD = ${GCC} --help
32 NO_LTO = 1  
33+ endif  
34+ ifeq (NetBSD,$(OSTYPE))  
35+ NO_LTO = 1  
36 endif  
37 else  
38 NO_LTO = 1  45 NO_LTO = 1
 46 else
 47@@ -1197,7 +1197,7 @@ else
39 ifeq (Darwin,$(OSTYPE))  48 ifeq (Darwin,$(OSTYPE))
40 CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program  49 CFLAGS_O += -O4 -flto -fwhole-program
41 else  50 else
42- CFLAGS_O := -O2 -fno-strict-overflow  51- CFLAGS_O := -O2
43+ CFLAGS_O ?= -O2 -fno-strict-overflow  52+ CFLAGS_O ?= -O2
44 endif  53 endif
45 endif  54 endif
46 LDFLAGS_O =  55 LDFLAGS_O =
File Deleted: pkgsrc/emulators/simh/patches/Attic/patch-sim__ether.c