4 files changed, 235 insertions, 51 deletions

diff --git a/emulators/sim/Makefile b/emulators/sim/Makefile
index b29895b71b5c..97769ac27561 100644
--- a/emulators/sim/Makefile
+++ b/emulators/sim/Makefile
@@ -6,32 +6,38 @@
 #
 
 PORTNAME=	sim
-PORTVERSION=	2.3d
+PORTVERSION=	2.9
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://minnie.tuhs.org/pub/PDP-11/Sims/Supnik_2.3/sources/ \
+MASTER_SITES=	http://simh.trailing-edge.com/sources/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=jedgar
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTNAME=	${PORTNAME}hv29
 
 MAINTAINER=	jedgar@FreeBSD.org
 
+USE_ZIP=	yes
 RESTRICTED=	"Non-commercial use only"
-
+MAKEFILE=	${FILESDIR}/Makefile
 NO_WRKSUBDIR=	yes
 
+SHELL=${SH}
+
 post-configure:
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	@${MKDIR} ${WRKSRC}/BIN
+	@for i in `find . -name "*.[hc]"`; \
+	do \
+		${PERL} -pi -e 's@\r@@g' $$i ;\
+	done
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/i1401 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/nova ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/pdp1 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/pdp4 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/pdp7 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/pdp8 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/pdp9 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/pdp11 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/pdp15 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/nova ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/pdp1 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/pdp4 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/pdp7 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/pdp8 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/pdp9 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/pdp11 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/pdp15 ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/sim && ${INSTALL_DATA} ${WRKDIR}/simh_doc.txt \
 		${PREFIX}/share/doc/sim
diff --git a/emulators/sim/distinfo b/emulators/sim/distinfo
index bb8d5bd40c72..9c14056be034 100644
--- a/emulators/sim/distinfo
+++ b/emulators/sim/distinfo
@@ -1 +1 @@
-MD5 (sim_2.3d.tar.gz) = b7e81ea3bd4f368be3989f8aad8a13be
+MD5 (simhv29.zip) = dbdc1622a4b0c2279e0bdefd2ce56e2b
diff --git a/emulators/sim/files/Makefile b/emulators/sim/files/Makefile
index 0ed4d8d63ed9..9117ff2a7255 100644
--- a/emulators/sim/files/Makefile
+++ b/emulators/sim/files/Makefile
@@ -1,55 +1,234 @@
 # $FreeBSD$
 
-CONTROL_FILES=	scp.c scp_tty.c
+#
+# Common Libraries
+#
+BIN = BIN/
+SIM = scp.c scp_tty.c sim_sock.c sim_tmxr.c
 
-I1401_FILES=	i1401_cd.c i1401_cpu.c i1401_iq.c i1401_lp.c \
-		i1401_mt.c i1401_sys.c
+FLAGS+=${CFLAGS} -I. -lm
 
-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
+#
+# Emulator source files and compile time options
+#
+PDP1D = PDP1/
+PDP1 = ${PDP1D}pdp1_lp.c ${PDP1D}pdp1_cpu.c ${PDP1D}pdp1_stddev.c \
+	${PDP1D}pdp1_sys.c
+PDP1_OPT = -I ${PDP1D}
 
-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
+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
+NOVA_OPT = -I ${NOVAD}
 
-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
+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
+ECLIPSE_OPT = -I ${NOVAD} -DECLIPSE
 
-i1401:	$(I1401_FILES) i1401_defs.h
-	cc $(I1401_FILES) $(CONTROL_FILES) -o i1401
 
-nova:	$(NOVA_FILES) nova_defs.h
-	cc $(NOVA_FILES) $(CONTROL_FILES) -lm -o nova
 
-pdp1:	$(PDP1_FILES) pdp1_defs.h
-	cc $(PDP1_FILES) $(CONTROL_FILES) -o pdp1
+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
+PDP4_OPT = -DPDP4 -I ${PDP18BD}
+PDP7_OPT = -DPDP7 -I ${PDP18BD}
+PDP9_OPT = -DPDP9 -I ${PDP18BD}
+PDP15_OPT = -DPDP15 -I ${PDP18BD}
 
-pdp4:	$(PDP18B_FILES) pdp18b_defs.h
-	cc -DPDP4 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp4
 
-pdp7:	$(PDP18B_FILES) pdp18b_defs.h
-	cc -DPDP7 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp7
 
