Update to V2.9-11.

This includes several new emulators including one for the VAX, which runs
NetBSD/vax!

6 files changed, 61 insertions, 101 deletions

diff --git a/emulators/simh/DESCR b/emulators/simh/DESCR
index 5d8d35b36ae..f27f7a78c39 100644
--- a/emulators/simh/DESCR
+++ b/emulators/simh/DESCR
@@ -1,2 +1 @@
-This package includes Bob Supnik's PDP-8, PDP-11, PDP-1, other 18b PDP,
-Nova, and IBM 1401 simulators.
+Bob Supnik's historical computer simulator.
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index f351e24a03e..b2fe094a686 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,16 +1,33 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:22 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/20 23:58:14 soren Exp $
 #
 
-DISTNAME=	sim_2.3d
-PKGNAME=	simh-2.3d
+DISTNAME=	simhv29-11
+PKGNAME=	simh-2.9.11
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/
+MASTER_SITES=	http://simh.trailing-edge.com/sources/
+EXTRACT_SUFX=	.zip
+EXTRACT_CMD=	unzip -aq ${DOWNLOADED_DISTFILE}
 
 MAINTAINER=	packages@netbsd.org
-COMMENT=	PDP, IBM 1401, and Nova CPU simulator
+HOMEPAGE=	http://simh.trailing-edge.com/
+COMMENT=	Bob Supnik's historical computer simulator
 
 WRKSRC=		${WRKDIR}
 
