CVS commit: pkgsrc/games/xsokoban

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Fri Oct  2 05:04:03 UTC 2026

Modified Files:
        pkgsrc/games/xsokoban: distinfo
        pkgsrc/games/xsokoban/patches: patch-ad

Log Message:
Make this build with gcc 14


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/xsokoban/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/games/xsokoban/patches/patch-ad

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

Modified files:

Index: pkgsrc/games/xsokoban/distinfo
diff -u pkgsrc/games/xsokoban/distinfo:1.6 pkgsrc/games/xsokoban/distinfo:1.7
--- pkgsrc/games/xsokoban/distinfo:1.6  Mon Dec  1 10:13:03 2025
+++ pkgsrc/games/xsokoban/distinfo      Fri Oct  2 05:04:03 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2025/12/01 10:13:03 martin Exp $
+$NetBSD: distinfo,v 1.7 2026/10/02 05:04:03 martin Exp $
 
 BLAKE2s (xsokoban-3.3c.tar.gz) = 55ca636a989421320ef4f7516854b83df5ebbc90d740595dd8646a74e35007aa
 SHA512 (xsokoban-3.3c.tar.gz) = b3f4a42697fa663515e6cfe8ac707e282e77380342b835f61067b0cf7032738d7ea05333d890486a3ec3f3299aacbcff6e42914908ed915e34e79d386d432fe2
@@ -6,7 +6,7 @@ Size (xsokoban-3.3c.tar.gz) = 98961 byte
 SHA1 (patch-aa) = ba21be16ffdf2640014a2a91a4e042bee3660cfc
 SHA1 (patch-ab) = cf4712f5490e992c3ce484c911ea5278d9fcfc62
 SHA1 (patch-ac) = eeaa85eb12c473b2703b55b1602eae4c89639a0f
-SHA1 (patch-ad) = 2338d0e6afac7709abfe55eb57e809247d42b6f1
+SHA1 (patch-ad) = 4211b390555d63104934f9dbd9ec973f6210e6f0
 SHA1 (patch-ae) = 234e46167bf5b3786462488c99bf10de60736452
 SHA1 (patch-af) = 43b4abe82c6cb7d51ad65e3eb1ef05fc345916a4
 SHA1 (patch-ag) = 77a33b22e071637377e25636dd2df8ec45ac9d1e

Index: pkgsrc/games/xsokoban/patches/patch-ad
diff -u pkgsrc/games/xsokoban/patches/patch-ad:1.1.1.1 pkgsrc/games/xsokoban/patches/patch-ad:1.2
--- pkgsrc/games/xsokoban/patches/patch-ad:1.1.1.1      Wed Apr  8 16:31:56 2009
+++ pkgsrc/games/xsokoban/patches/patch-ad      Fri Oct  2 05:04:03 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2026/10/02 05:04:03 martin Exp $
 
---- main.c.orig        1996-07-03 16:56:06.000000000 +0300
-+++ main.c
-@@ -47,7 +47,7 @@ static struct passwd *pwd;
+--- main.c.orig        1996-07-03 15:56:06.000000000 +0200
++++ main.c     2026-10-01 22:45:17.326977116 +0200
+@@ -47,7 +47,7 @@
  static int movelen;
  /* Length of the verified move sequence waiting on stdin if -v is used */
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/04/08 1
  {
    short ret = 0;
  
-@@ -93,7 +93,7 @@ void main(int argc, char **argv)
+@@ -93,7 +93,7 @@
      }
  #endif
      /* see if we are the owner */
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/04/08 1
      if (ret == 0) {
        if (opt_show_score) {
        DEBUG_SERVER("sending score file");
-@@ -106,9 +106,9 @@ void main(int argc, char **argv)
+@@ -106,9 +106,9 @@
        } else if (opt_make_score) {
        if (owner) {
          /* make sure of that, shall we? */
@@ -33,3 +33,21 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/04/08 1
        } else
          /* sorry, BAD owner */
          ret = E_NOSUPER;
+@@ -365,7 +365,7 @@
+     ret = ReadScreen();
+     if (ret) return ret;
+     if (Verify(movelen, moveseq)) {
+-      ret = Score(_false_);
++      ret = Score();
+       scorelevel = 0; /* don't score again */
+       if (ret == 0) ret = E_ENDGAME;
+     } else {
+@@ -400,7 +400,7 @@
+       ret = Play();
+       if ((scorelevel > 0) && scoring) {
+           int ret2;
+-          ret2 = Score(_false_);
++          ret2 = Score();
+           Error(ret2);
+           scorelevel = 0;
+       }