CVS commit: pkgsrc/emulators/simh

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/simh
From: "Hans Rosenfeld" <hans%netbsd.org@localhost>
Date: Sun, 18 Dec 2016 11:11:28 +0000

Module Name:    pkgsrc
Committed By:   hans
Date:           Sun Dec 18 11:11:28 UTC 2016

Modified Files:
        pkgsrc/emulators/simh: Makefile PLIST distinfo
        pkgsrc/emulators/simh/patches: patch-aa
Added Files:
        pkgsrc/emulators/simh/patches: patch-sim__ether.c
Removed Files:
        pkgsrc/emulators/simh/patches: patch-ab patch-ac patch-sim__timer.h

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/emulators/simh/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/simh/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/emulators/simh/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/simh/patches/patch-aa
cvs rdiff -u -r1.8 -r0 pkgsrc/emulators/simh/patches/patch-ab
cvs rdiff -u -r1.7 -r0 pkgsrc/emulators/simh/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/simh/patches/patch-sim__ether.c
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/simh/patches/patch-sim__timer.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/simh/Makefile
diff -u pkgsrc/emulators/simh/Makefile:1.43 pkgsrc/emulators/simh/Makefile:1.44
--- pkgsrc/emulators/simh/Makefile:1.43 Fri Dec 11 23:33:33 2015
+++ pkgsrc/emulators/simh/Makefile      Sun Dec 18 11:11:28 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2015/12/11 23:33:33 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2016/12/18 11:11:28 hans Exp $
 
-DISTNAME=      simhv39-0
-PKGNAME=       simh-3.9.0
-PKGREVISION=   4
+DISTNAME=      simh-4.0.0
+PKGNAME=       simh-4.0.0.20161218
 CATEGORIES=    emulators
-MASTER_SITES=  http://simh.trailing-edge.com/sources/
-EXTRACT_SUFX=  .zip
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=simh/}
+GITHUB_PROJECT=        simh
+GITHUB_TAG=    7964e2b72d9cad0309afa7da08dd7e5e2336cd37
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://simh.trailing-edge.com/
@@ -15,11 +15,10 @@ USE_TOOLS+= gmake
 
 BUILDLINK_API_DEPENDS.libpcap+=        libpcap>=0.9
 
-WRKSRC=                        ${WRKDIR}
-
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_TRANSFORM+=  rm:-flto
+BUILDLINK_TRANSFORM+=  rm:-fwhole-program
 
 .if (${MACHINE_ARCH} == "arm")
 BUILDLINK_TRANSFORM+=  rm:-O2
@@ -30,10 +29,24 @@ BUILDLINK_TRANSFORM+=       rm:-O2
 CFLAGS+=       -fforce-addr
 .endif
 
+CFLAGS.SunOS+= -DBSD_COMP
+LDFLAGS.SunOS+=        -lm
+
 INSTALLATION_DIRS=     bin share/simh share/doc/simh
 
 MAKE_FILE=             makefile
-MAKE_ENV+=             BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+INCLUDES=              ${PREFIX:Q}/include:\
+                       ${BUILDLINK_PREFIX.SDL_ttf:Q}/include/SDL:\
+                       ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\
+                       ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\
+                       ${BUILDLINK_PREFIX.png:Q}/include
+LIBRARIES=             ${PREFIX:Q}/lib:\
+                       ${BUILDLINK_PREFIX.SDL_ttf:Q}/lib${LIBABISUFFIX}:\
+                       ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
+                       ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
+                       ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}
+MAKE_ENV+=             INCLUDES=${INCLUDES:Q}
+MAKE_ENV+=             LIBRARIES=${LIBRARIES:Q}
 MAKE_ENV+=             GCC=${CC:Q}
 MAKE_ENV+=             OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
 
@@ -53,6 +66,11 @@ do-install:
                ${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh;               \
        done)
 
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/simh/PLIST
diff -u pkgsrc/emulators/simh/PLIST:1.14 pkgsrc/emulators/simh/PLIST:1.15
--- pkgsrc/emulators/simh/PLIST:1.14    Tue Mar 26 13:53:42 2013
+++ pkgsrc/emulators/simh/PLIST Sun Dec 18 11:11:28 2016
@@ -1,17 +1,27 @@
-@comment $NetBSD: PLIST,v 1.14 2013/03/26 13:53:42 martin Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/12/18 11:11:28 hans Exp $
 bin/simh-altair
 bin/simh-altairz80