-MAKEFILE=	${FILESDIR}/Makefile
+pre-build:
+	${MKDIR} ${WRKSRC}/BIN
+	-${MV} ${WRKSRC}/AltairZ80/altairz80_defs.h \
+		${WRKSRC}/AltairZ80/altairZ80_defs.h
+
+do-install:
+	(cd ${WRKSRC}/BIN && for BIN in *; do				\
+		${INSTALL_PROGRAM} $$BIN ${PREFIX}/bin/simh-$$BIN;	\
+	done)
+	${INSTALL_DATA_DIR} ${PREFIX}/share/simh
+	${INSTALL_DATA} ${WRKSRC}/VAX/ka655.bin ${PREFIX}/share/simh
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
+	(cd ${WRKSRC} && for TXT in *.txt */*.txt; do			\
+		${INSTALL_DATA} $$TXT ${PREFIX}/share/doc/simh;		\
+	done)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/simh/PLIST b/emulators/simh/PLIST
index b032b6e8915..03c44f46edf 100644
--- a/emulators/simh/PLIST
+++ b/emulators/simh/PLIST
@@ -1,12 +1,43 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:20 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/20 23:58:14 soren Exp $
+bin/simh-altair
+bin/simh-altairz80
+bin/simh-eclipse
+bin/simh-gri
+bin/simh-h316
+bin/simh-hp2100
 bin/simh-i1401
 bin/simh-nova
 bin/simh-pdp1
+bin/simh-pdp10
+bin/simh-pdp11
+bin/simh-pdp15
 bin/simh-pdp4
 bin/simh-pdp7
 bin/simh-pdp8
 bin/simh-pdp9
-bin/simh-pdp11
-bin/simh-pdp15
+bin/simh-s3
+bin/simh-vax
+share/simh/ka655.bin
+@dirrm share/simh
+share/doc/simh/0readme29.txt
+share/doc/simh/altair.txt
+share/doc/simh/altairZ80.txt
+share/doc/simh/eclipse.txt
+share/doc/simh/gri_doc.txt
+share/doc/simh/h316_doc.txt
+share/doc/simh/haltguide.txt
+share/doc/simh/hp2100_doc.txt
+share/doc/simh/i1401_doc.txt
+share/doc/simh/nova_doc.txt
+share/doc/simh/pdp10_doc.txt
+share/doc/simh/pdp11_doc.txt
+share/doc/simh/pdp18b_doc.txt
+share/doc/simh/pdp1_doc.txt
+share/doc/simh/pdp8_doc.txt
+share/doc/simh/readme1130.txt
+share/doc/simh/readme_s3.txt
 share/doc/simh/simh_doc.txt
+share/doc/simh/simh_swre.txt
+share/doc/simh/system3.txt
+share/doc/simh/vax_doc.txt
 @dirrm share/doc/simh
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index d23fa280c35..4ebb986a826 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 10:49:56 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/08/20 23:58:14 soren Exp $
 
-SHA1 (sim_2.3d.tar.gz) = 6529c150c6081f405001e09910fe4c3fb0bbc5c3
-Size (sim_2.3d.tar.gz) = 260457 bytes
-SHA1 (patch-aa) = ddee282f93ca959de4fb778856d6e64706e19c22
+SHA1 (simhv29-11.zip) = c09544b7a48825cda96ef47a432f81b712827bcc
+Size (simhv29-11.zip) = 1172434 bytes
diff --git a/emulators/simh/files/Makefile b/emulators/simh/files/Makefile
deleted file mode 100644
index eec5225aa87..00000000000
--- a/emulators/simh/files/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PRGS=i1401 nova pdp1 pdp4 pdp7 pdp8 pdp9 pdp11 pdp15
-
-all: ${PRGS}
-
-install:
-	@for file in ${PRGS}; do \
-		${BSD_INSTALL_PROGRAM} $$file ${PREFIX}/bin/simh-$$file; \
-	done
-	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
-	${BSD_INSTALL_DATA} simh_doc.txt ${PREFIX}/share/doc/simh/
-
-.SUFFIXES: .4o .7o .9o .15o
-.c.4o:
-	${COMPILE.c} -o $@ -DPDP4 $<
-.c.7o:
-	${COMPILE.c} -o $@ -DPDP7 $<
-.c.9o:
-	${COMPILE.c} -o $@ -DPDP9 $<
-.c.15o:
-	${COMPILE.c} -o $@ -DPDP15 $<
-
-SCP=scp.o scp_tty.o
-
-i1401: i1401_cd.o i1401_cpu.o i1401_iq.o i1401_lp.o i1401_mt.o i1401_sys.o \
-       ${SCP}
-	${LINK.c} -o $@ $>
-
-nova: nova_clk.o nova_cpu.o nova_dkp.o nova_dsk.o nova_lp.o nova_mta.o \
-      nova_pt.o nova_sys.o nova_tt.o ${SCP}
-	${LINK.c} -o $@ $> -lm
-
-pdp1: pdp1_cpu.o pdp1_lp.o pdp1_stddev.o pdp1_sys.o ${SCP}
-	${LINK.c} -o $@ $>
-
-pdp4: pdp18b_cpu.4o pdp18b_drm.4o pdp18b_lp.4o pdp18b_mt.4o pdp18b_rf.4o \
-      pdp18b_rp.4o pdp18b_stddev.4o pdp18b_sys.4o ${SCP}
-	${LINK.c} -o $@ $> -lm
-
-pdp7: pdp18b_cpu.7o pdp18b_drm.7o pdp18b_lp.7o pdp18b_mt.7o pdp18b_rf.7o \
-      pdp18b_rp.7o pdp18b_stddev.7o pdp18b_sys.7o ${SCP}
-	${LINK.c} -o $@ $> -lm
-
-pdp8: pdp8_clk.o pdp8_cpu.o pdp8_lp.o pdp8_mt.o pdp8_pt.o pdp8_rf.o \
-      pdp8_rk.o pdp8_rx.o pdp8_sys.o pdp8_tt.o ${SCP}
-	${LINK.c} -o $@ $> -lm
-
-pdp9: pdp18b_cpu.9o pdp18b_drm.9o pdp18b_lp.9o pdp18b_mt.9o pdp18b_rf.9o \
-      pdp18b_rp.9o pdp18b_stddev.9o pdp18b_sys.9o ${SCP}
-	${LINK.c} -o $@ $> -lm
-
-pdp11: pdp11_cis.o pdp11_cpu.o pdp11_fp.o pdp11_lp.o pdp11_rk.o pdp11_rl.o \
-       pdp11_rp.o pdp11_rx.o pdp11_stddev.o pdp11_sys.o pdp11_tm.o ${SCP}
-	${LINK.c} -o $@ $> -lm
-
-pdp15: pdp18b_cpu.15o pdp18b_drm.15o pdp18b_lp.15o pdp18b_mt.15o pdp18b_rf.15o \
-       pdp18b_rp.15o pdp18b_stddev.15o pdp18b_sys.15o ${SCP}
-	${LINK.c} -o $@ $> -lm
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
deleted file mode 100644
index 031d402c0dc..00000000000
--- a/emulators/simh/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/12 22:44:52 tv Exp $
-
---- scp.c.orig	Wed Aug 12 18:21:13 1998
-+++ scp.c	Wed Aug 12 18:24:25 1998
-@@ -240,6 +240,7 @@
- 
- do {	printf ("sim> ");				/* prompt */
- 	cptr = read_line (cbuf, CBUFSIZE, stdin);	/* read command line */
-+	if (cptr == NULL) break;			/* exit on eof */
- 	stat = SCPE_UNK;
- 	if (cptr == NULL) continue;			/* ignore EOF */
- 	if (*cptr == 0) continue;			/* ignore blank */
-@@ -254,6 +255,7 @@
- 
- detach_all (0);
- ttclose ();
-+puts("");
- return 0;
- }
- 
-@@ -879,7 +881,7 @@
- 		    (UNIT_ATT + UNIT_SEQ))
- 			fseek (uptr -> fileref, uptr -> pos, SEEK_SET);  }  }
- stop_cpu = 0;
--if ((int) signal (SIGINT, int_handler) == -1) {		/* set WRU */
-+if (signal (SIGINT, int_handler) == (void *)-1) {	/* set WRU */
- 	printf ("Simulator interrupt handler setup failed\n");
- 	return SCPE_OK;  }
- if (ttrunstate () != SCPE_OK) {				/* set console */