CVS commit: pkgsrc/x11/xmon

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jun 20 11:13:44 UTC 2026

Modified Files:
        pkgsrc/x11/xmon: Makefile distinfo
        pkgsrc/x11/xmon/patches: patch-ab
Added Files:
        pkgsrc/x11/xmon/patches: patch-table11.c

Log Message:
xmon: 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.15 -r1.16 pkgsrc/x11/xmon/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xmon/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/x11/xmon/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xmon/patches/patch-table11.c

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

Modified files:

Index: pkgsrc/x11/xmon/Makefile
diff -u pkgsrc/x11/xmon/Makefile:1.15 pkgsrc/x11/xmon/Makefile:1.16
--- pkgsrc/x11/xmon/Makefile:1.15       Wed Sep  6 10:40:36 2017
+++ pkgsrc/x11/xmon/Makefile    Sat Jun 20 11:13:44 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/09/06 10:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2026/06/20 11:13:44 nia Exp $
 #
 
 DISTNAME=      xmon.1.5.6
@@ -12,6 +12,13 @@ COMMENT=     Interactive X protocol monitor
 
 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/x11/xmon/distinfo
diff -u pkgsrc/x11/xmon/distinfo:1.9 pkgsrc/x11/xmon/distinfo:1.10
--- pkgsrc/x11/xmon/distinfo:1.9        Tue Oct 26 11:34:53 2021
+++ pkgsrc/x11/xmon/distinfo    Sat Jun 20 11:13:44 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:34:53 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/06/20 11:13:44 nia Exp $
 
 BLAKE2s (xmon.1.5.6.tar.gz) = 6f64b012983b6799141360c6f65df560ad81f30f8f46954e280d65559ca2e5af
 SHA512 (xmon.1.5.6.tar.gz) = e9ef12f0a91236d0b2934961b4184a615ec9e56a74d8ad8c71ea4f259977cc7237492c509ef4e0a61c637c06b66620c6fdff932245cb29358b91d12a57bf6ed5
 Size (xmon.1.5.6.tar.gz) = 70564 bytes
-SHA1 (patch-ab) = 2b23ab7d8f9fcc2d627320a2aa23e425365a59ec
+SHA1 (patch-ab) = 49d41c951e0e1ab1656919e0a9606ca9ec6f907c
+SHA1 (patch-table11.c) = 3af14510ec290f0e0866a86c638b2c72ee8361da

Index: pkgsrc/x11/xmon/patches/patch-ab
diff -u pkgsrc/x11/xmon/patches/patch-ab:1.1.1.1 pkgsrc/x11/xmon/patches/patch-ab:1.2
--- pkgsrc/x11/xmon/patches/patch-ab:1.1.1.1    Tue Nov 23 07:42:25 1999
+++ pkgsrc/x11/xmon/patches/patch-ab    Sat Jun 20 11:13:44 2026
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/23 07:42:25 rh Exp $
+$NetBSD: patch-ab,v 1.2 2026/06/20 11:13:44 nia Exp $
 
---- main.c.orig        Fri Feb  7 04:28:15 1997
-+++ main.c     Mon Nov 22 10:24:20 1999
-@@ -35,6 +35,7 @@
+--- main.c.orig        2000-02-03 11:08:48.000000000 +0000
++++ main.c
+@@ -10,9 +10,7 @@
+ #include <sys/types.h>               /* needed by sys/socket.h and netinet/in.h */
+ #include <sys/uio.h>         /* for struct iovec, used by socket.h */
+ #include <sys/socket.h>              /* for AF_INET, SOCK_STREAM, ... */
+-#ifdef AIXV3
+ #include <sys/select.h>        /* for fd_set, ... */
+-#endif
+ #include <sys/ioctl.h>               /* for FIONCLEX, FIONBIO, ... */
+ #if defined(SVR4) && defined(sun)
+ # include <sys/filio.h>              /* for FIONCLEX, etc on Solaris */
+@@ -35,6 +33,7 @@
  #ifdef SYSV
  #include <fcntl.h>
  #endif
@@ -10,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/11/23 0
  
  #include "xmond.h"
  #include "select_args.h"
-@@ -76,7 +77,6 @@
+@@ -76,7 +75,6 @@ extern char *getenv();
  #endif
  
  extern char *getenv();

Added files:

Index: pkgsrc/x11/xmon/patches/patch-table11.c
diff -u /dev/null pkgsrc/x11/xmon/patches/patch-table11.c:1.1
--- /dev/null   Sat Jun 20 11:13:45 2026
+++ pkgsrc/x11/xmon/patches/patch-table11.c     Sat Jun 20 11:13:44 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-table11.c,v 1.1 2026/06/20 11:13:44 nia Exp $
+
+Avoid implicit int, which recent GCC versions no longer like.
+
+--- table11.c.orig     2026-06-20 11:10:50.362786795 +0000
++++ table11.c
+@@ -133,6 +133,8 @@ DefineValues(type, value, length, ctype, name)
+ DefineValues(type, value, length, ctype, name)
+       TYPE type;
+       long    value;
++      int length;
++      int ctype;
+       char   *name;
+ {
+     ValueListEntryType  *p;