- Update to 3.6. Changelog: http://simh.trailing-edge.com/changes36.html [1]

- Fix conflict with java/eclipse, as reported by Robert A. Getschmann, by
installing sim-eclipse instead of eclipse. [1]
- pkg-message --> files/pkg-message and associated changes. [2]
- pet portlint [2]

PR:		99095
Submitted by:	maintainer [1], itetcu (me) [2]

6 files changed, 28 insertions, 28 deletions

diff --git a/emulators/sim/Makefile b/emulators/sim/Makefile
index d9c0bb256e57..f921192b1f36 100644
--- a/emulators/sim/Makefile
+++ b/emulators/sim/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	sim
-PORTVERSION=	3.5.2
-PORTREVISION=	1
+PORTVERSION=	3.6.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
-DISTNAME=	${PORTNAME}hv35-2
+DISTNAME=	${PORTNAME}hv36-0
 
 MAINTAINER=	mmendez@energyhq.be
 COMMENT=	Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others
@@ -22,21 +21,20 @@ RESTRICTED=	Non-commercial use only
 MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
-SHELL=${SH}
-
 OPTIONS=	NETWORK	"Enable Sim_Ether module (and ports libpcap)"	on
 
 BIN_FILES=	altair    h316   ibm1130 nova  pdp15 pdp9 vax780 \
 		altairz80 hp2100 id16    pdp1  pdp4  s3          \
-		eclipse   i1401  id32    pdp10 pdp7  sds         \
+		i1401  id32    pdp10 pdp7  sds         \
 		gri       i1620  lgp     pdp11 pdp8  vax
 
-PORTDOCS=	0readme_35.txt simh_doc.txt simh_swre.txt \
-		0readme_ethernet.txt simh_faq.txt
+PORTDOCS=	0readme_36.txt 0readme_ethernet.txt
 
-PLIST_FILES=	${BIN_FILES:S/^/bin\//g} %%DATADIR%%/ka655x.bin
+PLIST_FILES=	${BIN_FILES:S/^/bin\//g} %%DATADIR%%/ka655x.bin bin/sim-eclipse
 PLIST_DIRS=	%%DATADIR%%
 
+SUB_FILES+=	pkg-message
+
 .include <bsd.port.pre.mk>
 
 # XXX How do we know that libpcap.a is really the correct >0.9.x version?!
@@ -53,6 +51,8 @@ do-install:
 .for file in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${WRKDIR}/BIN/${file} ${PREFIX}/bin
 .endfor
+# eclipse conflicts with java/eclipse, install it as sim-eclipse
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/eclipse ${PREFIX}/bin/sim-eclipse
 
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${DATADIR}
@@ -65,6 +65,6 @@ do-install:
 .endif
 
 post-install:
-	@${CAT} pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/sim/distinfo b/emulators/sim/distinfo
index a022b298d967..e07564b187dc 100644
--- a/emulators/sim/distinfo
+++ b/emulators/sim/distinfo
@@ -1,3 +1,3 @@
-MD5 (simhv35-2.zip) = e3d2a168f2da62e10e0013f1f9111d82
-SHA256 (simhv35-2.zip) = 12c6e6290b599b7f131027a533ee12add8d68735128805e012309db46f2ab9fb
-SIZE (simhv35-2.zip) = 2259795
+MD5 (simhv36-0.zip) = 3e5b13362132e039b228dd0ad9ac1a3c
+SHA256 (simhv36-0.zip) = dfd4d76490b56cc1df538016c45f041912a1f52916c6725e177250a88e343d17
+SIZE (simhv36-0.zip) = 2215996
diff --git a/emulators/sim/pkg-message b/emulators/sim/files/pkg-message.in
index a7a5bbf096a7..1c3a94dfa896 100644
--- a/emulators/sim/pkg-message
+++ b/emulators/sim/files/pkg-message.in
@@ -1,5 +1,5 @@
 *********************************************************************
 
-The file needed by the VAX emulator is located in ${PREFIX}/share/sim
+The file needed by the VAX emulator is located in %%PREFIX%%/share/sim
 
 *********************************************************************
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index d9c0bb256e57..f921192b1f36 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	sim
-PORTVERSION=	3.5.2
-PORTREVISION=	1
+PORTVERSION=	3.6.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
-DISTNAME=	${PORTNAME}hv35-2
+DISTNAME=	${PORTNAME}hv36-0
 
 MAINTAINER=	mmendez@energyhq.be
 COMMENT=	Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others
@@ -22,21 +21,20 @@ RESTRICTED=	Non-commercial use only
 MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
-SHELL=${SH}
-
 OPTIONS=	NETWORK	"Enable Sim_Ether module (and ports libpcap)"	on
 
 BIN_FILES=	altair    h316   ibm1130 nova  pdp15 pdp9 vax780 \
 		altairz80 hp2100 id16    pdp1  pdp4  s3          \
-		eclipse   i1401  id32    pdp10 pdp7  sds         \
+		i1401  id32    pdp10 pdp7  sds         \
 		gri       i1620  lgp     pdp11 pdp8  vax
 
-PORTDOCS=	0readme_35.txt simh_doc.txt simh_swre.txt \
-		0readme_ethernet.txt simh_faq.txt
+PORTDOCS=	0readme_36.txt 0readme_ethernet.txt
 
-PLIST_FILES=	${BIN_FILES:S/^/bin\//g} %%DATADIR%%/ka655x.bin
+PLIST_FILES=	${BIN_FILES:S/^/bin\//g} %%DATADIR%%/ka655x.bin bin/sim-eclipse
 PLIST_DIRS=	%%DATADIR%%
 
+SUB_FILES+=	pkg-message
+
 .include <bsd.port.pre.mk>
 
 # XXX How do we know that libpcap.a is really the correct >0.9.x version?!
@@ -53,6 +51,8 @@ do-install:
 .for file in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${WRKDIR}/BIN/${file} ${PREFIX}/bin
 .endfor
+# eclipse conflicts with java/eclipse, install it as sim-eclipse
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/eclipse ${PREFIX}/bin/sim-eclipse
 
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${DATADIR}
@@ -65,6 +65,6 @@ do-install:
 .endif
 
 post-install:
-	@${CAT} pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index a022b298d967..e07564b187dc 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,3 +1,3 @@
-MD5 (simhv35-2.zip) = e3d2a168f2da62e10e0013f1f9111d82
-SHA256 (simhv35-2.zip) = 12c6e6290b599b7f131027a533ee12add8d68735128805e012309db46f2ab9fb
-SIZE (simhv35-2.zip) = 2259795
+MD5 (simhv36-0.zip) = 3e5b13362132e039b228dd0ad9ac1a3c
+SHA256 (simhv36-0.zip) = dfd4d76490b56cc1df538016c45f041912a1f52916c6725e177250a88e343d17
+SIZE (simhv36-0.zip) = 2215996
diff --git a/emulators/simh/pkg-message b/emulators/simh/files/pkg-message.in
index a7a5bbf096a7..1c3a94dfa896 100644
--- a/emulators/simh/pkg-message
+++ b/emulators/simh/files/pkg-message.in
@@ -1,5 +1,5 @@
 *********************************************************************
 
-The file needed by the VAX emulator is located in ${PREFIX}/share/sim
+The file needed by the VAX emulator is located in %%PREFIX%%/share/sim
 
 *********************************************************************