Re: WIP: simh 3.9.0
On Sun, Jul 08, 2012 at 12:50:38AM -0400, Brad Smith wrote: On Wed, Jun 13, 2012 at 07:42:48AM -0400, Brad Smith wrote: Here is a first rev of an attempt at a SimH 3.9.0 update. I don't use simh so I'm looking for anyone using simh to test this out. Here is an updated diff. This fixes simh to be able to find some of the files it requires and obeying CFLAGS. Look, it's pointless to update simh if you're not at least trying the vax simulator. Base people don't really care about anything else. Yeah, it's very painful, but if you break vax emulation, no-one cares about the rest. (and actually, we pretend we care about vax...)
Re: WIP: simh 3.9.0
On Wed, Jun 13, 2012 at 07:42:48AM -0400, Brad Smith wrote:
Here is a first rev of an attempt at a SimH 3.9.0 update.
I don't use simh so I'm looking for anyone using simh to
test this out.
Here is an updated diff. This fixes simh to be able to find
some of the files it requires and obeying CFLAGS.
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/simh/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile24 Dec 2011 12:57:10 - 1.72
+++ Makefile13 Jun 2012 11:18:39 -
@@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.72 2011/12/24 12:57:10 sthen Exp $
-# $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
COMMENT= PDP, IBM 1401, Nova and other CPUs simulator
-PKGNAME= simh-3.8.1
-DISTNAME= simhv38-1
-REVISION= 6
+DISTNAME= simhv39-0
+PKGNAME= simh-3.9.0
CATEGORIES=emulators
MASTER_SITES= ${HOMEPAGE}/sources/
+EXTRACT_SUFX= .zip
HOMEPAGE= http://simh.trailing-edge.com/
@@ -17,21 +16,18 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m pcap
+WANTLIB= c m pcap pthread
WRKDIST= ${WRKDIR}
-EXTRACT_SUFX= .zip
-MASTER_SITES0= http://spacehopper.org/mirrors/
-# Files from http://simh.trailing-edge.com/interim.html repackaged as a diff
-PATCHFILES=simh-3.8.1-interim.diff:0
UNZIP= unzip -a -o
-COPTS+=-DPATH_KA655X_BIN=\${PREFIX}/lib/simh/vax/ka655x.bin\
\
- -DPATH_VMB_EXE=\${PREFIX}/lib/simh/vax/vmb.exe\
+CFLAGS+= -DPATH_KA655X_BIN=\${PREFIX}/lib/simh/vax/ka655x.bin\
\
+ -DPATH_VMB_EXE=\${PREFIX}/lib/simh/vax/vmb.exe\
+USE_GMAKE= Yes
MAKE_FILE= makefile
-MAKE_FLAGS=CC=${CC}
+MAKE_FLAGS=GCC=${CC} USE_NETWORK=1
NO_REGRESS=Yes
VMEM_WARNING= Yes
@@ -40,13 +36,13 @@ pre-build:
@mkdir -p ${WRKBUILD}/BIN
do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
@cd ${WRKBUILD}/BIN for f in `echo *`; do \
${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/simh-$${f}; \
done;
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/ka655x.bin ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/vmb.exe ${PREFIX}/lib/simh/vax
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
${INSTALL_DATA} ${WRKBUILD}/*.txt ${WRKBUILD}/*/*.txt \
${PREFIX}/share/doc/simh
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/simh/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo7 Oct 2011 19:39:09 - 1.30
+++ distinfo13 Jun 2012 10:31:24 -
@@ -1,10 +1,5 @@
-MD5 (simh-3.8.1-interim.diff) = JJYiU313/E+rzZJ16ZNGPQ==
-MD5 (simhv38-1.zip) = 4V9lqC4h6knhS0ODJtk9XA==
-RMD160 (simh-3.8.1-interim.diff) = 3IQeLrF8hSlc+YuEKh/VdoSaaYs=
-RMD160 (simhv38-1.zip) = 8IXFLskkJfhPZbPzYFy3q6i+ezI=
-SHA1 (simh-3.8.1-interim.diff) = ixpJMs6+sSto2omfoA04ytaRU0k=
-SHA1 (simhv38-1.zip) = XqwvjlC+EWAHJ5g+BQcmkKcGZwI=
-SHA256 (simh-3.8.1-interim.diff) = c+fnjFbbZ9i+ormiXU7UDBX7FWjwcyQbjEoStFG7oIc=
-SHA256 (simhv38-1.zip) = T+KU+lKFsdbQvWn2CInADlGM4r5fAKvCvUrfqNqoWwY=
-SIZE (simh-3.8.1-interim.diff) = 57923
-SIZE (simhv38-1.zip) = 2954982
+MD5 (simhv39-0.zip) = uAOFiI8jJpq67gutfYTqfA==
+RMD160 (simhv39-0.zip) = pGTn0fxtWN0jo+9iPDwBjV1gsFA=
+SHA1 (simhv39-0.zip) = HeOTjw3LUdVbDlOuqK6XaczFe9s=
+SHA256 (simhv39-0.zip) = 5Jslm2atYxHKkGbe49NpPNkVEGppOKUu1oXNutqO2js=
+SIZE (simhv39-0.zip) = 3103657
Index: patches/patch-PDP11_pdp11_hk_c
===
RCS file: /home/cvs/ports/emulators/simh/patches/patch-PDP11_pdp11_hk_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-PDP11_pdp11_hk_c
--- patches/patch-PDP11_pdp11_hk_c 20 Apr 2011 05:16:33 - 1.1
+++ patches/patch-PDP11_pdp11_hk_c 13 Jun 2012 10:47:35 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-PDP11_pdp11_hk_c,v 1.1 2011/04/20 05:16:33 form Exp $
PDP11/pdp11_hk.c.orig Sat Nov 22 18:40:26 2008
-+++ PDP11/pdp11_hk.c Wed Apr 20 11:37:12 2011
-@@ -904,7 +904,7 @@ switch (fnc) {
+--- PDP11/pdp11_hk.c.orig Mon Mar 19 17:41:44 2012
PDP11/pdp11_hk.c Wed Jun 13 06:36:24 2012
+@@ -905,7 +905,7 @@ switch (fnc) {
for (i = wc; i awc; i++) /* fill buf */
hkxb[i] = 0;
if (wc !err) { /* write buf */
Index: patches/patch-PDP11_pdp11_vh_c
Re: WIP: simh 3.9.0
On Wed, Jun 13, 2012 at 07:42:48AM -0400, Brad Smith wrote: Here is a first rev of an attempt at a SimH 3.9.0 update. I don't use simh so I'm looking for anyone using simh to test this out. Anyone? I know there are some simh users out there ;) -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
WIP: simh 3.9.0
Here is a first rev of an attempt at a SimH 3.9.0 update.
I don't use simh so I'm looking for anyone using simh to
test this out.
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/simh/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile24 Dec 2011 12:57:10 - 1.72
+++ Makefile13 Jun 2012 11:18:39 -
@@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.72 2011/12/24 12:57:10 sthen Exp $
-# $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
COMMENT= PDP, IBM 1401, Nova and other CPUs simulator
-PKGNAME= simh-3.8.1
-DISTNAME= simhv38-1
-REVISION= 6
+DISTNAME= simhv39-0
+PKGNAME= simh-3.9.0
CATEGORIES=emulators
MASTER_SITES= ${HOMEPAGE}/sources/
+EXTRACT_SUFX= .zip
HOMEPAGE= http://simh.trailing-edge.com/
@@ -17,21 +16,18 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m pcap
+WANTLIB= c m pcap pthread
WRKDIST= ${WRKDIR}
-EXTRACT_SUFX= .zip
-MASTER_SITES0= http://spacehopper.org/mirrors/
-# Files from http://simh.trailing-edge.com/interim.html repackaged as a diff
-PATCHFILES=simh-3.8.1-interim.diff:0
UNZIP= unzip -a -o
-COPTS+=-DPATH_KA655X_BIN=\${PREFIX}/lib/simh/vax/ka655x.bin\
\
- -DPATH_VMB_EXE=\${PREFIX}/lib/simh/vax/vmb.exe\
+CFLAGS+= -DPATH_KA655X_BIN=\${PREFIX}/lib/simh/vax/ka655x.bin\
\
+ -DPATH_VMB_EXE=\${PREFIX}/lib/simh/vax/vmb.exe\
+USE_GMAKE= Yes
MAKE_FILE= makefile
-MAKE_FLAGS=CC=${CC}
+MAKE_FLAGS=GCC=${CC} USE_NETWORK=1
NO_REGRESS=Yes
VMEM_WARNING= Yes
@@ -40,13 +36,13 @@ pre-build:
@mkdir -p ${WRKBUILD}/BIN
do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
@cd ${WRKBUILD}/BIN for f in `echo *`; do \
${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/simh-$${f}; \
done;
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/ka655x.bin ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/vmb.exe ${PREFIX}/lib/simh/vax
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
${INSTALL_DATA} ${WRKBUILD}/*.txt ${WRKBUILD}/*/*.txt \
${PREFIX}/share/doc/simh
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/simh/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo7 Oct 2011 19:39:09 - 1.30
+++ distinfo13 Jun 2012 10:31:24 -
@@ -1,10 +1,5 @@
-MD5 (simh-3.8.1-interim.diff) = JJYiU313/E+rzZJ16ZNGPQ==
-MD5 (simhv38-1.zip) = 4V9lqC4h6knhS0ODJtk9XA==
-RMD160 (simh-3.8.1-interim.diff) = 3IQeLrF8hSlc+YuEKh/VdoSaaYs=
-RMD160 (simhv38-1.zip) = 8IXFLskkJfhPZbPzYFy3q6i+ezI=
-SHA1 (simh-3.8.1-interim.diff) = ixpJMs6+sSto2omfoA04ytaRU0k=
-SHA1 (simhv38-1.zip) = XqwvjlC+EWAHJ5g+BQcmkKcGZwI=
-SHA256 (simh-3.8.1-interim.diff) = c+fnjFbbZ9i+ormiXU7UDBX7FWjwcyQbjEoStFG7oIc=
-SHA256 (simhv38-1.zip) = T+KU+lKFsdbQvWn2CInADlGM4r5fAKvCvUrfqNqoWwY=
-SIZE (simh-3.8.1-interim.diff) = 57923
-SIZE (simhv38-1.zip) = 2954982
+MD5 (simhv39-0.zip) = uAOFiI8jJpq67gutfYTqfA==
+RMD160 (simhv39-0.zip) = pGTn0fxtWN0jo+9iPDwBjV1gsFA=
+SHA1 (simhv39-0.zip) = HeOTjw3LUdVbDlOuqK6XaczFe9s=
+SHA256 (simhv39-0.zip) = 5Jslm2atYxHKkGbe49NpPNkVEGppOKUu1oXNutqO2js=
+SIZE (simhv39-0.zip) = 3103657
Index: patches/patch-PDP11_pdp11_hk_c
===
RCS file: /home/cvs/ports/emulators/simh/patches/patch-PDP11_pdp11_hk_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-PDP11_pdp11_hk_c
--- patches/patch-PDP11_pdp11_hk_c 20 Apr 2011 05:16:33 - 1.1
+++ patches/patch-PDP11_pdp11_hk_c 13 Jun 2012 10:47:35 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-PDP11_pdp11_hk_c,v 1.1 2011/04/20 05:16:33 form Exp $
PDP11/pdp11_hk.c.orig Sat Nov 22 18:40:26 2008
-+++ PDP11/pdp11_hk.c Wed Apr 20 11:37:12 2011
-@@ -904,7 +904,7 @@ switch (fnc) {
+--- PDP11/pdp11_hk.c.orig Mon Mar 19 17:41:44 2012
PDP11/pdp11_hk.c Wed Jun 13 06:36:24 2012
+@@ -905,7 +905,7 @@ switch (fnc) {
for (i = wc; i awc; i++) /* fill buf */
hkxb[i] = 0;
if (wc !err) { /* write buf */
Index: patches/patch-PDP11_pdp11_vh_c
===
RCS file: /home/cvs/ports/emulators/simh/patches/patch-PDP11_pdp11_vh_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-PDP11_pdp11_vh_c
---
