CVS commit: pkgsrc/mail/xmailwatcher

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jun 20 10:57:45 UTC 2026

Modified Files:
        pkgsrc/mail/xmailwatcher: Makefile distinfo
        pkgsrc/mail/xmailwatcher/patches: patch-aa patch-ab

Log Message:
xmailwatcher: Fix building with GCC 14 and GCC 15.

This code makes frequent use of K&Risms such as implicit
function declarations, implicit int, etc. Fix a few and
force an older C standard to ensure this keeps building.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/xmailwatcher/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/xmailwatcher/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/mail/xmailwatcher/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/xmailwatcher/patches/patch-ab

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

Modified files:

Index: pkgsrc/mail/xmailwatcher/Makefile
diff -u pkgsrc/mail/xmailwatcher/Makefile:1.16 pkgsrc/mail/xmailwatcher/Makefile:1.17
--- pkgsrc/mail/xmailwatcher/Makefile:1.16      Sat Nov  2 16:25:29 2019
+++ pkgsrc/mail/xmailwatcher/Makefile   Sat Jun 20 10:57:44 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:29 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2026/06/20 10:57:44 nia Exp $
 
 DISTNAME=              xmailwatcher
 PKGNAME=               ${DISTNAME}-1.6
@@ -11,6 +11,13 @@ COMMENT=     Mailbox checker which displays 
 
 USE_IMAKE=             yes
 
+# This is old code that uses K&R style function definitions.
+# Since an evolving C standard is likely to cause compatibility
+# problems with it, we force a "known working" standard. In this
+# case, the minimum bootstrap requirement, and not in strict standard
+# mode to ensure no APIs are hidden.
+FORCE_C_STD=           gnu99
+
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/xmailwatcher/distinfo
diff -u pkgsrc/mail/xmailwatcher/distinfo:1.6 pkgsrc/mail/xmailwatcher/distinfo:1.7
--- pkgsrc/mail/xmailwatcher/distinfo:1.6       Tue Oct 26 10:54:34 2021
+++ pkgsrc/mail/xmailwatcher/distinfo   Sat Jun 20 10:57:44 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:54:34 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/06/20 10:57:44 nia Exp $
 
 BLAKE2s (xmailwatcher.tar.gz) = 28ae4e6f12591642b50eb1893cc0d4ffc3f68af1e3d7bdd673372bc410a520d0
 SHA512 (xmailwatcher.tar.gz) = 28ba32e89b5463e7448c77c07af389570fa81b45fe2f86960c3a638d2e1352bf21243d85a16bd8ae83d93bf247b574faebc8aeee7089937c50fb6fd7a07917dc
 Size (xmailwatcher.tar.gz) = 15393 bytes
-SHA1 (patch-aa) = f9af02cab5c4b3244e1a5ac346b8fff123fcf441
-SHA1 (patch-ab) = d06c810dd30f476c81dc05eda92bb822dd9fc742
+SHA1 (patch-aa) = 4dd9cfe2205d001f8f359b12f1e197715c5fa607
+SHA1 (patch-ab) = 36b66de381c65d83757e0d80a3875ecd451c8b9e

Index: pkgsrc/mail/xmailwatcher/patches/patch-aa
diff -u pkgsrc/mail/xmailwatcher/patches/patch-aa:1.1.1.1 pkgsrc/mail/xmailwatcher/patches/patch-aa:1.2
--- pkgsrc/mail/xmailwatcher/patches/patch-aa:1.1.1.1   Wed Jun 27 18:26:54 2001
+++ pkgsrc/mail/xmailwatcher/patches/patch-aa   Sat Jun 20 10:57:44 2026
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/27 18:26:54 nra Exp $
+$NetBSD: patch-aa,v 1.2 2026/06/20 10:57:44 nia Exp $
 
---- box.c.orig Sat Feb  3 18:13:00 2001
-+++ box.c      Sat Feb  3 18:13:50 2001
-@@ -31,7 +31,7 @@
+--- box.c.orig 1999-11-01 15:12:32.000000000 +0000
++++ box.c
+@@ -28,10 +28,12 @@ purpose.  It is provided "as is" without express or im
+ #include "box.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <ctype.h>
  #include <unistd.h>
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -11,7 +16,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/27 1
  #include <X11/Xos.h>
  
  /* MIME processing */
-@@ -235,7 +235,7 @@
+@@ -235,7 +237,7 @@ static int MHparseMailbox(char *mailbox, char *buffer,
        int n, i, tally;
        char oneFrom[160];
        char *pos;

Index: pkgsrc/mail/xmailwatcher/patches/patch-ab
diff -u pkgsrc/mail/xmailwatcher/patches/patch-ab:1.1 pkgsrc/mail/xmailwatcher/patches/patch-ab:1.2
--- pkgsrc/mail/xmailwatcher/patches/patch-ab:1.1       Tue Sep 30 14:13:11 2008
+++ pkgsrc/mail/xmailwatcher/patches/patch-ab   Sat Jun 20 10:57:44 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2008/09/30 14:13:11 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2026/06/20 10:57:44 nia Exp $
 
---- xmailwatcher.c.orig        2008-09-30 16:09:35.000000000 +0200
+--- xmailwatcher.c.orig        1999-08-24 09:02:29.000000000 +0000
 +++ xmailwatcher.c
-@@ -47,6 +47,7 @@ purpose.  It is provided "as is" without
+@@ -47,6 +47,7 @@ purpose.  It is provided "as is" without express or im
  #define BUFFER_DEFAULT 32000
  
  #include <stdio.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.1 2008/09/30 14:13
  
  typedef struct _Resources {
        int     pollInterval;
-@@ -149,7 +150,7 @@ static XtConvertArgRec screenConvertArg[
+@@ -149,7 +150,7 @@ void iconEvent();
  void timedRescan();
  void listEvent();
  void iconEvent();
@@ -19,7 +19,15 @@ $NetBSD: patch-ab,v 1.1 2008/09/30 14:13
  
  static int mapped;
  
-@@ -361,12 +362,11 @@ XtPointer client_data, call_data;
+@@ -164,6 +165,7 @@ static Widget iconLabel;
+ static Widget mailWatchIcon;
+ static Widget iconLabel;
+ 
++int
+ main(argc, argv)
+ int argc;
+ char **argv;
+@@ -361,12 +363,11 @@ XtPointer client_data, call_data;
        }
  }