CVS commit: pkgsrc/wm/tvtwm

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Dec 18 13:12:06 UTC 2025

Modified Files:
        pkgsrc/wm/tvtwm: distinfo
        pkgsrc/wm/tvtwm/patches: patch-as patch-av

Log Message:
tvtwm: Fix build with recent gcc versions.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/wm/tvtwm/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/wm/tvtwm/patches/patch-as \
    pkgsrc/wm/tvtwm/patches/patch-av

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

Modified files:

Index: pkgsrc/wm/tvtwm/distinfo
diff -u pkgsrc/wm/tvtwm/distinfo:1.9 pkgsrc/wm/tvtwm/distinfo:1.10
--- pkgsrc/wm/tvtwm/distinfo:1.9        Tue Oct 26 11:25:19 2021
+++ pkgsrc/wm/tvtwm/distinfo    Thu Dec 18 13:12:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:25:19 nia Exp $
+$NetBSD: distinfo,v 1.10 2025/12/18 13:12:06 nia Exp $
 
 BLAKE2s (tvtwm.pl11.tar.gz) = 4656fbe952cab3601aa480fd778afff340e39660e7aa5c706aaae7650617127f
 SHA512 (tvtwm.pl11.tar.gz) = a754b4bc0307116d3c86b7f159bab47ff4cceb190567db793b9be61963280dd22050fa0041f60d394ca55d190dad92ba9a2859e592b05f25952592943ed59fa0
@@ -19,10 +19,10 @@ SHA1 (patch-ao) = 033a8c45601fb0804f365a
 SHA1 (patch-ap) = 2e5f81e4c586949f3c43ecdb09bf7463adc19dce
 SHA1 (patch-aq) = 171a4fbcf7a79608e77db8f8f925c80ca91167d2
 SHA1 (patch-ar) = d00034f3db33f5a01a855fccca1b22f3281829d2
-SHA1 (patch-as) = 05276c93e34536501a8cdf1d45b36c933bd67e91
+SHA1 (patch-as) = 1d25ec1c05aaca1635186e0401767f6ba819a165
 SHA1 (patch-at) = e697bb60cb7221f27dee7c26e8074608fbc02d06
 SHA1 (patch-au) = a42099d13320fcd89d748a7cc2b15c4ace84a10c
-SHA1 (patch-av) = d3c41a657780cfa1aba040206d8ac9e9c062147f
+SHA1 (patch-av) = f582b61e07cf46e779bab615928f9a84d0d28e6b
 SHA1 (patch-aw) = 0514ac63e1c1ffdb789309bd390847f683c9d267
 SHA1 (patch-ax) = 81b4be39b9bb54e1c1d23761177ef982ce1bbed0
 SHA1 (patch-ay) = 2f8cda02d1002d3c313bc92cec082cd37593395c

Index: pkgsrc/wm/tvtwm/patches/patch-as
diff -u pkgsrc/wm/tvtwm/patches/patch-as:1.1.1.1 pkgsrc/wm/tvtwm/patches/patch-as:1.2
--- pkgsrc/wm/tvtwm/patches/patch-as:1.1.1.1    Tue Dec 12 02:03:49 2000
+++ pkgsrc/wm/tvtwm/patches/patch-as    Thu Dec 18 13:12:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-as,v 1.2 2025/12/18 13:12:06 nia Exp $
 
 Index: regexp.c
 ===================================================================
@@ -6,21 +6,34 @@ RCS file: /home/siren/src/tvtwm/regexp.c
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- regexp.c   1999/08/08 05:46:53     1.1.1.1
-+++ regexp.c   1999/08/08 05:56:56     1.2
-@@ -25,14 +25,13 @@
- #ifndef       FILE
+--- regexp.c.orig      1993-01-25 18:24:30.000000000 +0000
++++ regexp.c
+@@ -22,9 +22,9 @@
+  * precedence is structured in regular expressions.  Serious changes in
+  * regular-expression syntax might require a total rethink.
+  */
+-#ifndef       FILE
++#include <stdlib.h>
  #include <stdio.h>
