Sun Dec 18 11:11:28 2016 UTC ()
There haven't been any simh releases in years, so convert this package
to take a snapshot from github. Update to 7964e2b72d9.

Changes: too many to list them all, full list of changes is available at
https://github.com/simh/simh/blob/master/README.md

Highlights:
- many new simulators
- simulator front panel API
- VAXstation video display simulation using SDL
- UDP and NAT packet transports
- scripting support


(hans)
diff -r1.43 -r1.44 pkgsrc/emulators/simh/Makefile
diff -r1.14 -r1.15 pkgsrc/emulators/simh/PLIST
diff -r1.26 -r1.27 pkgsrc/emulators/simh/distinfo
diff -r1.16 -r1.17 pkgsrc/emulators/simh/patches/patch-aa
diff -r1.8 -r0 pkgsrc/emulators/simh/patches/patch-ab
diff -r1.7 -r0 pkgsrc/emulators/simh/patches/patch-ac
diff -r0 -r1.1 pkgsrc/emulators/simh/patches/patch-sim__ether.c
diff -r1.1 -r0 pkgsrc/emulators/simh/patches/patch-sim__timer.h
cvs diff -r1.43 -r1.44 pkgsrc/emulators/simh/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/Makefile 2015/12/11 23:33:33 1.43
+++ pkgsrc/emulators/simh/Makefile 2016/12/18 11:11:28 1.44
@@ -1,58 +1,76 @@ @@ -1,58 +1,76 @@
1# $NetBSD: Makefile,v 1.43 2015/12/11 23:33:33 joerg Exp $ 1# $NetBSD: Makefile,v 1.44 2016/12/18 11:11:28 hans Exp $
2 2
3DISTNAME= simhv39-0 3DISTNAME= simh-4.0.0
4PKGNAME= simh-3.9.0 4PKGNAME= simh-4.0.0.20161218
5PKGREVISION= 4 
6CATEGORIES= emulators 5CATEGORIES= emulators
7MASTER_SITES= http://simh.trailing-edge.com/sources/ 6MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/}
8EXTRACT_SUFX= .zip 7GITHUB_PROJECT= simh
 8GITHUB_TAG= 7964e2b72d9cad0309afa7da08dd7e5e2336cd37
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://simh.trailing-edge.com/ 11HOMEPAGE= http://simh.trailing-edge.com/
12COMMENT= Bob Supniks historical computer simulator 12COMMENT= Bob Supniks historical computer simulator
13 13
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15 15
16BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9 16BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9
17 17
18WRKSRC= ${WRKDIR} 
19 
20.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
21 19
22BUILDLINK_TRANSFORM+= rm:-flto 20BUILDLINK_TRANSFORM+= rm:-flto
 21BUILDLINK_TRANSFORM+= rm:-fwhole-program
23 22
24.if (${MACHINE_ARCH} == "arm") 23.if (${MACHINE_ARCH} == "arm")
25BUILDLINK_TRANSFORM+= rm:-O2 24BUILDLINK_TRANSFORM+= rm:-O2
26.endif 25.endif
27 26
28# Needed for PDP11/pdp11_dc.c on gcc 4.1.3 27# Needed for PDP11/pdp11_dc.c on gcc 4.1.3
29.if (${MACHINE_ARCH} == "vax") 28.if (${MACHINE_ARCH} == "vax")
30CFLAGS+= -fforce-addr 29CFLAGS+= -fforce-addr
31.endif 30.endif
32 31
 32CFLAGS.SunOS+= -DBSD_COMP
 33LDFLAGS.SunOS+= -lm
 34
33INSTALLATION_DIRS= bin share/simh share/doc/simh 35INSTALLATION_DIRS= bin share/simh share/doc/simh
34 36
35MAKE_FILE= makefile 37MAKE_FILE= makefile
36MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} 38INCLUDES= ${PREFIX:Q}/include:\
 39 ${BUILDLINK_PREFIX.SDL_ttf:Q}/include/SDL:\
 40 ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\
 41 ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\
 42 ${BUILDLINK_PREFIX.png:Q}/include
 43LIBRARIES= ${PREFIX:Q}/lib:\
 44 ${BUILDLINK_PREFIX.SDL_ttf:Q}/lib${LIBABISUFFIX}:\
 45 ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
 46 ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
 47 ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}
 48MAKE_ENV+= INCLUDES=${INCLUDES:Q}
 49MAKE_ENV+= LIBRARIES=${LIBRARIES:Q}
37MAKE_ENV+= GCC=${CC:Q} 50MAKE_ENV+= GCC=${CC:Q}
38MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q} 51MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
39 52
40post-extract: 53post-extract:
41 ${MKDIR} ${WRKSRC}/BIN 54 ${MKDIR} ${WRKSRC}/BIN
42 55
43do-install: 56do-install:
44 (cd ${WRKSRC}/BIN && for BIN in *; do \ 57 (cd ${WRKSRC}/BIN && for BIN in *; do \
45 if [ -f $$BIN ] ; then \ 58 if [ -f $$BIN ] ; then \
46 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \ 59 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
47 fi ; \ 60 fi ; \
48 done) 61 done)
49 62
50 ${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh 63 ${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh
51 ${INSTALL_DATA} ${WRKSRC}/VAX/vmb.exe ${DESTDIR}${PREFIX}/share/simh 64 ${INSTALL_DATA} ${WRKSRC}/VAX/vmb.exe ${DESTDIR}${PREFIX}/share/simh
52 (cd ${WRKSRC} && for TXT in *.txt */*.txt; do \ 65 (cd ${WRKSRC} && for TXT in *.txt */*.txt; do \
53 ${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh; \ 66 ${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh; \
54 done) 67 done)
55 68
 69.include "../../devel/SDL/buildlink3.mk"
 70.include "../../devel/SDL_ttf/buildlink3.mk"
 71.include "../../devel/pcre/buildlink3.mk"
 72.include "../../graphics/png/buildlink3.mk"
56.include "../../net/libpcap/buildlink3.mk" 73.include "../../net/libpcap/buildlink3.mk"
 74.include "../../mk/dlopen.buildlink3.mk"
57.include "../../mk/pthread.buildlink3.mk" 75.include "../../mk/pthread.buildlink3.mk"
58.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/emulators/simh/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/simh/PLIST 2013/03/26 13:53:42 1.14
+++ pkgsrc/emulators/simh/PLIST 2016/12/18 11:11:28 1.15
@@ -1,49 +1,77 @@ @@ -1,49 +1,77 @@
1@comment $NetBSD: PLIST,v 1.14 2013/03/26 13:53:42 martin Exp $ 1@comment $NetBSD: PLIST,v 1.15 2016/12/18 11:11:28 hans Exp $
2bin/simh-altair 2bin/simh-altair
3bin/simh-altairz80 3bin/simh-altairz80
 4bin/simh-b5500
 5bin/simh-cdc1700
4bin/simh-eclipse 6bin/simh-eclipse
5bin/simh-gri 7bin/simh-gri
6bin/simh-h316 8bin/simh-h316
7bin/simh-hp2100 9bin/simh-hp2100
 10bin/simh-hp3000
8bin/simh-i1401 11bin/simh-i1401
9bin/simh-i1620 12bin/simh-i1620
10bin/simh-i7094 13bin/simh-i7094
11bin/simh-ibm1130 14bin/simh-ibm1130
12bin/simh-id16 15bin/simh-id16
13bin/simh-id32 16bin/simh-id32
 17bin/simh-isys8010
 18bin/simh-isys8020
 19bin/simh-isys8024
 20bin/simh-isys8030
14bin/simh-lgp 21bin/simh-lgp
 22bin/simh-microvax1
 23bin/simh-microvax2
 24bin/simh-microvax3900
15bin/simh-nova 25bin/simh-nova
16bin/simh-pdp1 26bin/simh-pdp1
17bin/simh-pdp10 27bin/simh-pdp10
18bin/simh-pdp11 28bin/simh-pdp11
19bin/simh-pdp15 29bin/simh-pdp15
20bin/simh-pdp4 30bin/simh-pdp4
21bin/simh-pdp7 31bin/simh-pdp7
22bin/simh-pdp8 32bin/simh-pdp8
23bin/simh-pdp9 33bin/simh-pdp9
 34bin/simh-rtvax1000
24bin/simh-s3 35bin/simh-s3
25bin/simh-sds 36bin/simh-sds
 37bin/simh-ssem
26bin/simh-swtp6800mp-a 38bin/simh-swtp6800mp-a
27bin/simh-swtp6800mp-a2 39bin/simh-swtp6800mp-a2
 40bin/simh-tx-0
28bin/simh-vax 41bin/simh-vax
 42bin/simh-vax730
 43bin/simh-vax750
29bin/simh-vax780 44bin/simh-vax780
 45bin/simh-vax8600
30share/doc/simh/0readme_39.txt 46share/doc/simh/0readme_39.txt
 47share/doc/simh/0readmeAsynchIO.txt
31share/doc/simh/0readme_ethernet.txt 48share/doc/simh/0readme_ethernet.txt
 49share/doc/simh/CDC1700-Diagnostics.txt
 50share/doc/simh/CDC1700-MSOS.txt
 51share/doc/simh/CDC1700.txt
32share/doc/simh/altair.txt 52share/doc/simh/altair.txt
33share/doc/simh/eclipse.txt 53share/doc/simh/eclipse.txt
34share/doc/simh/haltguide.txt 54share/doc/simh/haltguide.txt
35share/doc/simh/hp2100_bugfixes.txt 55share/doc/simh/hp2100_bugfixes.txt
36share/doc/simh/hp2100_diag.txt 56share/doc/simh/hp2100_diag.txt
 57share/doc/simh/hp3000_diag.txt
 58share/doc/simh/hp3000_release.txt
37share/doc/simh/i7094_bug_history.txt 59share/doc/simh/i7094_bug_history.txt
38share/doc/simh/id_diag.txt 60share/doc/simh/id_diag.txt
 61share/doc/simh/input.txt
 62share/doc/simh/m68k_parse.y.txt
39share/doc/simh/pdp10_bug_history.txt 63share/doc/simh/pdp10_bug_history.txt
40share/doc/simh/pdp18b_diag.txt 64share/doc/simh/pdp18b_diag.txt
41share/doc/simh/pdp1_diag.txt 65share/doc/simh/pdp1_diag.txt
42share/doc/simh/readme1130.txt 66share/doc/simh/readme1130.txt
43share/doc/simh/readme_s3.txt 67share/doc/simh/readme_s3.txt
 68share/doc/simh/readme-sage.txt
44share/doc/simh/readme_update.txt 69share/doc/simh/readme_update.txt
45share/doc/simh/sds_diag.txt 70share/doc/simh/sds_diag.txt
 71share/doc/simh/sigma_bugs.txt
 72share/doc/simh/sigma_disks.txt
46share/doc/simh/system3.txt 73share/doc/simh/system3.txt
 74share/doc/simh/tx0_diag.txt
47share/doc/simh/vax780_bug_history.txt 75share/doc/simh/vax780_bug_history.txt
48share/simh/ka655x.bin 76share/simh/ka655x.bin
49share/simh/vmb.exe 77share/simh/vmb.exe
cvs diff -r1.26 -r1.27 pkgsrc/emulators/simh/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/simh/distinfo 2016/06/18 11:26:55 1.26
+++ pkgsrc/emulators/simh/distinfo 2016/12/18 11:11:28 1.27
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.26 2016/06/18 11:26:55 ryoon Exp $ 1$NetBSD: distinfo,v 1.27 2016/12/18 11:11:28 hans Exp $
2 2
3SHA1 (simhv39-0.zip) = 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb 3SHA1 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 83ec0e23ef79e13d7149d9c4077d479f1e3c2b2c
4RMD160 (simhv39-0.zip) = a464e7d1fc6d58dd23a3ef623c3c018d5d60b050 4RMD160 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = c77adffe16248aa6c0a3f14de321b599c772c3ab
5SHA512 (simhv39-0.zip) = 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6 5SHA512 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 8ceae000df2442df925fae0eb2e9142ba4d6be732ae930b88addc9530ba21257bb03f30493ccdf941e06d4f04deeffdfcf12e1f41b3855c34bf7a116edc4d31c
6Size (simhv39-0.zip) = 3103657 bytes 6Size (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 9915006 bytes
7SHA1 (patch-aa) = 00aa93c3d25359529de8fac356b664f13d85d3f2 7SHA1 (patch-aa) = 01ee641734c029fc2ea0de6947971c0bbdc0e267
8SHA1 (patch-ab) = aa6f7fa5246b469ec7de28182922d2e6e18ce0de 8SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790
9SHA1 (patch-ac) = 9d12df82e971b057be33d4cf54b1539597ae94f3 
10SHA1 (patch-sim__timer.h) = 1ee43b9a6586cdeb0f4dd22321957de8d30d3376 
cvs diff -r1.16 -r1.17 pkgsrc/emulators/simh/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/simh/patches/Attic/patch-aa 2016/06/18 11:26:56 1.16
+++ pkgsrc/emulators/simh/patches/Attic/patch-aa 2016/12/18 11:11:28 1.17
@@ -1,26 +1,40 @@ @@ -1,26 +1,40 @@
1$NetBSD: patch-aa,v 1.16 2016/06/18 11:26:56 ryoon Exp $ 1$NetBSD: patch-aa,v 1.17 2016/12/18 11:11:28 hans Exp $
2 2
3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6) 3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
4Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1) 4Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
5Make -O2 conditional so can be overridden by environment 5Make -O2 conditional so can be overridden by environment
6 6
7--- makefile.orig 2012-04-23 16:28:04.000000000 +0000 7--- makefile.orig 2012-04-23 16:28:04.000000000 +0000
8+++ makefile 8+++ makefile
9@@ -63,7 +63,7 @@ ifeq ($(WIN32),) #*nix Environments (&& 9@@ -187,7 +187,7 @@ ifeq ($(WIN32),) #*nix Environments (&&
10 OSNAME = windows-build 10 endif
11 endif 11 endif
12 GCC_VERSION = $(shell $(GCC) -v /dev/null 2>&1 | grep 'gcc version' | awk '{ print $$3 }') 12 endif
13- LTO_EXCLUDE_VERSIONS =  13- LTO_EXCLUDE_VERSIONS =
14+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0 14+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
15 PCAPLIB = pcap 15 PCAPLIB = pcap
16 ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build? 16 ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
17 OS_CCDEFS = -D_GNU_SOURCE 17 OS_CCDEFS = -D_GNU_SOURCE
18@@ -300,7 +300,7 @@ ifneq ($(DEBUG),) 18@@ -903,11 +903,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
19 CFLAGS_O = -O0 19 endif
20 BUILD_FEATURES = - debugging support 20 ifneq ($(DEBUG),)
21 else 21 CFLAGS_G = -g -ggdb -g3
22- CFLAGS_O = -O2 22- CFLAGS_O = -O0
23+ CFLAGS_O ?= -O2 23+ CFLAGS_O ?= -O0
24 LDFLAGS_O =  24 BUILD_FEATURES = - debugging support
25 GCC_MAJOR_VERSION = $(firstword $(subst ., ,$(GCC_VERSION))) 25 else
26 ifneq (3,$(GCC_MAJOR_VERSION)) 26 ifneq (clang,$(findstring clang,$(COMPILER_NAME)))
 27- CFLAGS_O = -O2
 28+ CFLAGS_O ?= -O2
 29 ifeq (Darwin,$(OSTYPE))
 30 NO_LTO = 1
 31 endif
 32@@ -916,7 +916,7 @@ else
 33 ifeq (Darwin,$(OSTYPE))
 34 CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program
 35 else
 36- CFLAGS_O := -O2 -fno-strict-overflow
 37+ CFLAGS_O ?= -O2 -fno-strict-overflow
 38 endif
 39 endif
 40 LDFLAGS_O =
File Deleted: pkgsrc/emulators/simh/patches/Attic/patch-ab
File Deleted: pkgsrc/emulators/simh/patches/Attic/patch-ac
File Added: pkgsrc/emulators/simh/patches/Attic/patch-sim__ether.c
$NetBSD: patch-sim__ether.c,v 1.1 2016/12/18 11:11:28 hans Exp $

SunOS needs sys/ioctl.h for FIONBIO definition.

--- sim_ether.c.orig	2016-11-22 10:24:26.000000000 +0100
+++ sim_ether.c
@@ -366,6 +366,7 @@
 */
 
 #include <ctype.h>
+#include <sys/ioctl.h>
 #include "sim_ether.h"
 #include "sim_sock.h"
 #include "sim_timer.h"
File Deleted: pkgsrc/emulators/simh/patches/Attic/patch-sim__timer.h