CVS commit: pkgsrc/emulators/simh

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/simh
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Thu, 14 Oct 2021 19:12:56 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Thu Oct 14 19:12:56 UTC 2021

Modified Files:
        pkgsrc/emulators/simh: DESCR Makefile distinfo
        pkgsrc/emulators/simh/patches: patch-makefile
Removed Files:
        pkgsrc/emulators/simh/patches: patch-sim__ether.c

Log Message:
emulators/simh: update to snapshot dated 2021-10-12.

Since there are no simh releases there are also no release notes to summarize.
The previous snapshot was over 3 years ago: 2018-09-19.

A somewhat controversial change with some people is that simh now
appends a "footer" block to disk image files, containing metadata
(struct simh_disk_footer).  ATTACH -r <disk_unit> <filename> will avoid
this but makes the device read-only.

New information from the README.md file:

    DO <stdin>                  Invokes a nested DO command with input from the
                                running console.
    RUNLIMIT                    Bound simulator execution time
    TAR                         Manipulate file archives
    CURL                        Access URLs from the web

Changes in the built emulator models:
- several new VAX models (vax8200, vaxstation{3100,4000}*, infoserver*)
- several new PDP-10 models (pdp10-{ka,ki,kl})
- new: pdp6
- Intel-Systems: Merge MDS, SDK, OEM simulators into Intel-MDS simulator

The files ka655x.bin and vmb.exe are no longer installed since they are
not required for operation (they are built into the VAX models that use
them), and it is strange to single out these ROM images out of over 30 to
install.  LOAD -r can load alternative versions.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/simh/DESCR
cvs rdiff -u -r1.56 -r1.57 pkgsrc/emulators/simh/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/emulators/simh/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/simh/patches/patch-makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/simh/patches/patch-sim__ether.c

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/DESCR
diff -u pkgsrc/emulators/simh/DESCR:1.6 pkgsrc/emulators/simh/DESCR:1.7
--- pkgsrc/emulators/simh/DESCR:1.6     Fri Mar 27 15:55:15 2020
+++ pkgsrc/emulators/simh/DESCR Thu Oct 14 19:12:55 2021
@@ -2,7 +2,7 @@ Bob Supnik's historical computer simulat
 
        3b2 alpha altair altairz80 b5000 besm6 cdc1700 eclipse gri
        h316 hp2100 hp3000 i1401 i1620 i650 i7000 i7094 ibm1130
-       intel-systems id16 id32 lgp nova pdp1 pdp10 pdp11 pdp18b
+       intel-systems id16 id32 lgp nova pdp1 pdp6 pdp10 pdp11 pdp18b
        pdp4 pdp7 pdp8 pdp9 s3 sage sds ssem tx0 vax
 
 See http://www.netbsd.org/ports/vax/emulator-howto.html on how to

Index: pkgsrc/emulators/simh/Makefile
diff -u pkgsrc/emulators/simh/Makefile:1.56 pkgsrc/emulators/simh/Makefile:1.57
--- pkgsrc/emulators/simh/Makefile:1.56 Wed Sep  8 21:05:02 2021
+++ pkgsrc/emulators/simh/Makefile      Thu Oct 14 19:12:55 2021
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.56 2021/09/08 21:05:02 nia Exp $
+# $NetBSD: Makefile,v 1.57 2021/10/14 19:12:55 rhialto Exp $
 
 DISTNAME=      simh-4.0.0
-PKGNAME=       simh-4.0.0.20180919
-PKGREVISION=   3
+PKGNAME=       simh-4.0.0.20211012
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=simh/}
 GITHUB_PROJECT=        simh
-GITHUB_TAG=    0fe4bf3281a4d1f9fd10bba07cf0f7e40da92fc3
+GITHUB_TAG=    06a8447d26810110a8b168d7525955479bcd3f3a
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    rhialto%NetBSD.org@localhost
 HOMEPAGE=      http://simh.trailing-edge.com/
 COMMENT=       Bob Supniks historical computer simulator
 LICENSE=       mit
@@ -38,7 +37,7 @@ LDFLAGS.SunOS+=       -lm
 
 LDFLAGS.Linux+=        -lm -pthread -lrt
 
-INSTALLATION_DIRS=     bin share/simh share/doc/simh
+INSTALLATION_DIRS=     bin share/simh share/simh/TX-0 share/doc/simh
 
 MAKE_FILE=             makefile
 INCLUDES=              ${PREFIX:Q}/include:\
@@ -59,7 +58,7 @@ MAKE_ENV+=            GCC=${CC:Q}
 MAKE_ENV+=             OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
 MAKE_ENV+=             FONTPATH=/usr/pkg/share/fonts/X11/TTF
 
-BUILD_TARGET=          all besm6
+BUILD_TARGET=          TESTS=0 all
 
 post-extract:
        ${MKDIR} ${WRKSRC}/BIN
@@ -71,12 +70,17 @@ do-install:
                fi ;                                                    \
        done)
 