-pdp8:	$(PDP8_FILES) pdp8_defs.h
-	cc $(PDP8_FILES) $(CONTROL_FILES) -lm -o pdp8
+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
+PDP11_OPT = -I ${PDP11D}
 
-pdp9:	$(PDP18B_FILES) pdp18b_defs.h
-	cc -DPDP9 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp9
 
-pdp11:	$(PDP11_FILES) pdp11_defs.h
-	cc $(PDP11_FILES) $(CONTROL_FILES) -lm -o pdp11
 
-pdp15:	$(PDP18B_FILES) pdp18b_defs.h
-	cc -DPDP15 $(PDP18B_FILES) $(CONTROL_FILES) -lm -o pdp15
+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
+PDP10_OPT = -DUSE_INT64 -I ${PDP10D}
 
-clean:
-	rm -f *.o i1401 nova pdp1 pdp4 pdp7 pdp8 pdp9 pdp11 pdp15
 
-#.include <bsd.prog.mk>
+
+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
+PDP8_OPT = -I ${PDP8D}
+
+
+
+H316D = H316/
+H316 = ${H316D}h316_stddev.c ${H316D}h316_lp.c ${H316D}h316_cpu.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
+HP2100_OPT = -I ${HP2100D}
+
+
+
+ID4D = ID4/
+ID4 = ${ID4D}id4_fp.c ${ID4D}id4_cpu.c ${ID4D}id4_stddev.c ${ID4D}id4_sys.c
+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
+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
+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
+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
+S3_OPT = -I ${S3D}
+
+
+
+ALTAIRD = ALTAIR/
+ALTAIR = ${ALTAIRD}altair_sio.c ${ALTAIRD}altair_cpu.c ${ALTAIRD}altair_dsk.c \
+	${ALTAIRD}altair_sys.c
+ALTAIR_OPT = -I ${ALTAIRD}
+
+
+#
+# Build everything
+#
+all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 ${BIN}pdp8 ${BIN}pdp9 ${BIN}pdp15 \
+	${BIN}pdp11 ${BIN}pdp10 ${BIN}nova ${BIN}eclipse ${BIN}h316 \
+	${BIN}s3 ${BIN}altair
+
+
+
+#
+# Make sure subdirectory exists
+#
+#${BIN} : simh_doc.txt
+#	${MKDIR} ${BIN}
+#	${TOUCH} ${BIN}
+
+
+#
+# Individual builds
+#
+${BIN}pdp1 : ${PDP1} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP1} ${SIM} ${PDP1_OPT} -o $@
+
+
+
+${BIN}pdp4 : ${PDP18B} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@
+
+
+
+${BIN}pdp7 : ${PDP18B} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@
+
+
+
+${BIN}pdp8 : ${PDP8} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP8} ${SIM} ${PDP8_OPT} -o $@
+
+
+${BIN}pdp9 : ${PDP18B} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@
+
+
+
+${BIN}pdp15 : ${PDP18B} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@
+
+
+
+${BIN}pdp10 : ${PDP10} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP10} ${SIM} ${PDP10_OPT} -o $@
+
+
+
+${BIN}pdp11 : ${PDP11} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@
+
+
+${BIN}nova : ${NOVA} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${NOVA} ${SIM} ${NOVA_OPT} -o $@
+
+
+
+${BIN}eclipse : ${ECLIPSE} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@
+
+
+${BIN}h316 : ${H316} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${H316} ${SIM} ${H316_OPT} -o $@
+
+
+
+${BIN}hp2100 : ${HP2100} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${HP2100} ${SIM} ${HP2100_OPT} -o $@
+
+
+
+${BIN}id4 : ${ID4} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${ID4} ${SIM} ${ID4_OPT} -o $@
+
+
+
+${BIN}i1401 : ${I1401} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${I1401} ${SIM} ${I1401_OPT} -o $@
+
+
+
+${BIN}sds : ${SDS} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@
+
+
+
+${BIN}s3 : ${S3} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${S3} ${SIM} ${S3_OPT} -o $@
+
+
+${BIN}altair : ${ALTAIR} ${SIM} ${BIN}
+	${CC} ${FLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@
diff --git a/emulators/sim/pkg-plist b/emulators/sim/pkg-plist
index 452ec7aac8ea..d46b31cd506a 100644
--- a/emulators/sim/pkg-plist
+++ b/emulators/sim/pkg-plist
@@ -1,4 +1,3 @@
-bin/i1401
 bin/nova
 bin/pdp1
 bin/pdp4