Update port to 2.10.

PR:		45828
Submitted by:	Miguel Mendez <flynn@energyhq.homeip.net>

6 files changed, 235 insertions, 251 deletions

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 1c6ba2380264..7914bab93fff 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -6,39 +6,52 @@
 #
 
 PORTNAME=	sim
-PORTVERSION=	2.9.11
+PORTVERSION=	2.10.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=jedgar
-DISTNAME=	${PORTNAME}hv29-11
+DISTNAME=	${PORTNAME}hv210-1
 
 MAINTAINER=	jedgar@FreeBSD.org
 
 USE_ZIP=	yes
+USE_GMAKE=	yes
 RESTRICTED=	"Non-commercial use only"
-MAKEFILE=	${FILESDIR}/Makefile
+MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
 SHELL=${SH}
 
-BIN_FILES=	altair eclipse h316 nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 \
-		pdp9 s3
+BIN_FILES=	altair h316 ibm1130 pdp11 pdp8 \
+		altairz80 hp2100 nova pdp15 pdp9 \
+		eclipse i1401 pdp1 pdp4 s3 \
+		gri i1620 pdp10 pdp7 vax \
 
 pre-patch:
 	@${MKDIR} ${WRKSRC}/BIN
-	@for i in `find ${WRKSRC} -name "*.[hc]"`; do \
-		cat $$i | ${TR} -d '\r' > $$i.new; \
-		mv $$i.new $$i; \
+	@for i in ${WRKSRC}/makefile `find ${WRKSRC} -name "*.[hc]"`; do \
+		${CAT} $$i | ${TR} -d '\r' > $$i.new; \
+		${MV} $$i.new $$i; \
 	done
 
 do-install:
 .for file in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${WRKDIR}/BIN/${file} ${PREFIX}/bin
 .endfor
+
+	@${MKDIR} ${PREFIX}/share/sim
+	${INSTALL_DATA} ${WRKDIR}/VAX/ka655.bin ${PREFIX}/share/sim
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/sim
-	@${INSTALL_DATA} ${WRKDIR}/simh_doc.txt ${PREFIX}/share/doc/sim
+	@for i in 0readme_210.txt 0readme_ethernet.txt \
+			simh_doc.txt simh_swre.txt; do \
+	${INSTALL_DATA} ${WRKDIR}/$$i ${PREFIX}/share/doc/sim; \
+	done
 .endif
 