- #endif  /* FILE */
+-#endif  /* FILE */
 +#include <strings.h>
  #ifndef       NSUBEXP
  #include "regexp.h"
  #endif  /* NSUBEXP */
- #ifndef       MAGIC
+@@ -32,8 +32,6 @@
  #include "regmagic.h"
  #endif  /* MAGIC */
--
--extern char *strchr();
  
+-extern char *strchr();
+-
  /*
   * The "internal use only" fields in regexp.h are present to pass info from
+  * compile to execute that permits the execute phase to run lots faster on
+@@ -203,7 +201,6 @@ char *exp;
+       register char *longest;
+       register int len;
+       int flags;
+-      extern char *malloc();
+ 
+       if (exp == NULL)
+               FAIL("NULL argument");
Index: pkgsrc/wm/tvtwm/patches/patch-av
diff -u pkgsrc/wm/tvtwm/patches/patch-av:1.1.1.1 pkgsrc/wm/tvtwm/patches/patch-av:1.2
--- pkgsrc/wm/tvtwm/patches/patch-av:1.1.1.1    Tue Dec 12 02:03:49 2000
+++ pkgsrc/wm/tvtwm/patches/patch-av    Thu Dec 18 13:12:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-av,v 1.2 2025/12/18 13:12:06 nia Exp $
 
 Index: ssetroot.c
 ===================================================================
@@ -6,15 +6,16 @@ RCS file: /home/siren/src/tvtwm/ssetroot
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- ssetroot.c 1999/08/08 05:46:52     1.1.1.1
-+++ ssetroot.c 1999/08/08 05:56:58     1.2
-@@ -37,11 +37,21 @@
+--- ssetroot.c.orig    1992-05-02 20:41:39.000000000 +0000
++++ ssetroot.c
+@@ -37,11 +37,22 @@
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
  #include <X11/Xatom.h>
 +#include <X11/Xmu/CurUtil.h>
  #include <stdio.h>
 +#include <stdlib.h>
++#include <string.h>
  #include "X11/bitmaps/gray"
  #include "X11/bitmaps/root_weave"
  
@@ -30,7 +31,7 @@ diff -u -r1.1.1.1 -r1.2
  
  #define Dynamic 1
  
-@@ -58,6 +68,7 @@
+@@ -58,6 +69,7 @@ Pixmap save_pixmap = (Pixmap)None;
  int unsave_past = 0;
  Pixmap save_pixmap = (Pixmap)None;
  
@@ -38,7 +39,7 @@ diff -u -r1.1.1.1 -r1.2
  usage()
  {
      fprintf(stderr, "usage: %s [options]\n", program_name);
-@@ -79,11 +90,8 @@
+@@ -79,11 +91,8 @@ usage()
      /*NOTREACHED*/
  }
  
@@ -51,7 +52,7 @@ diff -u -r1.1.1.1 -r1.2
  main(argc, argv) 
      int argc;
      char **argv;
-@@ -310,6 +318,7 @@
+@@ -310,6 +319,7 @@ main(argc, argv) 
  
  
  /* Free past incarnation if needed, and retain state if needed. */
@@ -59,7 +60,7 @@ diff -u -r1.1.1.1 -r1.2
  FixupState()
  {
      Atom prop, type;
-@@ -345,6 +354,7 @@
+@@ -345,6 +355,7 @@ FixupState()
   * SetBackgroundToBitmap: Set the root window background to a caller supplied 
   *                        bitmap.
   */
@@ -67,7 +68,7 @@ diff -u -r1.1.1.1 -r1.2
  SetBackgroundToBitmap(bitmap, width, height)
      Pixmap bitmap;
      unsigned int width, height;
-@@ -382,6 +392,7 @@
+@@ -382,6 +393,7 @@ SetBackgroundToBitmap(bitmap, width, height)
   */
  #define BITMAP_HOT_DEFAULT 8