Mon Sep 24 14:12:29 2018 UTC ()
simh: update to 4.0.0.20180919

Update simh to a current git snapshot.  The main motivation for the
update is the fix to simh bug #478, which is needed for NetBSD to boot
on an emulated VAX under anita.  There have also been other changes
too numerous to list here, including the following new emulations:
3b2, i701, i7010, i704, i7070, i7080, i7090, scelbi, sigma, uc15.


(gson)
diff -r1.49 -r1.50 pkgsrc/emulators/simh/Makefile
diff -r1.17 -r1.18 pkgsrc/emulators/simh/PLIST
diff -r1.29 -r1.30 pkgsrc/emulators/simh/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/simh/patches/patch-makefile
cvs diff -r1.49 -r1.50 pkgsrc/emulators/simh/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/Makefile 2018/02/09 17:35:05 1.49
+++ pkgsrc/emulators/simh/Makefile 2018/09/24 14:12:28 1.50
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.49 2018/02/09 17:35:05 gson Exp $ 1# $NetBSD: Makefile,v 1.50 2018/09/24 14:12:28 gson Exp $
2 2
3DISTNAME= simh-4.0.0 3DISTNAME= simh-4.0.0
4PKGNAME= simh-4.0.0.20170406 4PKGNAME= simh-4.0.0.20180919
5PKGREVISION= 2 
6CATEGORIES= emulators 5CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/}
8GITHUB_PROJECT= simh 7GITHUB_PROJECT= simh
9GITHUB_TAG= 2ddb7162f3b7602afac290505c5d3352007cf26d 8GITHUB_TAG= 0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@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
14 13
15DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf 14DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
16 15
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
18 17
19BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9 18BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9
20 19
21.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
22 21
cvs diff -r1.17 -r1.18 pkgsrc/emulators/simh/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/simh/PLIST 2018/02/09 17:35:05 1.17
+++ pkgsrc/emulators/simh/PLIST 2018/09/24 14:12:28 1.18
@@ -1,75 +1,87 @@ @@ -1,75 +1,87 @@
1@comment $NetBSD: PLIST,v 1.17 2018/02/09 17:35:05 gson Exp $ 1@comment $NetBSD: PLIST,v 1.18 2018/09/24 14:12:28 gson Exp $
 2bin/simh-3b2
2bin/simh-altair 3bin/simh-altair
3bin/simh-altairz80 4bin/simh-altairz80
4bin/simh-b5500 5bin/simh-b5500
5bin/simh-besm6 6bin/simh-besm6
6bin/simh-cdc1700 7bin/simh-cdc1700
7bin/simh-eclipse 8bin/simh-eclipse
8bin/simh-gri 9bin/simh-gri
9bin/simh-h316 10bin/simh-h316
10bin/simh-hp2100 11bin/simh-hp2100
11bin/simh-hp3000 12bin/simh-hp3000
12bin/simh-i1401 13bin/simh-i1401
13bin/simh-i1620 14bin/simh-i1620
 15bin/simh-i701
 16bin/simh-i7010
 17bin/simh-i704
 18bin/simh-i7070
 19bin/simh-i7080
 20bin/simh-i7090
14bin/simh-i7094 21bin/simh-i7094
15bin/simh-ibm1130 22bin/simh-ibm1130
16bin/simh-id16 23bin/simh-id16
17bin/simh-id32 24bin/simh-id32
18bin/simh-imds-225 25bin/simh-imds-225
19bin/simh-isys8010 26bin/simh-isys8010
20bin/simh-isys8020 27bin/simh-isys8020
21bin/simh-isys8024 28bin/simh-isys8024
22bin/simh-isys8030 29bin/simh-isys8030
23bin/simh-lgp 30bin/simh-lgp
24bin/simh-microvax1 31bin/simh-microvax1
25bin/simh-microvax2 32bin/simh-microvax2
26bin/simh-microvax3900 33bin/simh-microvax3900
27bin/simh-nova 34bin/simh-nova
28bin/simh-pdp1 35bin/simh-pdp1
29bin/simh-pdp10 36bin/simh-pdp10
30bin/simh-pdp11 37bin/simh-pdp11
31bin/simh-pdp15 38bin/simh-pdp15
32bin/simh-pdp4 39bin/simh-pdp4
33bin/simh-pdp7 40bin/simh-pdp7
34bin/simh-pdp8 41bin/simh-pdp8
35bin/simh-pdp9 42bin/simh-pdp9
36bin/simh-rtvax1000 43bin/simh-rtvax1000
37bin/simh-s3 44bin/simh-s3
 45bin/simh-scelbi