+post-install:
+	@${CAT} pkg-message
+
 .include <bsd.port.mk>
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index c6874c65e3ab..b3a0773037c2 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1 +1 @@
-MD5 (simhv29-11.zip) = d73330f39f1b46ff37b15f2e02c2e87f
+MD5 (simhv210-1.zip) = 10abbd6066dd0790cf58ec8bf9d049af
diff --git a/emulators/simh/files/Makefile b/emulators/simh/files/Makefile
deleted file mode 100644
index 9117ff2a7255..000000000000
--- a/emulators/simh/files/Makefile
+++ /dev/null
@@ -1,234 +0,0 @@
-# $FreeBSD$
-
-#
-# Common Libraries
-#
-BIN = BIN/
-SIM = scp.c scp_tty.c sim_sock.c sim_tmxr.c
-
-FLAGS+=${CFLAGS} -I. -lm
-
-#
-# 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}
-
-
-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}
-
-
-
-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
-
-
-
-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}
-
-
-
-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}
-
-
-
-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}
-
-
-
-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/simh/files/patch-makefile b/emulators/simh/files/patch-makefile
new file mode 100644
index 000000000000..36424efa9f34
--- /dev/null
+++ b/emulators/simh/files/patch-makefile
@@ -0,0 +1,188 @@
+--- makefile.orig	Tue Nov 12 20:30:36 2002
++++ makefile	Thu Nov 28 21:12:59 2002
+@@ -3,7 +3,7 @@
+ # Note: -O2 is sometimes broken in GCC when setjump/longjump is being
+ # used. Try -O2 only with released simulators.
+ #
+-CC = gcc -O2 -lm -I .
++CFLAGS+= -lm -I .
+ #CC = gcc -O2 -g -lm -I .
+ 
+ 
+@@ -138,25 +138,6 @@
+ IBM1130_OPT = -I ${IBM1130D}
+ 
+ 
+-
+-ID16D = Interdata/
+-ID16 = ${ID16D}id16_cpu.c ${ID16D}id16_sys.c ${ID16D}id_dp.c \
+-	${ID16D}id_fd.c ${ID16D}id_fp.c ${ID16D}id_idc.c ${ID16D}id_io.c \
+-	${ID16D}id_lp.c ${ID16D}id_mt.c ${ID16D}id_pas.c ${ID16D}id_pt.c \
+-	${ID16D}id_tt.c ${ID16D}id_uvc.c
+-ID16_OPT = -I ${ID16D}
+-
+-
+-
+-ID32D = Interdata/
+-ID32 = ${ID32D}id32_cpu.c ${ID32D}id32_sys.c ${ID32D}id_dp.c \
+-	${ID32D}id_fd.c ${ID32D}id_fp.c ${ID32D}id_idc.c ${ID32D}id_io.c \
+-	${ID32D}id_lp.c ${ID32D}id_mt.c ${ID32D}id_pas.c ${ID32D}id_pt.c \
+-	${ID32D}id_tt.c ${ID32D}id_uvc.c
+-ID32_OPT = -I ${ID32D}
+-
+-
+-
+ 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
+@@ -185,13 +166,6 @@
+ 
+ 
+ 
+-SDSD = SDS/
+-SDS = ${SDSD}sds_cpu.c ${SDSD}sds_drm.c ${SDSD}sds_dsk.c ${SDSD}sds_io.c \
+-	${SDSD}sds_lp.c ${SDSD}sds_mt.c ${SDSD}sds_mux.c ${SDSD}sds_rad.c \
+-	${SDSD}sds_stddev.c ${SDSD}sds_sys.c
+-SDS_OPT = -I ${SDSD}
+-
+-
+ 
+ #
+ # Build everything
+@@ -199,8 +173,7 @@
+ 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}i1401 ${BIN}i1620 ${BIN}s3 ${BIN}altair \
+-	${BIN}altairz80 ${BIN}gri ${BIN}i1620 ${BIN}ibm1130 \
+-	${BIN}id16 ${BIN}id32 ${BIN}sds
++	${BIN}altairz80 ${BIN}gri ${BIN}i1620 ${BIN}ibm1130
+ 
+ 
+ 
+@@ -208,106 +181,98 @@
+ # Individual builds
+ #
+ ${BIN}pdp1 : ${PDP1} ${SIM}
+-	${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP1} ${SIM} ${PDP1_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp4 : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp7 : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp8 : ${PDP8} ${SIM}
+-	${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP8} ${SIM} ${PDP8_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp9 : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp15 : ${PDP18B} ${SIM}
+-	${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp10 : ${PDP10} ${SIM}
+-	${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP10} ${SIM} ${PDP10_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}pdp11 : ${PDP11} ${SIM}
+-	${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@
++	${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}vax : ${VAX} ${SIM}
+-	${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@
++	${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}nova : ${NOVA} ${SIM}
+-	${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@
++	${CC} ${CFLAGS} ${NOVA} ${SIM} ${NOVA_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}eclipse : ${ECLIPSE} ${SIM}
+-	${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@
++	${CC} ${CFLAGS} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}h316 : ${H316} ${SIM}
+-	${CC} ${H316} ${SIM} ${H316_OPT} -o $@
++	${CC} ${CFLAGS} ${H316} ${SIM} ${H316_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}hp2100 : ${HP2100} ${SIM}
+-	${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@
++	${CC} ${CFLAGS} ${HP2100} ${SIM} ${HP2100_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}i1401 : ${I1401} ${SIM}
+-	${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@
++	${CC} ${CFLAGS} ${I1401} ${SIM} ${I1401_OPT} -o $@
+ 
+ 
+ 
+ ${BIN}i1620 : ${I1620} ${SIM}
+-	${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@
++	${CC} ${CFLAGS} ${I1620} ${SIM} ${I1620_OPT} -o $@
+ 
+ 
+ ${BIN}ibm1130 : ${IBM1130}
+-	${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@
++	${CC} ${CFLAGS} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@
+ 
+ 
+ ${BIN}s3 : ${S3} ${SIM}
+-	${CC} ${S3} ${SIM} ${S3_OPT} -o $@
++	${CC} ${CFLAGS} ${S3} ${SIM} ${S3_OPT} -o $@
+ 
+ 
+ ${BIN}altair : ${ALTAIR} ${SIM}
+-	${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@
++	${CC} ${CFLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@
+ 
+ 
+ ${BIN}altairz80 : ${ALTAIRZ80} ${SIM} ${ALTAIRZ80D}altairZ80_defs.h
+-	${CC} ${ALTAIRZ80_OPT} ${ALTAIRZ80} ${SIM} -o $@
++	${CC} ${CFLAGS} ${ALTAIRZ80_OPT} ${ALTAIRZ80} ${SIM} -o $@
+ ${ALTAIRZ80D}altairZ80_defs.h : ${ALTAIRZ80D}altairz80_defs.h
+ 	cp ${ALTAIRZ80D}altairz80_defs.h ${ALTAIRZ80D}altairZ80_defs.h
+ 
+ ${BIN}gri : ${GRI} ${SIM}
+-	${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@
+-
+-${BIN}id16 : ${ID16} ${SIM}
+-	${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@
+-
+-${BIN}id32 : ${ID32} ${SIM}
+-	${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@
++	${CC} ${CFLAGS} ${GRI} ${SIM} ${GRI_OPT} -o $@
+ 
+-${BIN}sds : ${SDS} ${SIM}
+-	${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@
+ 
+ 
diff --git a/emulators/simh/pkg-message b/emulators/simh/pkg-message
new file mode 100644
index 000000000000..a7a5bbf096a7
--- /dev/null
+++ b/emulators/simh/pkg-message
@@ -0,0 +1,5 @@
+*********************************************************************
+
+The file needed by the VAX emulator is located in ${PREFIX}/share/sim
+
+*********************************************************************
diff --git a/emulators/simh/pkg-plist b/emulators/simh/pkg-plist
index 0a20cd715aff..3d16b8f69af0 100644
--- a/emulators/simh/pkg-plist
+++ b/emulators/simh/pkg-plist
@@ -1,15 +1,27 @@
-bin/altair
-bin/eclipse
-bin/h316
-bin/nova
 bin/pdp1
-bin/pdp10
-bin/pdp11
-bin/pdp15
 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/i1401
+bin/i1620
 bin/s3
+bin/altair
+bin/altairz80
+bin/gri
+bin/ibm1130
+share/doc/sim/0readme_210.txt
+share/doc/sim/0readme_ethernet.txt
 share/doc/sim/simh_doc.txt
+share/doc/sim/simh_swre.txt
+share/sim/ka655.bin
 @dirrm share/doc/sim
+@dirrm share/sim