Wed Feb 8 20:59:50 2023 UTC ()
emulators/open-simh: update to version 4.1.0.20230207

Pkg changes: build fix to avoid a miscompilation by lang/gcc10
Changes: use version 4.1 to differentiate open-simh from simh

5e01c051  3B2: Fix inconsistent 64bit type name reference
c5ce3395 AltairZ80: ADCS6: Fix uninitialized unit structure
2374c3b6 Floating loads are src,dst (nickd4)
949359fd Update version to identify Open SIMH builds
4562408a Common code: various bugfixes; Mac "Classic" and OS/2 support has been removed
86a995b8 PDP11: numerous 11/70 compatibility fixes
8e13ea1d SIGMA: Invalid address must set a TDV-visible error flag (Ken Rector)
16de685c PDP11, VAX: Re-enabled VH11 after fixes (Mark Pizzolato)
8bc5b0b1 I7094: Changed structures to arrays for display
09899c18 AltairZ80: 2SIO: Fix potential NULL pointer dereference.
023cd3b3 AltairZ80: Add support for NMI interrupts.
11e555bb AltairZ80: Fix width of vectorInterrupt pseudo register.
1921b589 KA10: Fixed TM10A to request first word at issue of write instruction.
b487b3a7 KA10: Fixed issue with ITS KA quantum clock interrupt.
1294ef1e KA10: Fixed IMP address determination for KS, code cleanup.
cd40b302 KA10: Fixed Chaosnet devices to work properly under ITS.
da6dcef8 3b2: Fix for clock drift when idling
dcd3e480 AltairZ80: ADCS6: Initialize extended UDATA in reset routine.
1a136665 AltairZ80: Adds -H switch to LOAD command for loading Intel hex files


(rhialto)
diff -r1.7 -r1.8 pkgsrc/emulators/open-simh/Makefile
diff -r1.4 -r1.5 pkgsrc/emulators/open-simh/distinfo
cvs diff -r1.7 -r1.8 pkgsrc/emulators/open-simh/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/open-simh/Makefile 2023/01/29 21:16:01 1.7
+++ pkgsrc/emulators/open-simh/Makefile 2023/02/08 20:59:50 1.8
@@ -1,43 +1,52 @@ @@ -1,43 +1,52 @@
1# $NetBSD: Makefile,v 1.7 2023/01/29 21:16:01 ryoon Exp $ 1# $NetBSD: Makefile,v 1.8 2023/02/08 20:59:50 rhialto Exp $
2 2
3DISTNAME= open-simh-4.0.0 3DISTNAME= open-simh-4.1.0
4PKGNAME= open-simh-4.0.0.20221202 4PKGNAME= open-simh-4.1.0.20230207
5PKGREVISION= 1 
6CATEGORIES= emulators 5CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_GITHUB:=open-simh/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=open-simh/}
8GITHUB_PROJECT= simh 7GITHUB_PROJECT= simh
9GITHUB_TAG= ce791138b5b5365105415a9a1cf4091d6e50a43d 8GITHUB_TAG= 5e01c0516b14d16fa4e780dff13077bed76aa38a
10 9
11MAINTAINER= rhialto@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
24.if ${OPSYS} == "Darwin" 23.if ${OPSYS} == "Darwin"
25# Doesn't seem to work with pkgsrc pcap, and dylib path is hardcoded. 24# Doesn't seem to work with pkgsrc pcap, and dylib path is hardcoded.
26PREFER.libpcap= native 25PREFER.libpcap= native
27# Link error with the native version: _zlibVersion 26# Link error with the native version: _zlibVersion
28PREFER.zlib= pkgsrc 27PREFER.zlib= pkgsrc
29.endif 28.endif
30 29
 30# The makefile tries to autodetect the options below from "gcc --help", but
 31# due to the compiler wrapper, it may not always output the expected text.
 32# So we hardcode the options here.
 33CFLAGS_O+= -finline-functions
 34CFLAGS_O+= -fgcse-after-reload
 35CFLAGS_O+= -fpredictive-commoning
 36CFLAGS_O+= -fipa-cp-clone
 37CFLAGS_O+= -fno-unsafe-loop-optimizations
 38CFLAGS_O+= -fno-strict-overflow
 39