38bin/simh-sds 46bin/simh-sds
 47bin/simh-sigma
39bin/simh-ssem 48bin/simh-ssem
40bin/simh-swtp6800mp-a 49bin/simh-swtp6800mp-a
41bin/simh-swtp6800mp-a2 50bin/simh-swtp6800mp-a2
42bin/simh-tx-0 51bin/simh-tx-0
 52bin/simh-uc15
43bin/simh-vax 53bin/simh-vax
44bin/simh-vax730 54bin/simh-vax730
45bin/simh-vax750 55bin/simh-vax750
46bin/simh-vax780 56bin/simh-vax780
47bin/simh-vax8600 57bin/simh-vax8600
48share/doc/simh/0ReadMe_Projects.txt 58share/doc/simh/0ReadMe_Projects.txt
49share/doc/simh/0readmeAsynchIO.txt 59share/doc/simh/0readmeAsynchIO.txt
50share/doc/simh/0readme_39.txt 60share/doc/simh/0readme_39.txt
51share/doc/simh/0readme_ethernet.txt 61share/doc/simh/0readme_ethernet.txt
 62share/doc/simh/CDC1700-Customization.txt
52share/doc/simh/CDC1700-Diagnostics.txt 63share/doc/simh/CDC1700-Diagnostics.txt
53share/doc/simh/CDC1700-MSOS.txt 64share/doc/simh/CDC1700-MSOS.txt
54share/doc/simh/CDC1700.txt 65share/doc/simh/CDC1700.txt
55share/doc/simh/altair.txt 66share/doc/simh/altair.txt
56share/doc/simh/eclipse.txt 67share/doc/simh/eclipse.txt
57share/doc/simh/haltguide.txt 68share/doc/simh/haltguide.txt
58share/doc/simh/hp2100_bugfixes.txt 69share/doc/simh/hp2100_bugfixes.txt
59share/doc/simh/hp2100_diag.txt 70share/doc/simh/hp2100_diag.txt
60share/doc/simh/hp2100_release.txt 71share/doc/simh/hp2100_release.txt
61share/doc/simh/hp3000_diag.txt 72share/doc/simh/hp3000_diag.txt
62share/doc/simh/hp3000_release.txt 73share/doc/simh/hp3000_release.txt
 74share/doc/simh/i1620_error_matrix.txt
63share/doc/simh/i7094_bug_history.txt 75share/doc/simh/i7094_bug_history.txt
64share/doc/simh/id_diag.txt 76share/doc/simh/id_diag.txt
65share/doc/simh/input.txt 77share/doc/simh/input.txt
66share/doc/simh/m68k_parse.y.txt 78share/doc/simh/m68k_parse.y.txt
67share/doc/simh/pdp10_bug_history.txt 79share/doc/simh/pdp10_bug_history.txt
68share/doc/simh/pdp18b_diag.txt 80share/doc/simh/pdp18b_diag.txt
69share/doc/simh/pdp1_diag.txt 81share/doc/simh/pdp1_diag.txt
70share/doc/simh/readme-sage.txt 82share/doc/simh/readme-sage.txt
71share/doc/simh/readme1130.txt 83share/doc/simh/readme1130.txt
72share/doc/simh/readme_s3.txt 84share/doc/simh/readme_s3.txt
73share/doc/simh/readme_update.txt 85share/doc/simh/readme_update.txt
74share/doc/simh/sds_diag.txt 86share/doc/simh/sds_diag.txt
75share/doc/simh/sigma_bugs.txt 87share/doc/simh/sigma_bugs.txt
cvs diff -r1.29 -r1.30 pkgsrc/emulators/simh/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/simh/distinfo 2017/12/31 08:50:00 1.29
+++ pkgsrc/emulators/simh/distinfo 2018/09/24 14:12:28 1.30
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.29 2017/12/31 08:50:00 tsutsui Exp $ 1$NetBSD: distinfo,v 1.30 2018/09/24 14:12:28 gson Exp $
2 2
3SHA1 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = a6b17f1b16bd2a21d7ae797c0bd8282267b30c1a 3SHA1 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 58d77b58be3850d5f1cd9a7cdcb24d1e110bd71e
4RMD160 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 4f172b66a8efcd3b0870fa5d8e4a8dc76b9c7f87 4RMD160 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 0b2ad6107006f89b0ca66ddc556c2f00df56937c
5SHA512 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 56656dcc57460aa3f4a42ed5fbc3f9bc8c567498f394450f631f26475dc20f2b1282569cabc053049a4d07d3d0aee3fd8bb41b67aab9bef9c722e28ffb971cdf 5SHA512 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 1c17430e74022cb5a9aebc784dc1a223fbbe323799ab528a9c788db8e3dbad01b7635da3c3dc158fcd28103c5fc462ce0fc3e9cdd90c298ff6ecdeb3dfd5f0a8
6Size (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 10046376 bytes 6Size (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 12077046 bytes
7SHA1 (patch-makefile) = bdc247baec8751b4ac7d4ac03182c44e10a674a4 7SHA1 (patch-makefile) = ed0f4fdcb63d09e7f0374abafc3f8d03f0f86e91
8SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790 8SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790
cvs diff -r1.1 -r1.2 pkgsrc/emulators/simh/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/patches/patch-makefile 2017/12/31 08:50:00 1.1
+++ pkgsrc/emulators/simh/patches/patch-makefile 2018/09/24 14:12:28 1.2
@@ -1,50 +1,41 @@ @@ -1,50 +1,41 @@
1$NetBSD: patch-makefile,v 1.1 2017/12/31 08:50:00 tsutsui Exp $ 1$NetBSD: patch-makefile,v 1.2 2018/09/24 14:12:28 gson 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 gcc 4.4.7 (Used in DragonFly 2.13 - 3.1) 4Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
5Make -O2 conditional so can be overridden by environment 5Make -O2 conditional so can be overridden by environment
6Fix SDL2 detection 6Fix SDL2 detection
7 7
8--- makefile.orig 2017-04-05 19:51:28.000000000 +0000 8--- makefile.orig 2018-09-20 05:36:48.000000000 +0000
9+++ makefile 9+++ makefile
10@@ -190,7 +190,7 @@ ifeq ($(WIN32),) #*nix Environments (&& 10@@ -217,7 +217,7 @@ ifeq ($(WIN32),) #*nix Environments (&&
11 endif  11 $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
12 endif  12 endif
13 endif  13 endif
14- LTO_EXCLUDE_VERSIONS =  14- LTO_EXCLUDE_VERSIONS =
15+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0  15+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
16 PCAPLIB = pcap  16 PCAPLIB = pcap
17 ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?  17 ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
18 OS_CCDEFS = -D_GNU_SOURCE  18 OS_CCDEFS = -D_GNU_SOURCE
19@@ -912,11 +912,11 @@ ifneq (,$(UNSUPPORTED_BUILD))  19@@ -1039,11 +1039,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
20 endif  20 endif
21 ifneq ($(DEBUG),)  21 ifneq ($(DEBUG),)
22 CFLAGS_G = -g -ggdb -g3  22 CFLAGS_G = -g -ggdb -g3
23- CFLAGS_O = -O0  23- CFLAGS_O = -O0
24+ CFLAGS_O ?= -O0  24+ CFLAGS_O ?= -O0
25 BUILD_FEATURES = - debugging support  25 BUILD_FEATURES = - debugging support
26 else  26 else
27 ifneq (clang,$(findstring clang,$(COMPILER_NAME)))  27 ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
28- CFLAGS_O = -O2  28- CFLAGS_O = -O0
29+ CFLAGS_O ?= -O2  29+ CFLAGS_O ?= -O0
30 ifeq (Darwin,$(OSTYPE))  30 ifeq (Darwin,$(OSTYPE))
31 NO_LTO = 1  31 NO_LTO = 1
32 endif  32 endif
33@@ -925,7 +925,7 @@ else  33@@ -1052,7 +1052,7 @@ else
34 ifeq (Darwin,$(OSTYPE))  34 ifeq (Darwin,$(OSTYPE))
35 CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program  35 CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program
36 else  36 else
37- CFLAGS_O := -O2 -fno-strict-overflow  37- CFLAGS_O := -O2 -fno-strict-overflow
38+ CFLAGS_O ?= -O2 -fno-strict-overflow  38+ CFLAGS_O ?= -O2 -fno-strict-overflow
39 endif  39 endif
40 endif  40 endif
41 LDFLAGS_O =  41 LDFLAGS_O =
42@@ -1473,7 +1473,7 @@ ifneq (,$(BESM6_BUILD))  
43 $(info *** No SDL ttf support available. BESM-6 video panel disabled.)  
44 $(info ***)  
45 BESM6_OPT = -I ${BESM6D} -DUSE_INT64  
46- else ifneq (,$(and $(findstring SDL2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)))  
47+ else ifneq (,$(and $(findstring sdl2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)))  
48 $(info using libSDL2_ttf: $(call find_lib,SDL2_ttf) $(call find_include,SDL2/SDL_ttf))  
49 $(info ***)  
50 BESM6_OPT = -I ${BESM6D} -DFONTFILE=${FONTFILE} -DUSE_INT64 ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL2_ttf