upgrade to 2.8.5

2002-02-04 05:10:29 +00:00 · 2002-02-04 05:10:29 +00:00 · 0707cb31c7
commit 0707cb31c7
parent c606856435
10 changed files with 422 additions and 103 deletions
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@ -1,30 +1,40 @@
-# $OpenBSD: Makefile,v 1.12 2001/03/29 10:05:39 form Exp $
+# $OpenBSD: Makefile,v 1.13 2002/02/04 05:10:29 form Exp $
 # $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $

-COMMENT=	"PDP, IBM 1401, and Nova CPU simulator"
+COMMENT=		"PDP, IBM 1401, Nova and other CPUs simulator"

-DISTNAME=	sim_2.3d
-PKGNAME=	simh-2.3d
-CATEGORIES=	emulators
-NEED_VERSION=	1.210
-MASTER_SITES=	ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/
+DISTNAME=		simh-2.8.5
+CATEGORIES=		emulators
+MASTER_SITES=		http://simh.trailing-edge.com/sources/
+DISTFILES=		simhv28.zip

-MAINTAINER=	Oleg Safiullin <form@openbsd.org>
+HOMEPAGE=		http://simh.trailing-edge.com/

-PERMIT_PACKAGE_CDROM=	No
+MAINTAINER=		Oleg Safiullin <form@openbsd.org>
+
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	No
+PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-WRKDIST=	${WRKDIR}
+WRKDIST=		${WRKDIR}

-MAKE_FILE=	${FILESDIR}/Makefile
+MAKE_FILE=		makefile
+
+SIMS=			altair eclipse h316 hp2100 i1401 nova pdp1 pdp10 \
+			pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 s3
+
+post-extract:
+	@cd ${WRKDIST} && \
+		find . -type f -exec \
+		sh -c 'tr -d \\015 < {} > {}.TMP && mv -f {}.TMP {}' \;

 do-install:
