CVS commit: pkgsrc/emulators/ski

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Oct 12 02:03:10 UTC 2025

Modified Files:
        pkgsrc/emulators/ski: distinfo
        pkgsrc/emulators/ski/patches: patch-ak patch-al patch-ao

Log Message:
minor updates needed for GCC 14.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/ski/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/ski/patches/patch-ak \
    pkgsrc/emulators/ski/patches/patch-al \
    pkgsrc/emulators/ski/patches/patch-ao

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/ski/distinfo
diff -u pkgsrc/emulators/ski/distinfo:1.10 pkgsrc/emulators/ski/distinfo:1.11
--- pkgsrc/emulators/ski/distinfo:1.10  Tue Oct 26 10:24:00 2021
+++ pkgsrc/emulators/ski/distinfo       Sun Oct 12 02:03:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:24:00 nia Exp $
+$NetBSD: distinfo,v 1.11 2025/10/12 02:03:10 mrg Exp $
 
 BLAKE2s (ski-1.3.2.tar.gz) = b6f884bd201aa36eba59b6130ed5cadd631c9930101a2c7a5cc4521c57cb6792
 SHA512 (ski-1.3.2.tar.gz) = 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
@@ -14,11 +14,11 @@ SHA1 (patch-ag) = 973a8f5c1cc5cc36bb8aa1
 SHA1 (patch-ah) = 31e4807b546c69aa43c7bddc4f16ba3b99d8da3e
 SHA1 (patch-ai) = 97c4b6f2ed49ea7668d8fbc789ea46f31c8ee1b1
 SHA1 (patch-aj) = c2ac0b850381d2fee3b3f7846cf3aeb51d8e8245
-SHA1 (patch-ak) = 0abaa09fb172ebbc8715908f5c6f49936b22aefa
-SHA1 (patch-al) = 1911d6c8e051ab2b64055cf1c64856188268619e
+SHA1 (patch-ak) = 682339642ac0027111f4d8dde1e3f9d268c68cda
+SHA1 (patch-al) = e188d312205662f6676c88db150d913c6d39a00c
 SHA1 (patch-am) = 0965936933424ab4af4d1fa3384808f4e92f9b04
 SHA1 (patch-an) = 0d84833e0e16a779c60b9152f91cf6df897af1fc
-SHA1 (patch-ao) = 8f2eabd4d8dc6ccef593a5f50d00485a905ee523
+SHA1 (patch-ao) = d13d7de1e5c2f10db3cfefd36b457a2449c977bd
 SHA1 (patch-ap) = a98cd0aa55a002020c26fb70e5549bd16270bf39
 SHA1 (patch-src-line_separator.h) = 2c9b0c2fdace6bc59735cbeb9588aea21b19b1db
 SHA1 (patch-src_eparse.y) = c82918d36047e51273cc1aa0e20a4ce1649668f5

Index: pkgsrc/emulators/ski/patches/patch-ak
diff -u pkgsrc/emulators/ski/patches/patch-ak:1.1.1.1 pkgsrc/emulators/ski/patches/patch-ak:1.2
--- pkgsrc/emulators/ski/patches/patch-ak:1.1.1.1       Wed Jul 27 10:23:49 2011
+++ pkgsrc/emulators/ski/patches/patch-ak       Sun Oct 12 02:03:10 2025
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1.1.1 2011/07/27 10:23:49 cherry Exp $
+$NetBSD: patch-ak,v 1.2 2025/10/12 02:03:10 mrg Exp $
 
---- src/netbsd/osload-netbsd.c.orig    2009-12-16 12:47:32.000000000 +0000
-+++ src/netbsd/osload-netbsd.c
+--- src/netbsd/osload-netbsd.c.orig    2025-10-11 18:33:53.082611433 -0700
++++ src/netbsd/osload-netbsd.c 2025-10-11 18:38:42.338010157 -0700
 @@ -0,0 +1,233 @@
 +/*
 + * Copyright (C) 1995-2007, Hewlett-Packard Development Company, L.P.
@@ -224,7 +224,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2011/07/27 1
 +              AUX(sp, AT_PHDR, proc->phdr_addr);
 +              AUX(sp, AT_PHENT, sizeof(Elf64_Phdr));
 +              AUX(sp, AT_PHNUM, proc->phdr_count);
-+              AUX(sp, AT_NULL, NULL);
++              AUX(sp, AT_NULL, 0);
 +      }
 +
 +      /* Copy out ps_strings. */
