Update simh to 3.9.0

See https://raw.github.com/simh/simh/master/sim_rev.h for changes

4 files changed, 26 insertions, 62 deletions

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 576bdcac169..6bd67b58a35 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2011/11/11 19:52:39 christos Exp $
+# $NetBSD: Makefile,v 1.34 2012/05/04 09:38:23 hans Exp $
 #
 
-DISTNAME=	simhv38-1
-PKGNAME=	simh-3.8.1
-PKGREVISION=	2
+DISTNAME=	simhv39-0
+PKGNAME=	simh-3.9.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
@@ -11,13 +10,13 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://simh.trailing-edge.com/
-COMMENT=	Bob Supnik's historical computer simulator
+COMMENT=	Bob Supniks historical computer simulator
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
 
-BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.9
 
 WRKSRC=			${WRKDIR}
 
@@ -30,7 +29,6 @@ BUILDLINK_TRANSFORM+=	rm:-O2
 INSTALLATION_DIRS=	bin share/simh share/doc/simh
 
 MAKE_FILE=		makefile
-MAKE_FLAGS+=		USE_NETWORK=YES OSTYPE=${LOWER_OPSYS}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/BIN
diff --git a/emulators/simh/PLIST b/emulators/simh/PLIST
index d54898e7e48..1e2674d76c7 100644
--- a/emulators/simh/PLIST
+++ b/emulators/simh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2010/06/19 13:59:52 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/05/04 09:38:23 hans Exp $
 bin/simh-altair
 bin/simh-altairz80
 bin/simh-eclipse
@@ -23,9 +23,11 @@ bin/simh-pdp8
 bin/simh-pdp9
 bin/simh-s3
 bin/simh-sds
+bin/simh-swtp6800mp-a
+bin/simh-swtp6800mp-a2
 bin/simh-vax
 bin/simh-vax780
-share/doc/simh/0readme_38.txt
+share/doc/simh/0readme_39.txt
 share/doc/simh/0readme_ethernet.txt
 share/doc/simh/altair.txt
 share/doc/simh/eclipse.txt
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index f7760172509..1fed77ed916 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.16 2011/11/11 19:50:54 christos Exp $
+$NetBSD: distinfo,v 1.17 2012/05/04 09:38:23 hans Exp $
 
-SHA1 (simhv38-1.zip) = 5eac2f8e50be11600727983e05072690a7066702
-RMD160 (simhv38-1.zip) = f085c52ec92425f84f65b3f3605cb7aba8be7b32
-Size (simhv38-1.zip) = 2954982 bytes
-SHA1 (patch-aa) = 88567baeed5af2d834b105935ea1c8706dab1133
-SHA1 (patch-ab) = 85b36e3d92a2bfbd886dbb2e08a0af967edeb0bd
+SHA1 (simhv39-0.zip) = 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb
+RMD160 (simhv39-0.zip) = a464e7d1fc6d58dd23a3ef623c3c018d5d60b050
+Size (simhv39-0.zip) = 3103657 bytes
+SHA1 (patch-ab) = c82bb9a1ca5f149e994e1894a1753a99bccdec89
 SHA1 (patch-ac) = 16673f3bb5c42cdfd0497cd1f0657cbbe3bbecdb
-SHA1 (patch-ad) = d4e0baa406b1426a6f8d39249484de61afd53474
diff --git a/emulators/simh/patches/patch-ab b/emulators/simh/patches/patch-ab
index 42aef027a72..0cc8e1c85a1 100644
--- a/emulators/simh/patches/patch-ab
+++ b/emulators/simh/patches/patch-ab
@@ -1,47 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2008/11/01 05:15:42 obache Exp $
+$NetBSD: patch-ab,v 1.7 2012/05/04 09:38:23 hans Exp $
 
---- sim_ether.c.orig	2007-05-17 12:08:20.000000000 +0200
-+++ sim_ether.c
-@@ -1131,6 +1131,15 @@ void eth_callback(u_char* info, const st
-     /* set data in passed read packet */
-     tmp_packet.len = header->len;
-     memcpy(tmp_packet.msg, data, header->len);
-+    /*
-+     * Pad packet to minimum ethernet len, in case it comes from the local
-+     * host.
-+     */
-+    if (header->len < 60) {
-+        tmp_packet.len = 60;
-+        memset(dev->read_packet->msg + header->len, 0, 60 - header->len);
-+    }
-+
-     if (dev->need_crc)
-       eth_add_crc32(&tmp_packet);
- 
-@@ -1143,6 +1152,15 @@ void eth_callback(u_char* info, const st
-     /* 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);
-+    }
-+ 
-     if (dev->need_crc)
-       eth_add_crc32(dev->read_packet);
- 
-@@ -1431,8 +1449,10 @@ int eth_host_devices(int used, int max, 
- 
- int eth_devices(int max, ETH_LIST* list)
- {
-+#ifndef DONT_USE_PCAP_FINDALLDEVS
-   pcap_if_t* alldevs;
-   pcap_if_t* dev;
-+#endif
-   int i = 0;
-   char errbuf[PCAP_ERRBUF_SIZE];
- 
+--- sim_ether.c.orig	2012-03-30 16:30:26.000000000 +0200
++++ sim_ether.c	2012-05-03 23:31:13.438944514 +0200
+@@ -806,6 +806,8 @@ void eth_show_dev (FILE* st, ETH_DEV* de
+ #include <sys/ioctl.h> 
+ #include <net/if.h> 
+ #include <linux/if_tun.h> 
++#elif defined(__sun)
++#undef USE_TAP_NETWORK
+ #elif defined(USE_BSDTUNTAP)
+ #include <sys/types.h>
+ #include <net/if_types.h>