+bin/simh-b5500
+bin/simh-cdc1700
 bin/simh-eclipse
 bin/simh-gri
 bin/simh-h316
 bin/simh-hp2100
+bin/simh-hp3000
 bin/simh-i1401
 bin/simh-i1620
 bin/simh-i7094
 bin/simh-ibm1130
 bin/simh-id16
 bin/simh-id32
+bin/simh-isys8010
+bin/simh-isys8020
+bin/simh-isys8024
+bin/simh-isys8030
 bin/simh-lgp
+bin/simh-microvax1
+bin/simh-microvax2
+bin/simh-microvax3900
 bin/simh-nova
 bin/simh-pdp1
 bin/simh-pdp10
@@ -21,29 +31,47 @@ bin/simh-pdp4
 bin/simh-pdp7
 bin/simh-pdp8
 bin/simh-pdp9
+bin/simh-rtvax1000
 bin/simh-s3
 bin/simh-sds
+bin/simh-ssem
 bin/simh-swtp6800mp-a
 bin/simh-swtp6800mp-a2
+bin/simh-tx-0
 bin/simh-vax
+bin/simh-vax730
+bin/simh-vax750
 bin/simh-vax780
+bin/simh-vax8600
 share/doc/simh/0readme_39.txt
+share/doc/simh/0readmeAsynchIO.txt
 share/doc/simh/0readme_ethernet.txt
+share/doc/simh/CDC1700-Diagnostics.txt
+share/doc/simh/CDC1700-MSOS.txt
+share/doc/simh/CDC1700.txt
 share/doc/simh/altair.txt
 share/doc/simh/eclipse.txt
 share/doc/simh/haltguide.txt
 share/doc/simh/hp2100_bugfixes.txt
 share/doc/simh/hp2100_diag.txt
+share/doc/simh/hp3000_diag.txt
+share/doc/simh/hp3000_release.txt
 share/doc/simh/i7094_bug_history.txt
 share/doc/simh/id_diag.txt
+share/doc/simh/input.txt
+share/doc/simh/m68k_parse.y.txt
 share/doc/simh/pdp10_bug_history.txt
 share/doc/simh/pdp18b_diag.txt
 share/doc/simh/pdp1_diag.txt
 share/doc/simh/readme1130.txt
 share/doc/simh/readme_s3.txt
+share/doc/simh/readme-sage.txt
 share/doc/simh/readme_update.txt
 share/doc/simh/sds_diag.txt
+share/doc/simh/sigma_bugs.txt
+share/doc/simh/sigma_disks.txt
 share/doc/simh/system3.txt
+share/doc/simh/tx0_diag.txt
 share/doc/simh/vax780_bug_history.txt
 share/simh/ka655x.bin
 share/simh/vmb.exe

Index: pkgsrc/emulators/simh/distinfo
diff -u pkgsrc/emulators/simh/distinfo:1.26 pkgsrc/emulators/simh/distinfo:1.27
--- pkgsrc/emulators/simh/distinfo:1.26 Sat Jun 18 11:26:55 2016
+++ pkgsrc/emulators/simh/distinfo      Sun Dec 18 11:11:28 2016
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.26 2016/06/18 11:26:55 ryoon Exp $
+$NetBSD: distinfo,v 1.27 2016/12/18 11:11:28 hans Exp $
 
