summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/simh/Makefile13
-rw-r--r--emulators/simh/PLIST10
-rw-r--r--emulators/simh/distinfo12
-rw-r--r--emulators/simh/patches/patch-aa66
-rw-r--r--emulators/simh/patches/patch-ab34
5 files changed, 84 insertions, 51 deletions
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 7e73ba9974d..4762dda5e49 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/31 16:10:52 thorpej Exp $
#
-DISTNAME= simhv210-0b2
-PKGNAME= simh-2.10.0b2
-PKGREVISION= 2
+DISTNAME= simhv210-4
+PKGNAME= simh-2.10.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= emulators
MASTER_SITES= http://simh.trailing-edge.com/sources/
EXTRACT_SUFX= .zip
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- xq_beta5${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://simh.trailing-edge.com/
@@ -28,8 +27,6 @@ CFLAGS:= ${CFLAGS:S/-O2//}
post-extract:
${MKDIR} ${WRKSRC}/BIN
${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
- ${MV} ${WRKSRC}/AltairZ80/altairZ80_defs.h \
- ${WRKSRC}/AltairZ80/altairz80_defs.h
do-install:
(cd ${WRKSRC}/BIN && for BIN in *; do \
diff --git a/emulators/simh/PLIST b/emulators/simh/PLIST
index bbf8849eadf..5b4d62fef5d 100644
--- a/emulators/simh/PLIST
+++ b/emulators/simh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/19 21:38:09 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/05/31 16:10:52 thorpej Exp $
bin/simh-altair
bin/simh-altairz80
bin/simh-eclipse
@@ -24,18 +24,22 @@ bin/simh-sds
bin/simh-vax
share/simh/ka655.bin
@dirrm share/simh
-share/doc/simh/0readme210.txt
+share/doc/simh/0readme_210.txt
+share/doc/simh/0readme_ethernet.txt
share/doc/simh/altair.txt
share/doc/simh/altairz80.txt
share/doc/simh/eclipse.txt
share/doc/simh/gri_doc.txt
share/doc/simh/h316_doc.txt
share/doc/simh/haltguide.txt
+share/doc/simh/hp2100_diag.txt
share/doc/simh/hp2100_doc.txt
share/doc/simh/i1401_doc.txt
share/doc/simh/i1620_doc.txt
+share/doc/simh/id_diag.txt
share/doc/simh/id_doc.txt
share/doc/simh/nova_doc.txt
+share/doc/simh/pdp10_diag.txt
share/doc/simh/pdp10_doc.txt
share/doc/simh/pdp11_doc.txt
share/doc/simh/pdp18b_doc.txt
@@ -44,10 +48,10 @@ share/doc/simh/pdp8_doc.txt
share/doc/simh/readme1130.txt
share/doc/simh/readme_s3.txt
share/doc/simh/readme_update.txt
+share/doc/simh/sds_diag.txt
share/doc/simh/sds_doc.txt
share/doc/simh/simh_doc.txt
share/doc/simh/simh_swre.txt
share/doc/simh/system3.txt
share/doc/simh/vax_doc.txt
-share/doc/simh/xq_README.txt
@dirrm share/doc/simh
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index 049ae6ffaaf..0d88f33257f 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/03/22 11:58:16 cjep Exp $
+$NetBSD: distinfo,v 1.9 2003/05/31 16:10:52 thorpej Exp $
-SHA1 (simhv210-0b2.zip) = 841669853d24f7b2b608442806eeaa083f2dd7ab
-Size (simhv210-0b2.zip) = 1555874 bytes
-SHA1 (xq_beta5.zip) = a66fe7fecb76737632e262ae40c3d59147071a7e
-Size (xq_beta5.zip) = 24582 bytes
-SHA1 (patch-aa) = e14a00127c162fcaf626f251722d5aaf9d439f09
-SHA1 (patch-ab) = 516740338b0648a7503b2cbac00ff6bbec086c9e
+SHA1 (simhv210-4.zip) = 889e4a61eb8ed3eec768700920f69022f81c2fe2
+Size (simhv210-4.zip) = 1678424 bytes
+SHA1 (patch-aa) = caa25e4f265d03f65347a2e873e0e736baa43750
+SHA1 (patch-ab) = 97d66b3fcf79c51feb54a6cba3cdc3f58d15eb3f
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index aa3e727fa06..5ba1a2b9a70 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,24 +1,58 @@
-$NetBSD: patch-aa,v 1.5 2003/03/22 11:58:17 cjep Exp $
+$NetBSD: patch-aa,v 1.6 2003/05/31 16:10:53 thorpej Exp $
---- Makefile.orig Sat Oct 19 14:23:26 2002
-+++ Makefile Sat Oct 19 14:24:16 2002
-@@ -3,8 +3,8 @@
+--- Makefile.orig 2003-03-02 15:44:14.000000000 -0800
++++ Makefile 2003-05-31 08:55:03.000000000 -0700
+@@ -3,24 +3,24 @@
# Note: -O2 is sometimes broken in GCC when setjump/longjump is being
# used. Try -O2 only with released simulators.
#
--CC = gcc -O2 -lm -I .
--#CC = gcc -O2 -g -lm -I .
-+CC = gcc ${CFLAGS} -lm -lpcap -I .
-+#CC = gcc -O2 -g -lm -lpcap -I .
+-ifeq ($(WIN32),)
++#ifeq ($(WIN32),)
+ #Unix Environments
+ CC = gcc -O2 -lm -I .
+ #CC = gcc -O2 -g -lm -I .
+-ifeq ($(USE_NETWORK),)
+-else
++#ifeq ($(USE_NETWORK),)
++#else
+ NETWORK_OPT = -DUSE_NETWORK -lpcap
+-endif
+-else
++#endif
++#else
+ #Win32 Environments
+-LDFLAGS = -lm -lwsock32
+-CC = gcc -O0 -I.
+-EXE = .exe
+-ifeq ($(USE_NETWORK),)
+-else
+-NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
+-endif
+-endif
++#LDFLAGS = -lm -lwsock32
++#CC = gcc -O0 -I.
++#EXE = .exe
++#ifeq ($(USE_NETWORK),)
++#else
++#NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
++#endif
++#endif
-
-@@ -12,7 +12,7 @@
- # Common Libraries
#
- BIN = BIN/
--SIM = scp.c scp_tty.c sim_sock.c sim_tmxr.c
-+SIM = scp.c scp_tty.c sim_ether.c sim_sock.c sim_tmxr.c
-
-
+@@ -223,11 +223,11 @@
+ all : ${ALL}
+ clean :
+-ifeq ($(WIN32),)
++#ifeq ($(WIN32),)
+ ${RM} ${ALL}
+-else
+- if exist BIN\*.exe del /q BIN\*.exe
+-endif
++#else
++# if exist BIN\*.exe del /q BIN\*.exe
++#endif
+ #
+ # Individual builds
+ #
diff --git a/emulators/simh/patches/patch-ab b/emulators/simh/patches/patch-ab
index 0d5222703a2..48ccaee8cab 100644
--- a/emulators/simh/patches/patch-ab
+++ b/emulators/simh/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.3 2003/01/18 21:17:34 bouyer Exp $
+$NetBSD: patch-ab,v 1.4 2003/05/31 16:10:53 thorpej Exp $
---- sim_ether.c.orig Tue Oct 22 16:34:16 2002
-+++ sim_ether.c Sat Jan 18 18:25:37 2003
-@@ -256,6 +256,14 @@
- /* set data in passed read packet */
- dev->read_packet->len = header->len;
- memcpy(dev->read_packet->msg, data, header->len);
-+ /*
-+ * Pad packet to minimum ethernet len, in case if comes from the local
-+ * host.
-+ */
-+ if (header->len <60) {
-+ dev->read_packet->len = 60;
-+ memset(dev->read_packet->msg + header->len, 0, 60 - header->len);
-+ }
+--- sim_ether.c.orig 2003-01-16 09:45:04.000000000 -0800
++++ sim_ether.c 2003-05-31 08:51:54.000000000 -0700
+@@ -383,6 +383,14 @@
+ /* set data in passed read packet */
+ dev->read_packet->len = header->len;
+ memcpy(dev->read_packet->msg, data, header->len);
++ /*
++ * Pad packet to minimum ethernet len, in case it comes from the local
++ * host.
++ */
++ if (header->len <60) {
++ dev->read_packet->len = 60;
++ memset(dev->read_packet->msg + header->len, 0, 60 - header->len);
++ }
- #ifdef _DEBUG
- eth_packet_trace (dev->read_packet, "reading");
+ #ifdef ETH_DEBUG
+ eth_packet_trace (dev->read_packet, "reading");
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 15:20:25 +0000