Index: pkgsrc/emulators/ski/patches/patch-al
diff -u pkgsrc/emulators/ski/patches/patch-al:1.1.1.1 pkgsrc/emulators/ski/patches/patch-al:1.2
--- pkgsrc/emulators/ski/patches/patch-al:1.1.1.1       Wed Jul 27 10:23:49 2011
+++ pkgsrc/emulators/ski/patches/patch-al       Sun Oct 12 02:03:10 2025
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1.1.1 2011/07/27 10:23:49 cherry Exp $
+$NetBSD: patch-al,v 1.2 2025/10/12 02:03:10 mrg Exp $
 
---- src/netbsd/signal-netbsd.c.orig    2009-12-16 12:47:32.000000000 +0000
-+++ src/netbsd/signal-netbsd.c
+--- src/netbsd/signal-netbsd.c.orig    2025-10-11 18:33:53.088993767 -0700
++++ src/netbsd/signal-netbsd.c 2025-10-11 18:42:36.295252290 -0700
 @@ -0,0 +1,171 @@
 +/*
 + * Copyright (C) 1995-2007, Hewlett-Packard Development Company, L.P.
@@ -98,7 +98,7 @@ $NetBSD: patch-al,v 1.1.1.1 2011/07/27 1
 +      sigaddset(&sigpend, sig);
 +      si64 = &siginfo[sig - 1].info;
 +      memset(si64, 0, sizeof(*si64));
-+      si64->si_addr = ifa; /* XXX: normalise pointers to ptr64_t */
++      si64->si_addr = (void *)ifa; /* XXX: normalise pointers to ptr64_t */
 +}
 +
 +static void signal_handler(int sig, siginfo_t *si, void *uc)
@@ -122,7 +122,7 @@ $NetBSD: patch-al,v 1.1.1.1 2011/07/27 1
 +      si64->si_pid = si->si_pid;
 +      si64->si_uid = si->si_uid;
 +      si64->si_status = si->si_status;
-+      si64->si_addr = (long)si->si_addr;
++      si64->si_addr = (void *)(uintptr_t)si->si_addr;
 +      si64->si_value.sival_ptr = si->si_value.sival_ptr;
 +      si64->si_band = si->si_band;
 +}
Index: pkgsrc/emulators/ski/patches/patch-ao
diff -u pkgsrc/emulators/ski/patches/patch-ao:1.1.1.1 pkgsrc/emulators/ski/patches/patch-ao:1.2
--- pkgsrc/emulators/ski/patches/patch-ao:1.1.1.1       Wed Jul 27 10:23:50 2011
+++ pkgsrc/emulators/ski/patches/patch-ao       Sun Oct 12 02:03:10 2025
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1.1.1 2011/07/27 10:23:50 cherry Exp $
+$NetBSD: patch-ao,v 1.2 2025/10/12 02:03:10 mrg Exp $
 
---- src/netbsd/syscall-netbsd.c.orig   2010-06-09 19:58:06.000000000 +0530
-+++ src/netbsd/syscall-netbsd.c
+--- src/netbsd/syscall-netbsd.c.orig   2025-10-11 18:43:39.841401055 -0700
++++ src/netbsd/syscall-netbsd.c        2025-10-11 18:50:40.116005946 -0700
 @@ -0,0 +1,662 @@
 +/*
 + * Copyright (C) 1995-2007, Hewlett-Packard Development Company, L.P.
@@ -166,7 +166,7 @@ $NetBSD: patch-ao,v 1.1.1.1 2011/07/27 1
 +      *status = 0;
 +
 +      /* syscalls and user space support not available for NetBSD */
-+      ret = ENOSYS;
++      *ret = ENOSYS;
 +      goto out;
 +
 +#if 0