-.for f in i1401 nova pdp1 pdp4 pdp7 pdp8 pdp9 pdp11 pdp15
-	${INSTALL_PROGRAM} ${WRKDIR}/${f} ${PREFIX}/bin/simh-${f}
+.for f in ${SIMS}
+	${INSTALL_PROGRAM} ${WRKBUILD}/BIN/${f} ${PREFIX}/bin/simh-${f}
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
-	${INSTALL_DATA} ${WRKDIR}/simh_doc.txt ${PREFIX}/share/doc/simh
+	${INSTALL_DATA} ${WRKBUILD}/*.txt ${WRKBUILD}/*/*.txt \
+		${PREFIX}/share/doc/simh

 .include <bsd.port.mk>
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@ -0,0 +1,3 @@
+MD5 (simhv28.zip) = 0daefad4a78642b9fa1d9ea22bd2d5b9
+RMD160 (simhv28.zip) = c328b0214ae1e4437e08773618603f14291a39ad
+SHA1 (simhv28.zip) = 0b10da8c04f962e5ed88dca3722814f82ebf3ba2
--- a/emulators/simh/files/Makefile
+++ b/emulators/simh/files/Makefile
@ -1,56 +0,0 @@
-# $FreeBSD: ports/emulators/sim/files/Makefile,v 1.2 1999/12/22 22:14:11 jedgar Exp $
-# $OpenBSD: Makefile,v 1.2 2000/01/26 13:52:39 form Exp $
-
-CONTROL_FILES=	scp.c scp_tty.c
-
-I1401_FILES=	i1401_cd.c i1401_cpu.c i1401_iq.c i1401_lp.c \
-		i1401_mt.c i1401_sys.c
-
-NOVA_FILES=	nova_clk.c nova_cpu.c nova_dkp.c nova_dsk.c \
-		nova_lp.c nova_mta.c nova_pt.c nova_sys.c nova_tt.c
-
-PDP11_FILES=	pdp11_cpu.c pdp11_fp.c pdp11_lp.c pdp11_rk.c pdp11_rl.c \
-		pdp11_rp.c pdp11_rx.c pdp11_stddev.c pdp11_sys.c pdp11_tm.c \
-		pdp11_cis.c
-
-PDP18B_FILES=	pdp18b_cpu.c pdp18b_drm.c pdp18b_lp.c pdp18b_mt.c \
-		pdp18b_rf.c pdp18b_rp.c pdp18b_stddev.c pdp18b_sys.c
-
-PDP1_FILES=	pdp1_cpu.c pdp1_lp.c pdp1_stddev.c pdp1_sys.c
-
-PDP8_FILES=	pdp8_clk.c pdp8_cpu.c pdp8_lp.c pdp8_mt.c pdp8_pt.c \
-		pdp8_rf.c pdp8_rk.c pdp8_rx.c pdp8_sys.c pdp8_tt.c
-
-all:	i1401 nova pdp1 pdp4 pdp7 pdp8 pdp9 pdp11 pdp15
-
-i1401:	$(I1401_FILES) i1401_defs.h
-	$(CC) $(CFLAGS) $(I1401_FILES) $(CONTROL_FILES) -o i1401
-
-nova:	$(NOVA_FILES) nova_defs.h
-	$(CC) $(CFLAGS) $(NOVA_FILES) $(CONTROL_FILES) -lm -o nova
-
-pdp1:	$(PDP1_FILES) pdp1_defs.h
-	$(CC) $(CFLAGS) $(PDP1_FILES) $(CONTROL_FILES) -o pdp1
-
-pdp4:	$(PDP18B_FILES) pdp18b_defs.h
-	$(CC) $(CFLAGS) -DPDP4 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp4
-
-pdp7:	$(PDP18B_FILES) pdp18b_defs.h
-	$(CC) $(CFLAGS) -DPDP7 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp7
-
-pdp8:	$(PDP8_FILES) pdp8_defs.h
-	$(CC) $(CFLAGS) $(PDP8_FILES) $(CONTROL_FILES) -lm -o pdp8
-
-pdp9:	$(PDP18B_FILES) pdp18b_defs.h
-	$(CC) $(CFLAGS) -DPDP9 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp9
-
-pdp11:	$(PDP11_FILES) pdp11_defs.h
-	$(CC) $(CFLAGS) $(PDP11_FILES) $(CONTROL_FILES) -lm -o pdp11
-
-pdp15:	$(PDP18B_FILES) pdp18b_defs.h
-	$(CC) $(CFLAGS) -DPDP15 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp15
-
-clean:
-	rm -f *.o i1401 nova pdp1 pdp4 pdp7 pdp8 pdp9 pdp11 pdp15
-
-#.include <bsd.prog.mk>
--- a/emulators/simh/files/md5
+++ b/emulators/simh/files/md5
@ -1,3 +0,0 @@
-MD5 (sim_2.3d.tar.gz) = b7e81ea3bd4f368be3989f8aad8a13be
-RMD160 (sim_2.3d.tar.gz) = f0c720cd26772242d3801af8c20c1f41640aad2e
-SHA1 (sim_2.3d.tar.gz) = 6529c150c6081f405001e09910fe4c3fb0bbc5c3
--- a/emulators/simh/patches/patch-NOVA_nova_cpu_c
+++ b/emulators/simh/patches/patch-NOVA_nova_cpu_c
@ -0,0 +1,43 @@
+$OpenBSD: patch-NOVA_nova_cpu_c,v 1.1 2002/02/04 05:10:29 form Exp $
+--- NOVA/nova_cpu.c.orig	Thu Jan 31 22:29:11 2002
+++ NOVA/nova_cpu.c	Thu Jan 31 22:28:48 2002
+@@ -432,21 +432,21 @@ if (IR & I_OPR) {					/* operate? */
+ 		src = src ^ DMASK;
+ 		break;
+ 	case 1:						/* NEG */
+-		src = ((src ^ DMASK) + 1) & CMASK;
+		src = ((src ^ DMASK) + 1) & NOVA_CMASK;
+ 		break;
+ 	case 2:						/* MOV */
+ 		break;
+ 	case 3:						/* INC */
+-		src = (src + 1) & CMASK;
+		src = (src + 1) & NOVA_CMASK;
+ 		break;
+ 	case 4:						/* ADC */
+-		src = ((src ^ DMASK) + AC[dstAC]) & CMASK;
+		src = ((src ^ DMASK) + AC[dstAC]) & NOVA_CMASK;
+ 		break;
+ 	case 5:						/* SUB */
+-		src = ((src ^ DMASK) + AC[dstAC] + 1) & CMASK;
+		src = ((src ^ DMASK) + AC[dstAC] + 1) & NOVA_CMASK;
+ 		break;
+ 	case 6:						/* ADD */
+-		src = (src + AC[dstAC]) & CMASK;
+		src = (src + AC[dstAC]) & NOVA_CMASK;
+ 		break;
+ 	case 7:						/* AND */
+ 		src = src & (AC[dstAC] | CBIT);
+@@ -458,10 +458,10 @@ if (IR & I_OPR) {					/* operate? */
+ 	case 0:						/* nop */
+ 		break;
+ 	case 1:						/* L */
+-		src = ((src << 1) | (src >> 16)) & CMASK;
+		src = ((src << 1) | (src >> 16)) & NOVA_CMASK;
+ 		break;
+ 	case 2:						/* R */
+-		src = ((src >> 1) | (src << 16)) & CMASK;
+		src = ((src >> 1) | (src << 16)) & NOVA_CMASK;
+ 		break;
+ 	case 3:						/* S */
+ 		src = ((src & 0377) << 8) | ((src >> 8) & 0377) |
--- a/emulators/simh/patches/patch-NOVA_nova_defs_h
+++ b/emulators/simh/patches/patch-NOVA_nova_defs_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-NOVA_nova_defs_h,v 1.1 2002/02/04 05:10:29 form Exp $
+--- NOVA/nova_defs.h.orig	Thu Jan 31 22:27:45 2002
+++ NOVA/nova_defs.h	Thu Jan 31 22:28:05 2002
+@@ -66,7 +66,7 @@
+ #define SIGN		0100000				/* sign */
+ #define DMASK		0177777				/* data mask */
+ #define CBIT		(DMASK + 1)			/* carry bit */
+-#define CMASK		(CBIT | DMASK)			/* carry + data */
+#define NOVA_CMASK	(CBIT | DMASK)			/* carry + data */
+ 
+ /* Reserved memory locations */
+ 
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@ -1,26 +0,0 @@
-# $NetBSD: patch-aa,v 1.2 1998/08/12 22:44:52 tv Exp $
-# $OpenBSD: patch-aa,v 1.2 2000/01/26 13:52:40 form Exp $
-
--- scp.c.orig	Fri Sep  4 02:10:14 1998
-+++ scp.c	Wed Jan 26 19:44:10 2000
-@@ -248,7 +248,10 @@
- do {	printf ("sim> ");				/* prompt */
- 	cptr = read_line (cbuf, CBUFSIZE, stdin);	/* read command line */
- 	stat = SCPE_UNK;
-	if (cptr == NULL) continue;			/* ignore EOF */
-+	if (cptr == NULL) {				/* ignore EOF */
-+		puts("");
-+		continue;
-+	}
- 	if (*cptr == 0) continue;			/* ignore blank */
- 	cptr = get_glyph (cptr, gbuf, 0);		/* get command glyph */
- 	for (i = 0; cmd_table[i].name != NULL; i++) {
-@@ -903,7 +906,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 */
--- a/emulators/simh/patches/patch-makefile
+++ b/emulators/simh/patches/patch-makefile
@ -0,0 +1,294 @@
+$OpenBSD: patch-makefile,v 1.1 2002/02/04 05:10:29 form Exp $
+--- makefile.orig	Wed Jan 30 22:45:25 2002
+++ makefile	Wed Jan 30 22:45:43 2002
+@@ -1,8 +1,9 @@
+ # CC Command
+ #
+-CC = gcc -O2 -lm -I .
+#CC = gcc -O2 -lm -I .
+ #CC = gcc -O0 -g -lm -I .
+-
+CC ?= cc
+CFLAGS += -I. -lm
+ 
+ 
+ #
+@@ -18,32 +19,32 @@ SIM = scp.c scp_tty.c sim_sock.c sim_tmx
+ #
+ PDP1D = PDP1/
+ PDP1 = ${PDP1D}pdp1_lp.c ${PDP1D}pdp1_cpu.c ${PDP1D}pdp1_stddev.c \
+-        ${PDP1D}pdp1_sys.c
+	${PDP1D}pdp1_sys.c
+ PDP1_OPT = -I ${PDP1D}
+ 
+ 
+ NOVAD = NOVA/
+ NOVA = ${NOVAD}nova_sys.c ${NOVAD}nova_cpu.c ${NOVAD}nova_dkp.c \
+-        ${NOVAD}nova_dsk.c ${NOVAD}nova_lp.c ${NOVAD}nova_mta.c \
+-        ${NOVAD}nova_plt.c ${NOVAD}nova_pt.c ${NOVAD}nova_clk.c \
+-        ${NOVAD}nova_tt.c ${NOVAD}nova_tt1.c
+	${NOVAD}nova_dsk.c ${NOVAD}nova_lp.c ${NOVAD}nova_mta.c \
+	${NOVAD}nova_plt.c ${NOVAD}nova_pt.c ${NOVAD}nova_clk.c \
+	${NOVAD}nova_tt.c ${NOVAD}nova_tt1.c
+ NOVA_OPT = -I ${NOVAD}
+ 
+ 
+ 
+ ECLIPSE = ${NOVAD}eclipse_cpu.c ${NOVAD}eclipse_tt.c ${NOVAD}nova_sys.c \
+-        ${NOVAD}nova_dkp.c ${NOVAD}nova_dsk.c ${NOVAD}nova_lp.c \
+-        ${NOVAD}nova_mta.c ${NOVAD}nova_plt.c ${NOVAD}nova_pt.c \
+-        ${NOVAD}nova_clk.c ${NOVAD}nova_tt1.c
+	${NOVAD}nova_dkp.c ${NOVAD}nova_dsk.c ${NOVAD}nova_lp.c \
+	${NOVAD}nova_mta.c ${NOVAD}nova_plt.c ${NOVAD}nova_pt.c \
+	${NOVAD}nova_clk.c ${NOVAD}nova_tt1.c
+ ECLIPSE_OPT = -I ${NOVAD} -DECLIPSE
+ 
+ 
+ 
+ PDP18BD = PDP18B/
+ PDP18B = ${PDP18BD}pdp18b_dt.c ${PDP18BD}pdp18b_drm.c ${PDP18BD}pdp18b_cpu.c \
+-        ${PDP18BD}pdp18b_lp.c ${PDP18BD}pdp18b_mt.c ${PDP18BD}pdp18b_rf.c \
+-        ${PDP18BD}pdp18b_rp.c ${PDP18BD}pdp18b_stddev.c ${PDP18BD}pdp18b_sys.c \
+-        ${PDP18BD}pdp18b_tt1.c
+	${PDP18BD}pdp18b_lp.c ${PDP18BD}pdp18b_mt.c ${PDP18BD}pdp18b_rf.c \
+	${PDP18BD}pdp18b_rp.c ${PDP18BD}pdp18b_stddev.c ${PDP18BD}pdp18b_sys.c \
+	${PDP18BD}pdp18b_tt1.c
+ PDP4_OPT = -DPDP4 -I ${PDP18BD}
+ PDP7_OPT = -DPDP7 -I ${PDP18BD}
+ PDP9_OPT = -DPDP9 -I ${PDP18BD}
+@@ -53,45 +54,45 @@ PDP15_OPT = -DPDP15 -I ${PDP18BD}
+ 
+ PDP11D = PDP11/
+ PDP11 = ${PDP11D}pdp11_fp.c ${PDP11D}pdp11_cpu.c ${PDP11D}pdp11_dz.c \
+-        ${PDP11D}pdp11_cis.c ${PDP11D}pdp11_lp.c ${PDP11D}pdp11_rk.c \
+-        ${PDP11D}pdp11_rl.c ${PDP11D}pdp11_rp.c ${PDP11D}pdp11_rx.c \
+-        ${PDP11D}pdp11_stddev.c ${PDP11D}pdp11_sys.c ${PDP11D}pdp11_tc.c \
+-        ${PDP11D}pdp11_tm.c ${PDP11D}pdp11_ts.c ${PDP11D}pdp11_io.c \
+-        ${PDP11D}pdp11_rq.c
+	${PDP11D}pdp11_cis.c ${PDP11D}pdp11_lp.c ${PDP11D}pdp11_rk.c \
+	${PDP11D}pdp11_rl.c ${PDP11D}pdp11_rp.c ${PDP11D}pdp11_rx.c \
+	${PDP11D}pdp11_stddev.c ${PDP11D}pdp11_sys.c ${PDP11D}pdp11_tc.c \
+	${PDP11D}pdp11_tm.c ${PDP11D}pdp11_ts.c ${PDP11D}pdp11_io.c \
+	${PDP11D}pdp11_rq.c
+ PDP11_OPT = -I ${PDP11D}
+ 
+ 
+ 
+ PDP10D = PDP10/
+ PDP10 = ${PDP10D}pdp10_fe.c ${PDP10D}pdp10_dz.c ${PDP10D}pdp10_cpu.c \
+-        ${PDP10D}pdp10_ksio.c ${PDP10D}pdp10_lp20.c ${PDP10D}pdp10_mdfp.c \
+-        ${PDP10D}pdp10_pag.c ${PDP10D}pdp10_pt.c ${PDP10D}pdp10_rp.c \
+-        ${PDP10D}pdp10_sys.c ${PDP10D}pdp10_tim.c ${PDP10D}pdp10_tu.c \
+-        ${PDP10D}pdp10_xtnd.c
+	${PDP10D}pdp10_ksio.c ${PDP10D}pdp10_lp20.c ${PDP10D}pdp10_mdfp.c \
+	${PDP10D}pdp10_pag.c ${PDP10D}pdp10_pt.c ${PDP10D}pdp10_rp.c \
+	${PDP10D}pdp10_sys.c ${PDP10D}pdp10_tim.c ${PDP10D}pdp10_tu.c \
+	${PDP10D}pdp10_xtnd.c
+ PDP10_OPT = -DUSE_INT64 -I ${PDP10D}
+ 
+ 
+ 
+ PDP8D = PDP8/
+ PDP8 = ${PDP8D}pdp8_cpu.c ${PDP8D}pdp8_clk.c ${PDP8D}pdp8_df.c \
+-        ${PDP8D}pdp8_dt.c ${PDP8D}pdp8_lp.c ${PDP8D}pdp8_mt.c \
+-        ${PDP8D}pdp8_pt.c ${PDP8D}pdp8_rf.c ${PDP8D}pdp8_rk.c \
+-        ${PDP8D}pdp8_rx.c ${PDP8D}pdp8_sys.c ${PDP8D}pdp8_tt.c \
+-        ${PDP8D}pdp8_ttx.c ${PDP8D}pdp8_rl.c
+	${PDP8D}pdp8_dt.c ${PDP8D}pdp8_lp.c ${PDP8D}pdp8_mt.c \
+	${PDP8D}pdp8_pt.c ${PDP8D}pdp8_rf.c ${PDP8D}pdp8_rk.c \
+	${PDP8D}pdp8_rx.c ${PDP8D}pdp8_sys.c ${PDP8D}pdp8_tt.c \
+	${PDP8D}pdp8_ttx.c ${PDP8D}pdp8_rl.c
+ PDP8_OPT = -I ${PDP8D}
+ 
+ 
+ 
+ H316D = H316/
+ H316 = ${H316D}h316_stddev.c ${H316D}h316_lp.c ${H316D}h316_cpu.c \
+-        ${H316D}h316_sys.c
+	${H316D}h316_sys.c
+ H316_OPT = -I ${H316D}
+ 
+ 
+ 
+ HP2100D = HP2100/
+ HP2100 = ${HP2100D}hp2100_stddev.c ${HP2100D}hp2100_dp.c ${HP2100D}hp2100_lp.c \
+-        ${HP2100D}hp2100_mt.c ${HP2100D}hp2100_cpu.c ${HP2100D}hp2100_sys.c
+	${HP2100D}hp2100_mt.c ${HP2100D}hp2100_cpu.c ${HP2100D}hp2100_sys.c
+ HP2100_OPT = -I ${HP2100D}
+ 
+ 
+@@ -104,38 +105,38 @@ ID4_OPT = -I ${ID4D}
+ 
+ I1401D = I1401/
+ I1401 = ${I1401D}i1401_lp.c ${I1401D}i1401_cpu.c ${I1401D}i1401_iq.c \
+-        ${I1401D}i1401_cd.c ${I1401D}i1401_mt.c ${I1401D}i1401_sys.c
+	${I1401D}i1401_cd.c ${I1401D}i1401_mt.c ${I1401D}i1401_sys.c
+ I1401_OPT = -I ${I1401D}
+ 
+ 
+ 
+ VAXD = VAX/
+ VAX = ${VAXD}vax_cpu1.c ${VAXD}vax_cpu.c ${VAXD}vax_fpa.c ${VAXD}vax_io.c \
+-        ${VAXD}vax_mmu.c ${VAXD}vax_stddev.c ${VAXD}vax_sys.c \
+-        ${VAXD}vax_sysdev.c \
+-        ${PDP11D}pdp11_rl.c ${PDP11D}pdp11_rq.c ${PDP11D}pdp11_ts.c \
+-        ${PDP11D}pdp11_dz.c ${PDP11D}pdp11_lp.c
+	${VAXD}vax_mmu.c ${VAXD}vax_stddev.c ${VAXD}vax_sys.c \
+	${VAXD}vax_sysdev.c \
+	${PDP11D}pdp11_rl.c ${PDP11D}pdp11_rq.c ${PDP11D}pdp11_ts.c \
+	${PDP11D}pdp11_dz.c ${PDP11D}pdp11_lp.c
+ VAX_OPT = -I ${VAXD} -I ${PDP11D} -DUSE_INT64
+ 
+ 
+ 
+ SDSD = SDS/
+ SDS = ${SDSD}sds_stddev.c ${SDSD}sds_fhd.c ${SDSD}sds_io.c ${SDSD}sds_lp.c \
+-        ${SDSD}sds_mt.c ${SDSD}sds_rad.c ${SDSD}sds_cpu.c ${SDSD}sds_sys.c
+	${SDSD}sds_mt.c ${SDSD}sds_rad.c ${SDSD}sds_cpu.c ${SDSD}sds_sys.c
+ SDS_OPT = -I ${SDSD}
+ 
+ 
+ 
+ S3D = S3/
+ S3 = ${S3D}s3_cd.c ${S3D}s3_cpu.c ${S3D}s3_disk.c ${S3D}s3_lp.c \
+-        ${S3D}s3_pkb.c ${S3D}s3_sys.c
+	${S3D}s3_pkb.c ${S3D}s3_sys.c
+ S3_OPT = -I ${S3D}
+ 
+ 
+ 
+ ALTAIRD = ALTAIR/
+ ALTAIR = ${ALTAIRD}altair_sio.c ${ALTAIRD}altair_cpu.c ${ALTAIRD}altair_dsk.c \
+-        ${ALTAIRD}altair_sys.c
+	${ALTAIRD}altair_sys.c
+ ALTAIR_OPT = -I ${ALTAIRD}
+ 
+ 
+@@ -143,8 +144,8 @@ ALTAIR_OPT = -I ${ALTAIRD}
+ # Build everything
+ #
+ all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 ${BIN}pdp8 ${BIN}pdp9 ${BIN}pdp15 \
+-        ${BIN}pdp11 ${BIN}pdp10 ${BIN}vax ${BIN}nova ${BIN}eclipse ${BIN}h316 \
+-        ${BIN}hp2100 ${BIN}id4 ${BIN}i1401 ${BIN}sds ${BIN}s3 ${BIN}altair
+	${BIN}pdp11 ${BIN}pdp10 ${BIN}nova ${BIN}eclipse ${BIN}h316 \
+	${BIN}hp2100 ${BIN}i1401 ${BIN}s3 ${BIN}altair
+ 
+ 
+ 
+@@ -152,96 +153,96 @@ all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 $
+ # Make sure subdirectory exists
+ #
+ ${BIN} : simh_doc.txt
+-        -mkdir ${BIN}
+-        -touch ${BIN}
+#	-mkdir ${BIN}
+#	-touch ${BIN}
+ 
+ 
+ #
+ # Individual builds
+ #
+ ${BIN}pdp1 : ${PDP1} ${SIM} ${BIN}
+-        ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP1} ${SIM} ${PDP1_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp4 : ${PDP18B} ${SIM} ${BIN}
+-        ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp7 : ${PDP18B} ${SIM} ${BIN}
+-        ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp8 : ${PDP8} ${SIM} ${BIN}
+-        ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP8} ${SIM} ${PDP8_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp9 : ${PDP18B} ${SIM} ${BIN}
+-        ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp15 : ${PDP18B} ${SIM} ${BIN}
+-        ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp10 : ${PDP10} ${SIM} ${BIN}
+-        ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP10} ${SIM} ${PDP10_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp11 : ${PDP11} ${SIM} ${BIN}
+-        ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@
+	${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}vax : ${VAX} ${SIM} ${BIN}
+-        ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@
+	${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}nova : ${NOVA} ${SIM} ${BIN}
+-        ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@
+	${CC} ${CFLAGS} ${NOVA} ${SIM} ${NOVA_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}eclipse : ${ECLIPSE} ${SIM} ${BIN}
+-        ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@
+	${CC} ${CFLAGS} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}h316 : ${H316} ${SIM} ${BIN}
+-        ${CC} ${H316} ${SIM} ${H316_OPT} -o $@
+	${CC} ${CFLAGS} ${H316} ${SIM} ${H316_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}hp2100 : ${HP2100} ${SIM} ${BIN}
+-        ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@
+	${CC} ${CFLAGS} ${HP2100} ${SIM} ${HP2100_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}id4 : ${ID4} ${SIM} ${BIN}
+-        ${CC} ${ID4} ${SIM} ${ID4_OPT} -o $@
+	${CC} ${CFLAGS} ${ID4} ${SIM} ${ID4_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}i1401 : ${I1401} ${SIM} ${BIN}
+-        ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@
+	${CC} ${CFLAGS} ${I1401} ${SIM} ${I1401_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}sds : ${SDS} ${SIM} ${BIN}
+-        ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@
+	${CC} ${CFLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}s3 : ${S3} ${SIM} ${BIN}
+-        ${CC} ${S3} ${SIM} ${S3_OPT} -o $@
+	${CC} ${CFLAGS} ${S3} ${SIM} ${S3_OPT} -o $@
+ 
+ 
+ ${BIN}altair : ${ALTAIR} ${SIM} ${BIN}
+-        ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@
+	${CC} ${CFLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@
--- a/emulators/simh/pkg/DESCR
+++ b/emulators/simh/pkg/DESCR
@ -1,2 +1,21 @@
-This package includes Bob Supnik's PDP-8, PDP-11, PDP-1, other 18b PDP,
-Nova, and IBM 1401 simulators.
+This package includes Computer History Simulation Project's simulators.
+
+The Computer History Simulation Project is a loose Internet-based
+collective of people interested in restoring historically significant
+computer hardware and software systems by simulation.
+The goal of the project is to create highly portable system simulators
+and to publish them as freeware on the Internet, with freely available
+copies of significant or representative software. 
+
+Simulators included in this package:
+	- Data Central Nova
+	- Data Central Eclipse
+	- Digital Equipment Corporation PDP-1, PDP-4, PDP-8, PDP-9, PDP-10,
+	  PDP-11, PDP-15
+	- IBM 1401
+	- IBM System 3
+	- Hewlett Packard HP 2100
+	- Honeywell H316
+	- MITS Altair 8800
+
+WWW: ${HOMEPAGE}
--- a/emulators/simh/pkg/PLIST
+++ b/emulators/simh/pkg/PLIST
@ -1,12 +1,35 @@
-@comment $OpenBSD: PLIST,v 1.3 2000/06/15 05:23:49 form Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/02/04 05:10:29 form Exp $
+bin/simh-altair
+bin/simh-eclipse
+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-s3
+share/doc/simh/0readme28.txt
+share/doc/simh/altair.txt
+share/doc/simh/altairZ80.txt
+share/doc/simh/eclipse.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/readme_s3.txt
 share/doc/simh/simh_doc.txt
+share/doc/simh/simh_swre.txt
+share/doc/simh/system3.txt
@dirrm share/doc/simh