-SHA1 (simhv39-0.zip) = 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb
-RMD160 (simhv39-0.zip) = a464e7d1fc6d58dd23a3ef623c3c018d5d60b050
-SHA512 (simhv39-0.zip) = 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6
-Size (simhv39-0.zip) = 3103657 bytes
-SHA1 (patch-aa) = 00aa93c3d25359529de8fac356b664f13d85d3f2
-SHA1 (patch-ab) = aa6f7fa5246b469ec7de28182922d2e6e18ce0de
-SHA1 (patch-ac) = 9d12df82e971b057be33d4cf54b1539597ae94f3
-SHA1 (patch-sim__timer.h) = 1ee43b9a6586cdeb0f4dd22321957de8d30d3376
+SHA1 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 83ec0e23ef79e13d7149d9c4077d479f1e3c2b2c
+RMD160 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = c77adffe16248aa6c0a3f14de321b599c772c3ab
+SHA512 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 8ceae000df2442df925fae0eb2e9142ba4d6be732ae930b88addc9530ba21257bb03f30493ccdf941e06d4f04deeffdfcf12e1f41b3855c34bf7a116edc4d31c
+Size (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 9915006 bytes
+SHA1 (patch-aa) = 01ee641734c029fc2ea0de6947971c0bbdc0e267
+SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790

Index: pkgsrc/emulators/simh/patches/patch-aa
diff -u pkgsrc/emulators/simh/patches/patch-aa:1.16 pkgsrc/emulators/simh/patches/patch-aa:1.17
--- pkgsrc/emulators/simh/patches/patch-aa:1.16 Sat Jun 18 11:26:56 2016
+++ pkgsrc/emulators/simh/patches/patch-aa      Sun Dec 18 11:11:28 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.16 2016/06/18 11:26:56 ryoon Exp $
+$NetBSD: patch-aa,v 1.17 2016/12/18 11:11:28 hans Exp $
 
 Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
 Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
@@ -6,21 +6,35 @@ Make -O2 conditional so can be overridde
 
 --- makefile.orig      2012-04-23 16:28:04.000000000 +0000
 +++ makefile
-@@ -63,7 +63,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
-     OSNAME = windows-build
-   endif
-   GCC_VERSION = $(shell $(GCC) -v /dev/null 2>&1 | grep 'gcc version' | awk '{ print $$3 }')
--  LTO_EXCLUDE_VERSIONS = 
-+  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
-   PCAPLIB = pcap
-   ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
-     OS_CCDEFS = -D_GNU_SOURCE
-@@ -300,7 +300,7 @@ ifneq ($(DEBUG),)
-   CFLAGS_O = -O0
-   BUILD_FEATURES = - debugging support
- else
--  CFLAGS_O = -O2
-+  CFLAGS_O ?= -O2
-   LDFLAGS_O = 
-   GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
-   ifneq (3,$(GCC_MAJOR_VERSION))
+@@ -187,7 +187,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
+       endif
+     endif
+   endif
+-  LTO_EXCLUDE_VERSIONS = 
++  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
+   PCAPLIB = pcap
+   ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
+     OS_CCDEFS = -D_GNU_SOURCE
+@@ -903,11 +903,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
+ endif
+ ifneq ($(DEBUG),)
+   CFLAGS_G = -g -ggdb -g3
+-  CFLAGS_O = -O0
++  CFLAGS_O ?= -O0
+   BUILD_FEATURES = - debugging support
+ else
+   ifneq (clang,$(findstring clang,$(COMPILER_NAME)))
+-    CFLAGS_O = -O2
++    CFLAGS_O ?= -O2
+     ifeq (Darwin,$(OSTYPE))
+       NO_LTO = 1
+     endif
+@@ -916,7 +916,7 @@ else
+     ifeq (Darwin,$(OSTYPE))
+       CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program
+     else
+-      CFLAGS_O := -O2 -fno-strict-overflow 
++      CFLAGS_O ?= -O2 -fno-strict-overflow 
+     endif
+   endif
+   LDFLAGS_O = 

Added files:

Index: pkgsrc/emulators/simh/patches/patch-sim__ether.c
diff -u /dev/null pkgsrc/emulators/simh/patches/patch-sim__ether.c:1.1
--- /dev/null   Sun Dec 18 11:11:28 2016
+++ pkgsrc/emulators/simh/patches/patch-sim__ether.c    Sun Dec 18 11:11:28 2016
@@ -0,0 +1,14 @@
+$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"

Prev by Date: CVS commit: pkgsrc/print/auctex
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/print/auctex
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index