>Number:         22967
>Category:       pkg
>Synopsis:       update emulators/simh to 3.0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 26 17:21:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Todd Vierling
>Release:        NetBSD 1.6.1_STABLE
>Organization:
	DUH.ORG:  Pointing out the obvious since 1994.
>Environment:
System: NetBSD server.duh.org 1.6.1_STABLE NetBSD 1.6.1_STABLE (SERVER) #1: Fri Sep 12 11:28:14 EDT 2003 tv@server.duh.org:/export/SRC/duh/netbsd-kernels/SERVER i386
Architecture: i386
Machine: i386
>Description:

simh is now at 3.0-2.  Changes include everything listed at

    http://simh.trailing-edge.com/changes30.html

or in the file 0readme_30.txt in the distribution.

>How-To-Repeat:

N/A

>Fix:

Diff below.  This also adds one patch (patch-ac) which makes "set telnet"'s
output a little nicer -- it set the tty to raw mode, but still used only \n
to output newlines.  (In raw mode, \r\n is necessary.)

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	2003/07/17 21:35:44	1.15
+++ Makefile	2003/09/26 17:02:30
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.15 2003/07/17 21:35:44 grant Exp $
 #
 
-DISTNAME=	simhv210-4
-PKGNAME=	simh-2.10.4
-PKGREVISION=	1
+DISTNAME=	simhv30-2
+PKGNAME=	simh-3.0.2
 WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST	2003/05/31 16:10:52	1.6
+++ PLIST	2003/09/26 17:02:30
@@ -22,9 +22,7 @@
 bin/simh-s3
 bin/simh-sds
 bin/simh-vax
-share/simh/ka655.bin
-@dirrm share/simh
-share/doc/simh/0readme_210.txt
+share/doc/simh/0readme_30.txt
 share/doc/simh/0readme_ethernet.txt
 share/doc/simh/altair.txt
 share/doc/simh/altairz80.txt
@@ -51,7 +49,10 @@
 share/doc/simh/sds_diag.txt
 share/doc/simh/sds_doc.txt
 share/doc/simh/simh_doc.txt
+share/doc/simh/simh_faq.txt
 share/doc/simh/simh_swre.txt
 share/doc/simh/system3.txt
 share/doc/simh/vax_doc.txt
+share/simh/ka655.bin
+@dirrm share/simh
 @dirrm share/doc/simh
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	2003/05/31 16:10:52	1.9
+++ distinfo	2003/09/26 17:02:30
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.9 2003/05/31 16:10:52 thorpej Exp $
 
-SHA1 (simhv210-4.zip) = 889e4a61eb8ed3eec768700920f69022f81c2fe2
-Size (simhv210-4.zip) = 1678424 bytes
+SHA1 (simhv30-2.zip) = 539822d9c3c87a49483c3a14310a02bee1372c09
+Size (simhv30-2.zip) = 1757964 bytes
 SHA1 (patch-aa) = caa25e4f265d03f65347a2e873e0e736baa43750
 SHA1 (patch-ab) = 97d66b3fcf79c51feb54a6cba3cdc3f58d15eb3f
+SHA1 (patch-ac) = 1366392ef1fcdf8de64d8606fde10df20212b49a
Index: patches/patch-ac
===================================================================
RCS file: patch-ac
diff -N patch-ac
--- /dev/null	Thu Jul 11 11:18:53 2002
+++ patches/patch-ac	Fri Sep 26 17:02:30 2003
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- scp.c.orig	Thu Sep 11 17:24:08 2003
++++ scp.c
+@@ -3731,13 +3731,13 @@ for (i = 0; i < sec; i++) {				/* loop *
+ 	if (tmxr_poll_conn (&sim_con_tmxr) >= 0) {	/* poll connect */
+ 	    sim_con_ldsc.rcve = 1;			/* rcv enabled */
+ 	    if (i) {					/* if delayed */
+-		printf ("Running\n");			/* print transition */
++		printf ("Running\r\n");			/* print transition */
+ 		fflush (stdout);  }
+ 	    return SCPE_OK;  }				/* ready to proceed */
+ 	c = sim_os_poll_kbd ();				/* check for stop char */
+ 	if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP;
+ 	if ((i % 10) == 0) {				/* Status every 10 sec */
+-	    printf ("Waiting for console Telnet connection\n");
++	    printf ("Waiting for console Telnet connection\r\n");
+ 	    fflush (stdout);  }
+ 	sim_os_sleep (1);				/* wait 1 second */
+ 	}
>Release-Note:
>Audit-Trail:
>Unformatted: