pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/emulators/open-simh
Module Name: pkgsrc
Committed By: rhialto
Date: Sun Jul 23 15:44:25 UTC 2023
Modified Files:
pkgsrc/emulators/open-simh: Makefile distinfo
pkgsrc/emulators/open-simh/patches: patch-makefile
Log Message:
emulators/open-simh: update to version 4.1.0.20230717
Fixes a crashing bug when attaching disk images to RQ (MSCP) devices.
Build and sanitizer fixes.
Further:
* cf47a20f DISK: add RQDX1 model and make it default for MV1.
* 0d47f7d3 AltairZ80: Updated documentation including format change
* 86ffe4be sim_disk.c: only free filebuf if it was allocated here too.
* f8a9f9bb AltairZ80: m68k: Avoid buffer overflow detected by gcc 9.4.0.
* 5b22fcf4 PDP11: RK11: Complete fix for WC as implemented in V3 + other fixes
* fcaf741d sigma: Correct DP Sense Length error(Bob Supnik)
* 3acc69fb AltairZ80: IBC MCC: Clean up HDC.
* b982fc99 TIMER: Properly report clock calibration inconsistency
* 96de0748 SCP: Don't malloc ep->match_pattern twice
* 76da2c0d 3B2: Properly NULL-terminate IU mod arrays
* ea5bcf97 Fix TODR example command
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/open-simh/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/open-simh/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/open-simh/patches/patch-makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/emulators/open-simh/Makefile
diff -u pkgsrc/emulators/open-simh/Makefile:1.11 pkgsrc/emulators/open-simh/Makefile:1.12
--- pkgsrc/emulators/open-simh/Makefile:1.11 Thu May 18 19:30:09 2023
+++ pkgsrc/emulators/open-simh/Makefile Sun Jul 23 15:44:25 2023
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2023/05/18 19:30:09 rhialto Exp $
+# $NetBSD: Makefile,v 1.12 2023/07/23 15:44:25 rhialto Exp $
DISTNAME= open-simh-4.1.0
-PKGNAME= open-simh-4.1.0.20230511
+PKGNAME= open-simh-4.1.0.20230717
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=open-simh/}
GITHUB_PROJECT= simh
-GITHUB_TAG= 793149d1bdf6fcdbf9ad54632285e3bd13b9e1c8
+GITHUB_TAG= cf47a20fd459d63be6c2e5a4728f2d2a31eaf884
MAINTAINER= rhialto%NetBSD.org@localhost
HOMEPAGE= http://simh.trailing-edge.com/
@@ -95,6 +95,7 @@ do-install:
(cd ${WRKSRC} && for TXT in *.txt */*.txt; do \
${INSTALL_DATA} "$$TXT" ${DESTDIR}${PREFIX}/share/doc/simh; \
done)
+ rm ${DESTDIR}${PREFIX}/share/doc/simh/CMakeLists.txt
# Note: tests require shm (/var/shm is a tmpfs) for the uc15.
# They are part of the build and can't be run separately.
Index: pkgsrc/emulators/open-simh/distinfo
diff -u pkgsrc/emulators/open-simh/distinfo:1.6 pkgsrc/emulators/open-simh/distinfo:1.7
--- pkgsrc/emulators/open-simh/distinfo:1.6 Thu May 18 19:30:09 2023
+++ pkgsrc/emulators/open-simh/distinfo Sun Jul 23 15:44:25 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2023/05/18 19:30:09 rhialto Exp $
+$NetBSD: distinfo,v 1.7 2023/07/23 15:44:25 rhialto Exp $
-BLAKE2s (open-simh-4.1.0-793149d1bdf6fcdbf9ad54632285e3bd13b9e1c8.tar.gz) = 6fe046ace4cf269ab20ada7f9aaa321aad93a6455f1e9ca390b6c427f92ff79f
-SHA512 (open-simh-4.1.0-793149d1bdf6fcdbf9ad54632285e3bd13b9e1c8.tar.gz) =
a735fc8fa70645e61f945318401ea15ddeab390996d06a4cf0c74fb479dcde87a9e9c5ae0f9f30a9f041885df874f754ec12ecea7e2b6e4a018eda0c6ca8f06a
-Size (open-simh-4.1.0-793149d1bdf6fcdbf9ad54632285e3bd13b9e1c8.tar.gz) = 31601083 bytes
-SHA1 (patch-makefile) = 1958d111733c76b3cb1bff838278ec9cd5313dbf
+BLAKE2s (open-simh-4.1.0-cf47a20fd459d63be6c2e5a4728f2d2a31eaf884.tar.gz) = 786d1e57e30ced7b7f89758f5b997e855c18a3a8e1240e9b94ebc5cc610d23ef
+SHA512 (open-simh-4.1.0-cf47a20fd459d63be6c2e5a4728f2d2a31eaf884.tar.gz) =
a5ab7f531911f3200af4351a117bf7f7d01bb206a6f84d3319e449d35214ac214d9a9f08cd7f734d0c1994e54dec8409ce64615d395897a10cc6102015a5f4c1
+Size (open-simh-4.1.0-cf47a20fd459d63be6c2e5a4728f2d2a31eaf884.tar.gz) = 31207679 bytes
+SHA1 (patch-makefile) = 2feca1d40a5657c3b9f5fe9f2418826abb3163bf
Index: pkgsrc/emulators/open-simh/patches/patch-makefile
diff -u pkgsrc/emulators/open-simh/patches/patch-makefile:1.2 pkgsrc/emulators/open-simh/patches/patch-makefile:1.3
--- pkgsrc/emulators/open-simh/patches/patch-makefile:1.2 Sun Dec 11 20:28:09 2022
+++ pkgsrc/emulators/open-simh/patches/patch-makefile Sun Jul 23 15:44:25 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-makefile,v 1.2 2022/12/11 20:28:09 rhialto Exp $
+$NetBSD: patch-makefile,v 1.3 2023/07/23 15:44:25 rhialto Exp $
Fix png16 detection.
Let INCLUDES and LIBRARIES be the sole source for INCPATH and LIBPATH,
to avoid seeing non-pkgsrc libraries (except MacOS platform).
---- makefile.orig 2022-12-05 17:16:52.000000000 +0000
+--- makefile.orig 2023-07-19 00:13:11.000000000 +0000
+++ makefile
-@@ -366,16 +366,16 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -399,16 +399,16 @@ ifeq (${WIN32},) #*nix Environments (&&
ifeq (Darwin,$(OSTYPE))
OSNAME = OSX
LIBEXT = dylib
@@ -30,7 +30,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
ifeq (HomeBrew,$(or $(shell if ${TEST} -d /usr/local/Cellar; then echo HomeBrew; fi),$(shell if ${TEST} -d /opt/homebrew/Cellar; then echo HomeBrew; fi)))
ifeq (local,$(shell if $(TEST) -d /usr/local/Cellar; then echo local; fi))
-@@ -383,8 +383,8 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -416,8 +416,8 @@ ifeq (${WIN32},) #*nix Environments (&&
else
HBPATH = /opt/homebrew
endif
@@ -41,7 +41,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
else
ifeq (Linux,$(OSTYPE))
-@@ -394,15 +394,15 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -427,15 +427,15 @@ ifeq (${WIN32},) #*nix Environments (&&
ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
ifeq (Android,$(shell uname -o))
ifneq (,$(shell if ${TEST} -d ${PREFIX}/lib; then echo prefixlib; fi))
@@ -61,7 +61,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
endif
LIBSOEXT = so
-@@ -411,7 +411,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -444,7 +444,7 @@ ifeq (${WIN32},) #*nix Environments (&&
ifeq (SunOS,$(OSTYPE))
OSNAME = Solaris
ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
@@ -70,7 +70,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
LIBEXT = so
OS_LDFLAGS += -lsocket -lnsl
-@@ -420,27 +420,27 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -453,27 +453,27 @@ ifeq (${WIN32},) #*nix Environments (&&
OS_CCDEFS += -I/opt/sfw/include
endif
ifeq (libsfw,$(shell if ${TEST} -d /opt/sfw/lib; then echo libsfw; fi))
@@ -106,7 +106,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
else
ifneq (,$(findstring Haiku,$(OSTYPE)))
-@@ -451,9 +451,9 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -484,9 +484,9 @@ ifeq (${WIN32},) #*nix Environments (&&
ifeq ($(HAIKU_ARCH),x86_gcc2)
$(error Unsupported arch x86_gcc2. Run setarch x86 and retry)
endif
@@ -119,7 +119,7 @@ to avoid seeing non-pkgsrc libraries (ex
OS_LDFLAGS += -lnetwork
else
ifeq (,$(findstring NetBSD,$(OSTYPE)))
-@@ -461,7 +461,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -494,7 +494,7 @@ ifeq (${WIN32},) #*nix Environments (&&
LDSEARCH :=$(shell LANG=C; ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')
endif
ifneq (,$(LDSEARCH))
@@ -128,7 +128,7 @@ to avoid seeing non-pkgsrc libraries (ex
else
ifeq (,$(strip $(LPATH)))
$(info *** Warning ***)
-@@ -473,22 +473,22 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -506,22 +506,22 @@ ifeq (${WIN32},) #*nix Environments (&&
$(info *** Warning *** variable.)
$(info *** Warning ***)
else
@@ -159,7 +159,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
ifneq (,$(findstring NetBSD,$(OSTYPE))$(findstring FreeBSD,$(OSTYPE))$(findstring AIX,$(OSTYPE)))
LIBEXT = so
-@@ -515,12 +515,12 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -548,12 +548,12 @@ ifeq (${WIN32},) #*nix Environments (&&
endif
ifeq (,$(filter /lib/,$(LIBPATH)))
ifeq (existlib,$(shell if $(TEST) -d /lib/; then echo existlib; fi))
@@ -174,7 +174,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
endif
export CPATH = $(subst $() $(),:,$(INCPATH))
-@@ -633,9 +633,9 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -666,9 +666,9 @@ ifeq (${WIN32},) #*nix Environments (&&
OS_CCDEFS += -DHAVE_UTIME
endif
ifneq (,$(call find_include,png))
@@ -186,7 +186,7 @@ to avoid seeing non-pkgsrc libraries (ex
$(info using libpng: $(call find_lib,png) $(call find_include,png))
ifneq (,$(call find_include,zlib))
ifneq (,$(call find_lib,z))
-@@ -884,7 +884,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -917,7 +917,7 @@ ifeq (${WIN32},) #*nix Environments (&&
NETWORK_FEATURES = - dynamic networking support using libpcap components from www.tcpdump.org and locally installed libpcap.${LIBEXT}
$(info using libpcap: $(call find_include,pcap))
else
@@ -195,10 +195,10 @@ to avoid seeing non-pkgsrc libraries (ex
LIBEXT = a
ifneq (,$(call find_lib,$(PCAPLIB)))
$(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))
-@@ -1280,15 +1280,15 @@ endif
- OPTIMIZE ?= -O2
+@@ -1315,15 +1315,15 @@ endif
+ OPTIMIZE ?= -O2 -DNDEBUG=1
ifneq ($(DEBUG),)
- CFLAGS_G = -g -ggdb -g3
+ CFLAGS_G = -g -ggdb -g3 -D_DEBUG=1
- CFLAGS_O = -O0
+ CFLAGS_O += -O0
BUILD_FEATURES = - debugging support
Home |
Main Index |
Thread Index |
Old Index