31.if (${MACHINE_ARCH} == "arm") 40.if (${MACHINE_ARCH} == "arm")
32BUILDLINK_TRANSFORM+= rm:-O2 41BUILDLINK_TRANSFORM+= rm:-O2
33.endif 42.endif
34 43
35# Needed for PDP11/pdp11_dc.c on gcc 4.1.3 44# Needed for PDP11/pdp11_dc.c on gcc 4.1.3
36.if (${MACHINE_ARCH} == "vax") 45.if (${MACHINE_ARCH} == "vax")
37CFLAGS+= -fforce-addr 46CFLAGS+= -fforce-addr
38.endif 47.endif
39 48
40CFLAGS.SunOS+= -DBSD_COMP 49CFLAGS.SunOS+= -DBSD_COMP
41LDFLAGS.SunOS+= -lm 50LDFLAGS.SunOS+= -lm
42 51
43LDFLAGS.Linux+= -lm -pthread -lrt 52LDFLAGS.Linux+= -lm -pthread -lrt
@@ -53,26 +62,27 @@ INCLUDES= ${PREFIX:Q}/include:\ @@ -53,26 +62,27 @@ INCLUDES= ${PREFIX:Q}/include:\
53 ${BUILDLINK_PREFIX.png:Q}/include:\ 62 ${BUILDLINK_PREFIX.png:Q}/include:\
54 /usr/include 63 /usr/include
55LIBRARIES= ${PREFIX:Q}/lib:\ 64LIBRARIES= ${PREFIX:Q}/lib:\
56 ${BUILDLINK_PREFIX.SDL2:Q}/lib${LIBABISUFFIX}:\ 65 ${BUILDLINK_PREFIX.SDL2:Q}/lib${LIBABISUFFIX}:\
57 ${BUILDLINK_PREFIX.editline:Q}/lib${LIBABISUFFIX}:\ 66 ${BUILDLINK_PREFIX.editline:Q}/lib${LIBABISUFFIX}:\
58 ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\ 67 ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
59 ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\ 68 ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
60 ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\ 69 ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\
61 /usr/lib${LIBABISUFFIX} 70 /usr/lib${LIBABISUFFIX}
62MAKE_ENV+= INCLUDES=${INCLUDES:Q} 71MAKE_ENV+= INCLUDES=${INCLUDES:Q}
63MAKE_ENV+= LIBRARIES=${LIBRARIES:Q} 72MAKE_ENV+= LIBRARIES=${LIBRARIES:Q}
64MAKE_ENV+= GCC=${CC:Q} 73MAKE_ENV+= GCC=${CC:Q}
65MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} 74MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q}
 75MAKE_ENV+= CFLAGS_O=${CFLAGS_O:Q}
66MAKE_ENV+= FONTPATH=${PREFIX:Q}/share/fonts/X11/TTF 76MAKE_ENV+= FONTPATH=${PREFIX:Q}/share/fonts/X11/TTF
67MAKE_ENV+= WARNINGS=ALLOWED 77MAKE_ENV+= WARNINGS=ALLOWED
68 78
69BUILD_MAKE_FLAGS= TESTS=0 79BUILD_MAKE_FLAGS= TESTS=0
70 80
71 81
72post-extract: 82post-extract:
73 ${MKDIR} ${WRKSRC}/BIN 83 ${MKDIR} ${WRKSRC}/BIN
74 84
75do-install: 85do-install:
76 (cd ${WRKSRC}/BIN && for BIN in *; do \ 86 (cd ${WRKSRC}/BIN && for BIN in *; do \
77 if [ -f $$BIN ] ; then \ 87 if [ -f $$BIN ] ; then \
78 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \ 88 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
cvs diff -r1.4 -r1.5 pkgsrc/emulators/open-simh/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/open-simh/distinfo 2022/12/11 20:28:09 1.4
+++ pkgsrc/emulators/open-simh/distinfo 2023/02/08 20:59:50 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2022/12/11 20:28:09 rhialto Exp $ 1$NetBSD: distinfo,v 1.5 2023/02/08 20:59:50 rhialto Exp $
2 2
3BLAKE2s (open-simh-4.0.0-ce791138b5b5365105415a9a1cf4091d6e50a43d.tar.gz) = 28151f718cf840f7f3b0f057de9079fa403545abd48354a18bc7818014a95570 3BLAKE2s (open-simh-4.1.0-5e01c0516b14d16fa4e780dff13077bed76aa38a.tar.gz) = 610fc19c44ad7655c8c1874ca0ac8441b6256324cb93dff76d899cee5597afb6
4SHA512 (open-simh-4.0.0-ce791138b5b5365105415a9a1cf4091d6e50a43d.tar.gz) = ee9e61ad75c77506fa64dc7bd84ef594969f31ff48ed7e74ac14794a1a20b16fa8b94fb84113e50a934a149f7a8102517881b15bdeb84e2c5417a954df367340 4SHA512 (open-simh-4.1.0-5e01c0516b14d16fa4e780dff13077bed76aa38a.tar.gz) = f67804c3ad73feb3300479fbeb4e3f4aa9acdbff4ca053ba64744022bac3259431e175fb9f596326bd10a9d024d21094aa2db24c327fe7ab5a2102d2bc8b83ca
5Size (open-simh-4.0.0-ce791138b5b5365105415a9a1cf4091d6e50a43d.tar.gz) = 31231180 bytes 5Size (open-simh-4.1.0-5e01c0516b14d16fa4e780dff13077bed76aa38a.tar.gz) = 31230051 bytes
6SHA1 (patch-makefile) = 1958d111733c76b3cb1bff838278ec9cd5313dbf 6SHA1 (patch-makefile) = 1958d111733c76b3cb1bff838278ec9cd5313dbf