-       ${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh
-       ${INSTALL_DATA} ${WRKSRC}/VAX/vmb.exe ${DESTDIR}${PREFIX}/share/simh
+       ${INSTALL_DATA} ${WRKSRC}/TX-0/*.bin ${DESTDIR}${PREFIX}/share/simh/TX-0
        (cd ${WRKSRC} && for TXT in *.txt */*.txt; do                   \
                ${INSTALL_DATA} "$$TXT" ${DESTDIR}${PREFIX}/share/doc/simh;             \
        done)
 
+# Note: tests require shm (/var/shm is a tmpfs) for the uc15.
+# They are part of the build and can't be run separately.
+do-test:
+       cd ${WRKSRC} && ${TEST_MAKE_CMD} clean
+       cd ${WRKSRC} && ${TEST_MAKE_CMD} all
+
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"

Index: pkgsrc/emulators/simh/distinfo
diff -u pkgsrc/emulators/simh/distinfo:1.32 pkgsrc/emulators/simh/distinfo:1.33
--- pkgsrc/emulators/simh/distinfo:1.32 Thu Oct  7 13:49:38 2021
+++ pkgsrc/emulators/simh/distinfo      Thu Oct 14 19:12:55 2021
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.32 2021/10/07 13:49:38 nia Exp $
+$NetBSD: distinfo,v 1.33 2021/10/14 19:12:55 rhialto Exp $
 
-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) = 6e07d6fb406a455a93447facfc93c79da7de74a6
-SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790
+RMD160 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 139a3ac95eefbfb6c2298c24386d02f832dffe94
+SHA512 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 30a2ef10225a7c6a07829ddf7f559748eb8bb42bd4e2e6430da8547642063ff6b1a0729101d80e470259f8607411a1b2a3baa51ec69bac7d1ba4d99ca83a4b3e
+Size (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 29376656 bytes
+SHA1 (patch-makefile) = b9142225e4d19ef8d7223f6fdf342aa51c9a2e75

Index: pkgsrc/emulators/simh/patches/patch-makefile
diff -u pkgsrc/emulators/simh/patches/patch-makefile:1.3 pkgsrc/emulators/simh/patches/patch-makefile:1.4
--- pkgsrc/emulators/simh/patches/patch-makefile:1.3    Tue Feb 18 16:49:50 2020
+++ pkgsrc/emulators/simh/patches/patch-makefile        Thu Oct 14 19:12:56 2021
@@ -1,23 +1,36 @@
-$NetBSD: patch-makefile,v 1.3 2020/02/18 16:49:50 joerg Exp $
+$NetBSD: patch-makefile,v 1.4 2021/10/14 19:12:56 rhialto Exp $
 
 Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
 Exclude -flto for clang on NetBSD
 Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
+NO_LTO=1 is in effect for gcc and clang, except Darwin.
 Make -O2 conditional so can be overridden by environment
-Fix SDL2 detection
+Fix png16 detection
 
---- makefile.orig      2018-09-20 05:36:48.-00145232 +0000
+--- makefile.orig      2021-10-07 06:38:08.000000000 +0000
 +++ makefile
-@@ -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)
+@@ -298,7 +298,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+       $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
      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
-@@ -1039,20 +1039,23 @@ ifneq (,$(UNSUPPORTED_BUILD))
+   ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
+     OS_CCDEFS = -D_GNU_SOURCE -DSIM_ASYNCH_IO 
+@@ -598,9 +598,9 @@ ifeq (${WIN32},)  #*nix Environments (&&
+     OS_CCDEFS += -DHAVE_UTIME
+   endif
+   ifneq (,$(call find_include,png))
+-    ifneq (,$(call find_lib,png))
++    ifneq (,$(call find_lib,png16))
+       OS_CCDEFS += -DHAVE_LIBPNG
+-      OS_LDFLAGS += -lpng
++      OS_LDFLAGS += -lpng16
+       $(info using libpng: $(call find_lib,png) $(call find_include,png))
+       ifneq (,$(call find_include,zlib))
+         ifneq (,$(call find_lib,z))
+@@ -1185,11 +1185,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
  endif
  ifneq ($(DEBUG),)
    CFLAGS_G = -g -ggdb -g3
@@ -26,21 +39,17 @@ Fix SDL2 detection
    BUILD_FEATURES = - debugging support
  else
    ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
--    CFLAGS_O = -O0
-+    CFLAGS_O ?= -O0
-     ifeq (Darwin,$(OSTYPE))
-       NO_LTO = 1
-+    endif
-+    ifeq (NetBSD,$(OSTYPE))
-+      NO_LTO = 1
-     endif
-   else
+-    CFLAGS_O = -O2 -fno-strict-overflow
++    CFLAGS_O ?= -O2 -fno-strict-overflow
+     GCC_OPTIMIZERS_CMD = ${GCC} --help
      NO_LTO = 1
+   else
+@@ -1197,7 +1197,7 @@ else
      ifeq (Darwin,$(OSTYPE))
-       CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program
+       CFLAGS_O += -O4 -flto -fwhole-program
      else
--      CFLAGS_O := -O2 -fno-strict-overflow 
-+      CFLAGS_O ?= -O2 -fno-strict-overflow 
+-      CFLAGS_O := -O2
++      CFLAGS_O ?= -O2
      endif
    endif
    LDFLAGS_O =

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/audio/termusic
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/audio/termusic
Indexes:

Home | Main Index | Thread Index | Old Index