emulators/open-simh: update to 2022-10-08

- Switch to editline for line editing; must be pkgsrc version because simh
  uses <editline/readline.h>. Also link it explicitly, so it doesn't
  randomly use readline any more if it happened to be available at runtime.
- Add 3b2-700.

3 files changed, 20 insertions, 15 deletions

diff --git a/emulators/open-simh/Makefile b/emulators/open-simh/Makefile
index 8ec63468329..c6bbf8f318a 100644
--- a/emulators/open-simh/Makefile
+++ b/emulators/open-simh/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2022/09/11 12:51:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/10/09 18:50:44 rhialto Exp $
 
 DISTNAME=	open-simh-4.0.0
-PKGNAME=	open-simh-4.0.0.20220814
-PKGREVISION=	1
+PKGNAME=	open-simh-4.0.0.20221008
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=open-simh/}
 GITHUB_PROJECT=	simh
-GITHUB_TAG=	d862d024ea5f6f0cc915e7347a199bfce2a5ea96
+GITHUB_TAG=	3a7ec4788f919757e85b74552d2d193149ff4442
 
 MAINTAINER=	rhialto@NetBSD.org
 HOMEPAGE=	http://simh.trailing-edge.com/
@@ -50,12 +49,14 @@ INSTALLATION_DIRS=	bin share/simh share/simh/TX-0 share/doc/simh
 MAKE_FILE=		makefile
 INCLUDES=		${PREFIX:Q}/include:\
 			${BUILDLINK_PREFIX.SDL2:Q}/include/SDL2:\
+			${BUILDLINK_PREFIX.editline:Q}/include:\
 			${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\
 			${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\
 			${BUILDLINK_PREFIX.png:Q}/include:\
 			/usr/include
 LIBRARIES=		${PREFIX:Q}/lib:\
 			${BUILDLINK_PREFIX.SDL2:Q}/lib${LIBABISUFFIX}:\
+			${BUILDLINK_PREFIX.editline:Q}/lib${LIBABISUFFIX}:\
 			${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
 			${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
 			${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\
@@ -73,15 +74,15 @@ post-extract:
 	${MKDIR} ${WRKSRC}/BIN
 
 do-install:
-	(cd ${WRKSRC}/BIN && for BIN in *; do				\
-		if [ -f $$BIN ] ; then					\
+	(cd ${WRKSRC}/BIN && for BIN in *; do \
+		if [ -f $$BIN ] ; then \
 		${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
-		fi ;							\
+		fi ; \
 	done)
 
 	${INSTALL_DATA} ${WRKSRC}/TX-0/*.bin ${DESTDIR}${PREFIX}/share/simh/TX-0
-	(cd ${WRKSRC} && for TXT in *.txt */*.txt; do			\
-		${INSTALL_DATA} "$$TXT" ${DESTDIR}${PREFIX}/share/doc/simh;		\
+	(cd ${WRKSRC} && for TXT in *.txt */*.txt; do \
+		${INSTALL_DATA} "$$TXT" ${DESTDIR}${PREFIX}/share/doc/simh; \
 	done)
 
 # Note: tests require shm (/var/shm is a tmpfs) for the uc15.
@@ -90,8 +91,11 @@ do-test:
 	cd ${WRKSRC} && ${TEST_MAKE_CMD} clean
 	cd ${WRKSRC} && ${TEST_MAKE_CMD} all
 
+USE_BUILTIN.editline=	no	# simh uses <editline/readline.h>
+
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/emulators/open-simh/PLIST b/emulators/open-simh/PLIST
index fb91947f1ac..f1c183b7431 100644
--- a/emulators/open-simh/PLIST
+++ b/emulators/open-simh/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2022/08/16 20:08:39 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/10/09 18:50:44 rhialto Exp $
 bin/simh-3b2
+bin/simh-3b2-400
+bin/simh-3b2-700
 bin/simh-altair
 bin/simh-altairz80
 bin/simh-b5500
@@ -95,7 +97,6 @@ share/doc/simh/i7094_bug_history.txt
 share/doc/simh/id_diag.txt
 share/doc/simh/input.txt
 share/doc/simh/m68k_parse.y.txt
-share/doc/simh/m68kasm.y.txt
 share/doc/simh/pdp10_bug_history.txt
 share/doc/simh/pdp18b_diag.txt
 share/doc/simh/pdp1_diag.txt
diff --git a/emulators/open-simh/distinfo b/emulators/open-simh/distinfo
index 182e7a3ea9e..bf5aa6a969d 100644
--- a/emulators/open-simh/distinfo
+++ b/emulators/open-simh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2022/08/16 20:08:39 rhialto Exp $
+$NetBSD: distinfo,v 1.3 2022/10/09 18:50:44 rhialto Exp $
 
-BLAKE2s (open-simh-4.0.0-d862d024ea5f6f0cc915e7347a199bfce2a5ea96.tar.gz) = 5c1570a207273701c96e20dd51f55edbd5ebf2f88aa1bdd8ece9810c4a541476
-SHA512 (open-simh-4.0.0-d862d024ea5f6f0cc915e7347a199bfce2a5ea96.tar.gz) = 85af5bb4617db409ea5b59c835ce09d468419e463ec4829898285bb25832aae864f35a0d559cbde2bd54b2d552d6d6188f8d90ea3f24cc5d6e0600c99d76ec38
-Size (open-simh-4.0.0-d862d024ea5f6f0cc915e7347a199bfce2a5ea96.tar.gz) = 31299825 bytes
+BLAKE2s (open-simh-4.0.0-3a7ec4788f919757e85b74552d2d193149ff4442.tar.gz) = bd38dc56668940b7a0d3bc063d7dd30aecafe90f17289ab791cbb67aa3bf68ec
+SHA512 (open-simh-4.0.0-3a7ec4788f919757e85b74552d2d193149ff4442.tar.gz) = 06f7fc9e938e8b4f2d6aa9443ee6b6e57be72ade526e9bdd86a985a3d444732eba8321caa982789d4906ace542248653a5b09a39c52078d8de0bd7afe037e039
+Size (open-simh-4.0.0-3a7ec4788f919757e85b74552d2d193149ff4442.tar.gz) = 31166851 bytes
 SHA1 (patch-makefile) = a532dde8a12d359cd66a2447ed95812cc0dd5dbe