Sun May 8 12:09:51 2022 UTC ()
emulators/simh: update to 2022-05-01.

* e1ce9f4f sim_imd: Check for EOF when reading IMD track headers
* d3f1ee09 CONSOLE: Set console input WAIT time to reflect console speed


(rhialto)
diff -r1.63 -r1.64 pkgsrc/emulators/simh/Makefile
diff -r1.38 -r1.39 pkgsrc/emulators/simh/distinfo
cvs diff -r1.63 -r1.64 pkgsrc/emulators/simh/Makefile (switch to unified diff)

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

--- pkgsrc/emulators/simh/distinfo 2022/04/03 14:33:42 1.38
+++ pkgsrc/emulators/simh/distinfo 2022/05/08 12:09:51 1.39
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.38 2022/04/03 14:33:42 rhialto Exp $ 1$NetBSD: distinfo,v 1.39 2022/05/08 12:09:51 rhialto Exp $
2 2
3BLAKE2s (simh-4.0.0-b8015349e269b45880b7c0a199a07c12f1cf746f.tar.gz) = c783024ee94dd44d34e57192616ab930f7a42d122606c96b9a86013beb564197 3BLAKE2s (simh-4.0.0-e1ce9f4f70466c34e96d59a6f44e0eaa2cf46a3f.tar.gz) = f573a976e85c557c35f3627ca34610863200f9b4186b4bcb5a24de3796736bdf
4SHA512 (simh-4.0.0-b8015349e269b45880b7c0a199a07c12f1cf746f.tar.gz) = e5b397689cc68b7fcb188f1ace60d3c75c1f42e05445e4089504ecac47dd48672d7902edfa5cac3963b77b5f710bd7293aef11b3452db6a8c5bf0a7f7f0ae60b 4SHA512 (simh-4.0.0-e1ce9f4f70466c34e96d59a6f44e0eaa2cf46a3f.tar.gz) = e07b1f77f5147f04d4f0b8812994a391607717b0694a2d7bfcf43548e97edf9970acddc9eb03d5d46bc9a5e8d59fd7c98468bb00d559fd7a5e1ccbc293930192
5Size (simh-4.0.0-b8015349e269b45880b7c0a199a07c12f1cf746f.tar.gz) = 31256354 bytes 5Size (simh-4.0.0-e1ce9f4f70466c34e96d59a6f44e0eaa2cf46a3f.tar.gz) = 31256308 bytes
6SHA1 (patch-makefile) = a532dde8a12d359cd66a2447ed95812cc0dd5dbe 6SHA1 (patch-makefile) = a532dde8a12d359cd66a2447ed95812cc0dd5dbe