pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/simh simh: update to 4.0.0.20180919



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c30d98c97721
branches:  trunk
changeset: 385662:c30d98c97721
user:      gson <gson%pkgsrc.org@localhost>
date:      Mon Sep 24 14:12:28 2018 +0000

description:
simh: update to 4.0.0.20180919

Update simh to a current git snapshot.  The main motivation for the
update is the fix to simh bug #478, which is needed for NetBSD to boot
on an emulated VAX under anita.  There have also been other changes
too numerous to list here, including the following new emulations:
3b2, i701, i7010, i704, i7070, i7080, i7090, scelbi, sigma, uc15.

diffstat:

 emulators/simh/Makefile               |   7 +++----
 emulators/simh/PLIST                  |  14 +++++++++++++-
 emulators/simh/distinfo               |  12 ++++++------
 emulators/simh/patches/patch-makefile |  27 +++++++++------------------
 4 files changed, 31 insertions(+), 29 deletions(-)

diffs (153 lines):

diff -r 07a0756507fb -r c30d98c97721 emulators/simh/Makefile
--- a/emulators/simh/Makefile   Mon Sep 24 14:00:23 2018 +0000
+++ b/emulators/simh/Makefile   Mon Sep 24 14:12:28 2018 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2018/02/09 17:35:05 gson Exp $
+# $NetBSD: Makefile,v 1.50 2018/09/24 14:12:28 gson Exp $
 
 DISTNAME=      simh-4.0.0
-PKGNAME=       simh-4.0.0.20170406
-PKGREVISION=   2
+PKGNAME=       simh-4.0.0.20180919
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=simh/}
 GITHUB_PROJECT=        simh
-GITHUB_TAG=    2ddb7162f3b7602afac290505c5d3352007cf26d
+GITHUB_TAG=    0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://simh.trailing-edge.com/
diff -r 07a0756507fb -r c30d98c97721 emulators/simh/PLIST
--- a/emulators/simh/PLIST      Mon Sep 24 14:00:23 2018 +0000
+++ b/emulators/simh/PLIST      Mon Sep 24 14:12:28 2018 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.17 2018/02/09 17:35:05 gson Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/09/24 14:12:28 gson Exp $
+bin/simh-3b2
 bin/simh-altair
 bin/simh-altairz80
 bin/simh-b5500
@@ -11,6 +12,12 @@
 bin/simh-hp3000
 bin/simh-i1401
 bin/simh-i1620
+bin/simh-i701
+bin/simh-i7010
+bin/simh-i704
+bin/simh-i7070
+bin/simh-i7080
+bin/simh-i7090
 bin/simh-i7094
 bin/simh-ibm1130
 bin/simh-id16
@@ -35,11 +42,14 @@
 bin/simh-pdp9
 bin/simh-rtvax1000
 bin/simh-s3
+bin/simh-scelbi
 bin/simh-sds
+bin/simh-sigma
 bin/simh-ssem
 bin/simh-swtp6800mp-a
 bin/simh-swtp6800mp-a2
 bin/simh-tx-0
+bin/simh-uc15
 bin/simh-vax
 bin/simh-vax730
 bin/simh-vax750
@@ -49,6 +59,7 @@
 share/doc/simh/0readmeAsynchIO.txt
 share/doc/simh/0readme_39.txt
 share/doc/simh/0readme_ethernet.txt
+share/doc/simh/CDC1700-Customization.txt
 share/doc/simh/CDC1700-Diagnostics.txt
 share/doc/simh/CDC1700-MSOS.txt
 share/doc/simh/CDC1700.txt
@@ -60,6 +71,7 @@
 share/doc/simh/hp2100_release.txt
 share/doc/simh/hp3000_diag.txt
 share/doc/simh/hp3000_release.txt
+share/doc/simh/i1620_error_matrix.txt
 share/doc/simh/i7094_bug_history.txt
 share/doc/simh/id_diag.txt
 share/doc/simh/input.txt
diff -r 07a0756507fb -r c30d98c97721 emulators/simh/distinfo
--- a/emulators/simh/distinfo   Mon Sep 24 14:00:23 2018 +0000
+++ b/emulators/simh/distinfo   Mon Sep 24 14:12:28 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2017/12/31 08:50:00 tsutsui Exp $
+$NetBSD: distinfo,v 1.30 2018/09/24 14:12:28 gson Exp $
 
