CVS commit: pkgsrc/emulators/open-simh

["Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Mon Mar  3 14:34:02 UTC 2025

Modified Files:
        pkgsrc/emulators/open-simh: Makefile distinfo
        pkgsrc/emulators/open-simh/patches: patch-makefile

Log Message:
Fix open-simh networking on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/emulators/open-simh/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/open-simh/distinfo
cvs rdiff -u -r1.4 -r1.5 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.23 pkgsrc/emulators/open-simh/Makefile:1.24
--- pkgsrc/emulators/open-simh/Makefile:1.23    Wed Feb 12 06:44:45 2025
+++ pkgsrc/emulators/open-simh/Makefile Mon Mar  3 14:34:01 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2025/02/12 06:44:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2025/03/03 14:34:01 jakllsch Exp $
 
 DISTNAME=      open-simh-4.1.0
 PKGNAME=       open-simh-4.1.0.20250117
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=open-simh/}
 GITHUB_PROJECT=        simh
@@ -81,6 +81,7 @@ MAKE_ENV+=            OS_LDFLAGS=${LDFLAGS:Q}
 MAKE_ENV+=             CFLAGS_O=${CFLAGS_O:Q}
 MAKE_ENV+=             FONTPATH=${PREFIX}/share/fonts/X11/TTF
 MAKE_ENV+=             WARNINGS=ALLOWED
+MAKE_ENV+=             USE_NETWORK=1
 
 BUILD_MAKE_FLAGS=      TESTS=0
 

Index: pkgsrc/emulators/open-simh/distinfo
diff -u pkgsrc/emulators/open-simh/distinfo:1.12 pkgsrc/emulators/open-simh/distinfo:1.13
--- pkgsrc/emulators/open-simh/distinfo:1.12    Fri Jan 31 17:50:23 2025
+++ pkgsrc/emulators/open-simh/distinfo Mon Mar  3 14:34:01 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2025/01/31 17:50:23 rhialto Exp $
+$NetBSD: distinfo,v 1.13 2025/03/03 14:34:01 jakllsch Exp $
 
 BLAKE2s (open-simh-4.1.0-feb155fbc49333e879ab082d481e6dcce27d2d91.tar.gz) = 0c052ae722f3716a7ecb2153f03fa34e1cc99e7e639e9b1db05b71cd8769cbbb
 SHA512 (open-simh-4.1.0-feb155fbc49333e879ab082d481e6dcce27d2d91.tar.gz) = 
94c5b6ffd3f57c0b03988591013a9cc6d19fef05211209bb307c64c152b43427c30a0a392acc2a1073f002f9a84343d9f8a97dd82d0e477281b74f980b602561
 Size (open-simh-4.1.0-feb155fbc49333e879ab082d481e6dcce27d2d91.tar.gz) = 31352161 bytes
-SHA1 (patch-makefile) = 62e27e8d946ec9484f1d928c0b3ed4bb67562803
+SHA1 (patch-makefile) = 8931c3af3906039d0e6f45a60845fcf8f70e56ea

Index: pkgsrc/emulators/open-simh/patches/patch-makefile
diff -u pkgsrc/emulators/open-simh/patches/patch-makefile:1.4 pkgsrc/emulators/open-simh/patches/patch-makefile:1.5
--- pkgsrc/emulators/open-simh/patches/patch-makefile:1.4       Thu Oct  3 12:42:53 2024
+++ pkgsrc/emulators/open-simh/patches/patch-makefile   Mon Mar  3 14:34:01 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-makefile,v 1.4 2024/10/03 12:42:53 rhialto Exp $
+$NetBSD: patch-makefile,v 1.5 2025/03/03 14:34:01 jakllsch 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      2024-09-05 21:21:41.000000000 +0000
+--- makefile.orig      2025-01-17 21:35:53.000000000 +0000
 +++ makefile
 @@ -404,16 +404,16 @@ ifeq (${WIN32},)  #*nix Environments (&&
      ifeq (Darwin,$(OSTYPE))
@@ -188,6 +188,15 @@ to avoid seeing non-pkgsrc libraries (ex
      endif
    endif
    ifneq (,$(call find_include,zlib))
+@@ -867,7 +867,7 @@ ifeq (${WIN32},)  #*nix Environments (&&
+             $(info *** Error *** Support for linking statically has been removed on the $(OSTYPE))
+             $(info *** Error *** platform.)
+             $(info *** Error ***)
+-            $(error Retry your build without specifying USE_NETWORK=1)
++            #$(error Retry your build without specifying USE_NETWORK=1)
+           endif
+           ifeq (cygwin,$(OSTYPE))
+             # cygwin has no ldconfig so explicitly specify pcap object library
 @@ -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))