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: Thu Oct 3 12:42:53 UTC 2024
Modified Files:
pkgsrc/emulators/open-simh: Makefile distinfo
pkgsrc/emulators/open-simh/patches: patch-makefile
Log Message:
emulators/open-simh: update to 2024 09 04.
Notable changes:
AltairZ80: Adds "rom" option to "load -h"
sigma: Update latest from Bob Supnik's v3.12-5
PDP11: RP11: Implement original RP11 controller flavor
VAX: Mask QBus addresses to 22 bits for ka630/ka65x
Mask adapter channel from buffer address for QBus accesses
Mask QBus addresses to 22 bits
AltairZ80: Adds CUTER PROM to SOL20 device
AltairZ80: Fix 8080 and Z80 CPU
PDP11: Fix to fix disassembly #331
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/open-simh/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/open-simh/distinfo
cvs rdiff -u -r1.3 -r1.4 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.19 pkgsrc/emulators/open-simh/Makefile:1.20
--- pkgsrc/emulators/open-simh/Makefile:1.19 Fri Jun 14 19:17:57 2024
+++ pkgsrc/emulators/open-simh/Makefile Thu Oct 3 12:42:53 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2024/06/14 19:17:57 rhialto Exp $
+# $NetBSD: Makefile,v 1.20 2024/10/03 12:42:53 rhialto Exp $
DISTNAME= open-simh-4.1.0
-PKGNAME= open-simh-4.1.0.20240608
+PKGNAME= open-simh-4.1.0.20240904
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=open-simh/}
GITHUB_PROJECT= simh
-GITHUB_TAG= c6b9402f8c994f41f5849a8ef9d2ce39f45caac3
+GITHUB_TAG= 2437b13fb1602416dda7886f2023ffdf1f175880
MAINTAINER= rhialto%NetBSD.org@localhost
HOMEPAGE= http://simh.trailing-edge.com/
Index: pkgsrc/emulators/open-simh/distinfo
diff -u pkgsrc/emulators/open-simh/distinfo:1.10 pkgsrc/emulators/open-simh/distinfo:1.11
--- pkgsrc/emulators/open-simh/distinfo:1.10 Fri Jun 14 19:17:57 2024
+++ pkgsrc/emulators/open-simh/distinfo Thu Oct 3 12:42:53 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2024/06/14 19:17:57 rhialto Exp $
+$NetBSD: distinfo,v 1.11 2024/10/03 12:42:53 rhialto Exp $
-BLAKE2s (open-simh-4.1.0-c6b9402f8c994f41f5849a8ef9d2ce39f45caac3.tar.gz) = cfde94ec5bd2482293549e43da287a793e6f940feccd7fc022bfa4415aaf3d63
-SHA512 (open-simh-4.1.0-c6b9402f8c994f41f5849a8ef9d2ce39f45caac3.tar.gz) =
98b53d1bea7d5dfb5f8b61b58b44931982a771c09536d9b8b7f919a0f329740f713c8d9659631c05cc79fad8f13e0bd47a24939f83021ebfa56246f41fb07757
-Size (open-simh-4.1.0-c6b9402f8c994f41f5849a8ef9d2ce39f45caac3.tar.gz) = 31334403 bytes
-SHA1 (patch-makefile) = 2feca1d40a5657c3b9f5fe9f2418826abb3163bf
+BLAKE2s (open-simh-4.1.0-2437b13fb1602416dda7886f2023ffdf1f175880.tar.gz) = b0bfa38f278fb28919d48f9bc866190f587282e4bb5a6af81a41c3044fabec99
+SHA512 (open-simh-4.1.0-2437b13fb1602416dda7886f2023ffdf1f175880.tar.gz) =
a8f6ec8669cb45c2240484439cfb23c355b9d3b1b7da5f49e8b101ae3eb771773a1a6d2371225a0c673032a8e4253f3121a9e93d039105c83f97d4baf0075a7d
+Size (open-simh-4.1.0-2437b13fb1602416dda7886f2023ffdf1f175880.tar.gz) = 31347647 bytes
+SHA1 (patch-makefile) = 62e27e8d946ec9484f1d928c0b3ed4bb67562803
Index: pkgsrc/emulators/open-simh/patches/patch-makefile
diff -u pkgsrc/emulators/open-simh/patches/patch-makefile:1.3 pkgsrc/emulators/open-simh/patches/patch-makefile:1.4
--- pkgsrc/emulators/open-simh/patches/patch-makefile:1.3 Sun Jul 23 15:44:25 2023
+++ pkgsrc/emulators/open-simh/patches/patch-makefile Thu Oct 3 12:42:53 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-makefile,v 1.3 2023/07/23 15:44:25 rhialto Exp $
+$NetBSD: patch-makefile,v 1.4 2024/10/03 12:42:53 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 2023-07-19 00:13:11.000000000 +0000
+--- makefile.orig 2024-09-05 21:21:41.000000000 +0000
+++ makefile
-@@ -399,16 +399,16 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -404,16 +404,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))
-@@ -416,8 +416,8 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -421,8 +421,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))
-@@ -427,15 +427,15 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -432,15 +432,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
-@@ -444,7 +444,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -449,7 +449,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
-@@ -453,27 +453,27 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -458,27 +458,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)))
-@@ -484,9 +484,9 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -489,9 +489,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)))
-@@ -494,7 +494,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -499,7 +499,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 ***)
-@@ -506,22 +506,22 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -511,22 +511,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
-@@ -548,12 +548,12 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -553,12 +553,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))
-@@ -666,9 +666,9 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -671,10 +671,10 @@ ifeq (${WIN32},) #*nix Environments (&&
OS_CCDEFS += -DHAVE_UTIME
endif
ifneq (,$(call find_include,png))
@@ -182,11 +182,13 @@ to avoid seeing non-pkgsrc libraries (ex
+ ifneq (,$(call find_lib,png16))
OS_CCDEFS += -DHAVE_LIBPNG
- OS_LDFLAGS += -lpng
+- $(info using libpng: $(call find_lib,png) $(call find_include,png))
+ OS_LDFLAGS += -lpng16
- $(info using libpng: $(call find_lib,png) $(call find_include,png))
- ifneq (,$(call find_include,zlib))
- ifneq (,$(call find_lib,z))
-@@ -917,7 +917,7 @@ ifeq (${WIN32},) #*nix Environments (&&
++ $(info using libpng: $(call find_lib,png16) $(call find_include,png))
+ endif
+ endif
+ ifneq (,$(call find_include,zlib))
+@@ -922,7 +922,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,7 +197,7 @@ 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))
-@@ -1315,15 +1315,15 @@ endif
+@@ -1322,15 +1322,15 @@ endif
OPTIMIZE ?= -O2 -DNDEBUG=1
ifneq ($(DEBUG),)
CFLAGS_G = -g -ggdb -g3 -D_DEBUG=1
@@ -212,5 +214,5 @@ to avoid seeing non-pkgsrc libraries (ex
- CFLAGS_O := $(OPTIMIZE)
+ CFLAGS_O += $(OPTIMIZE)
endif
- LDFLAGS_O =
+ LDFLAGS_O =
GCC_MAJOR_VERSION = $(firstword $(subst ., ,$(GCC_VERSION)))
Home |
Main Index |
Thread Index |
Old Index