-SHA1 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = a6b17f1b16bd2a21d7ae797c0bd8282267b30c1a
-RMD160 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 4f172b66a8efcd3b0870fa5d8e4a8dc76b9c7f87
-SHA512 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 56656dcc57460aa3f4a42ed5fbc3f9bc8c567498f394450f631f26475dc20f2b1282569cabc053049a4d07d3d0aee3fd8bb41b67aab9bef9c722e28ffb971cdf
-Size (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 10046376 bytes
-SHA1 (patch-makefile) = bdc247baec8751b4ac7d4ac03182c44e10a674a4
+SHA1 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 58d77b58be3850d5f1cd9a7cdcb24d1e110bd71e
+RMD160 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 0b2ad6107006f89b0ca66ddc556c2f00df56937c
+SHA512 (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 1c17430e74022cb5a9aebc784dc1a223fbbe323799ab528a9c788db8e3dbad01b7635da3c3dc158fcd28103c5fc462ce0fc3e9cdd90c298ff6ecdeb3dfd5f0a8
+Size (simh-4.0.0-0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3.tar.gz) = 12077046 bytes
+SHA1 (patch-makefile) = ed0f4fdcb63d09e7f0374abafc3f8d03f0f86e91
 SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790
diff -r 07a0756507fb -r c30d98c97721 emulators/simh/patches/patch-makefile
--- a/emulators/simh/patches/patch-makefile     Mon Sep 24 14:00:23 2018 +0000
+++ b/emulators/simh/patches/patch-makefile     Mon Sep 24 14:12:28 2018 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-makefile,v 1.1 2017/12/31 08:50:00 tsutsui Exp $
+$NetBSD: patch-makefile,v 1.2 2018/09/24 14:12:28 gson 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)
 Make -O2 conditional so can be overridden by environment
 Fix SDL2 detection
 
---- makefile.orig      2017-04-05 19:51:28.000000000 +0000
+--- makefile.orig      2018-09-20 05:36:48.000000000 +0000
 +++ makefile
-@@ -190,7 +190,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
-       endif
+@@ -217,7 +217,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
+       $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
      endif
    endif
 -  LTO_EXCLUDE_VERSIONS = 
@@ -16,7 +16,7 @@
    PCAPLIB = pcap
    ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
      OS_CCDEFS = -D_GNU_SOURCE
-@@ -912,11 +912,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
+@@ -1039,11 +1039,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
  endif
  ifneq ($(DEBUG),)
    CFLAGS_G = -g -ggdb -g3
@@ -24,13 +24,13 @@
 +  CFLAGS_O ?= -O0
    BUILD_FEATURES = - debugging support
  else
-   ifneq (clang,$(findstring clang,$(COMPILER_NAME)))
--    CFLAGS_O = -O2
-+    CFLAGS_O ?= -O2
+   ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
+-    CFLAGS_O = -O0
++    CFLAGS_O ?= -O0
      ifeq (Darwin,$(OSTYPE))
        NO_LTO = 1
      endif
-@@ -925,7 +925,7 @@ else
+@@ -1052,7 +1052,7 @@ else
      ifeq (Darwin,$(OSTYPE))
        CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program
      else
@@ -39,12 +39,3 @@
      endif
    endif
    LDFLAGS_O = 
-@@ -1473,7 +1473,7 @@ ifneq (,$(BESM6_BUILD))
-       $(info *** No SDL ttf support available.  BESM-6 video panel disabled.)
-       $(info ***)
-       BESM6_OPT = -I ${BESM6D} -DUSE_INT64 
--  else ifneq (,$(and $(findstring SDL2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)))
-+  else ifneq (,$(and $(findstring sdl2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)))
-       $(info using libSDL2_ttf: $(call find_lib,SDL2_ttf) $(call find_include,SDL2/SDL_ttf))
-       $(info ***)
-       BESM6_OPT = -I ${BESM6D} -DFONTFILE=${FONTFILE} -DUSE_INT64 ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL2_ttf



Home | Main Index | Thread Index | Old Index