CVS commit: pkgsrc/x11/xbanner

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 23 10:50:44 UTC 2026

Modified Files:
        pkgsrc/x11/xbanner: distinfo
Added Files:
        pkgsrc/x11/xbanner/patches: patch-freetemp.c patch-xb__check.c
            patch-xb__config.h

Log Message:
xbanner: Various build fixes.

PKGREVISION bumped because this contains a gets -> fgets change,
it's so bad that some operating systems have removed it from libc.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xbanner/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xbanner/patches/patch-freetemp.c \
    pkgsrc/x11/xbanner/patches/patch-xb__check.c \
    pkgsrc/x11/xbanner/patches/patch-xb__config.h

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

Modified files:

Index: pkgsrc/x11/xbanner/distinfo
diff -u pkgsrc/x11/xbanner/distinfo:1.8 pkgsrc/x11/xbanner/distinfo:1.9
--- pkgsrc/x11/xbanner/distinfo:1.8     Tue Oct 26 11:34:33 2021
+++ pkgsrc/x11/xbanner/distinfo Mon Mar 23 10:50:44 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:34:33 nia Exp $
+$NetBSD: distinfo,v 1.9 2026/03/23 10:50:44 nia Exp $
 
 BLAKE2s (XBanner1.31.tar.gz) = 7ec4df19f346398313a1475a41c0161d2ef415142e9d54f906fcf58128d4be50
 SHA512 (XBanner1.31.tar.gz) = 86adc2985c86943262b326618bcc0ae4f9234a1a78ef525e2936ec2909f7076795e0aacd6c03a94401a6db55efefde35b43118c26329345488be57f5ad08cb11
@@ -13,3 +13,6 @@ SHA1 (patch-ag) = c4ab7f4cda4e2c3f9c3452
 SHA1 (patch-ah) = 482fbcf6a6bc28558f1797599980cbf3d4b1e909
 SHA1 (patch-ai) = e947acbbbace4f216fec399abc786fb600242dbb
 SHA1 (patch-aj) = 799e52cf3cbe411625dbed8b60d7d8177265954c
+SHA1 (patch-freetemp.c) = 89dc267207a4a9f4b77e007c1d18cea42d73435f
+SHA1 (patch-xb__check.c) = 1f444f85a054194f1c7398d14f3d3261a3ef7b6b
+SHA1 (patch-xb__config.h) = 481fa97961d534a85cb556acb3f11f67c88c778c

Added files:

Index: pkgsrc/x11/xbanner/patches/patch-freetemp.c
diff -u /dev/null pkgsrc/x11/xbanner/patches/patch-freetemp.c:1.1
--- /dev/null   Mon Mar 23 10:50:44 2026
+++ pkgsrc/x11/xbanner/patches/patch-freetemp.c Mon Mar 23 10:50:44 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-freetemp.c,v 1.1 2026/03/23 10:50:44 nia Exp $
+
+Fix implicit declaration of exit(3).
+
+--- freetemp.c.orig    2026-03-23 10:30:10.069810480 +0000
++++ freetemp.c
+@@ -1,6 +1,7 @@
+ #include "xb_config.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifndef vms
+ #include <unistd.h>
+ #else
Index: pkgsrc/x11/xbanner/patches/patch-xb__check.c
diff -u /dev/null pkgsrc/x11/xbanner/patches/patch-xb__check.c:1.1
--- /dev/null   Mon Mar 23 10:50:44 2026
+++ pkgsrc/x11/xbanner/patches/patch-xb__check.c        Mon Mar 23 10:50:44 2026
@@ -0,0 +1,35 @@
+$NetBSD: patch-xb__check.c,v 1.1 2026/03/23 10:50:44 nia Exp $
+
+Fix build on FreeBSD, which has isnumber(3).
+
+gets(3) considered harmful.
+
+--- xb_check.c.orig    1997-05-15 20:38:25.000000000 +0000
++++ xb_check.c
+@@ -145,7 +145,7 @@ char *elem(char *s, int elnum)
+ }
+ 
+ /* boolean that checks if a string is numeric */
+-int isnumber(char *s)
++int my_isnumber(char *s)
+ {
+   if(atoi(s)==0 && *s!='0')
+     return 0;
+@@ -160,6 +160,8 @@ int isnumber(char *s)
+   return 1;
+ }
+ 
++#define isnumber my_isnumber
++
+ /* return true if the resource is a color resource */
+ int iscolorres(int i)
+ {
+@@ -303,7 +305,7 @@ even 'appres <progname/classname> | xb_c
+     }
+   }
+ 
+-  while(gets(line)!=NULL)
++  while(fgets(line, sizeof(line), stdin)!=NULL)
+   {
+     if(line[0]=='!')
+       continue;
Index: pkgsrc/x11/xbanner/patches/patch-xb__config.h
diff -u /dev/null pkgsrc/x11/xbanner/patches/patch-xb__config.h:1.1
--- /dev/null   Mon Mar 23 10:50:44 2026
+++ pkgsrc/x11/xbanner/patches/patch-xb__config.h       Mon Mar 23 10:50:44 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-xb__config.h,v 1.1 2026/03/23 10:50:44 nia Exp $
+
+EXPLICIT_REGISTER_VARIABLES uses implicit int, which modern GCC no
+longer likes. And the register keyword hasn't been useful for a
+very long time.
+
+--- xb_config.h.orig   1997-05-15 20:38:25.000000000 +0000
++++ xb_config.h
+@@ -11,7 +11,7 @@
+ /* #define R4_RESOURCES */
+ 
+ /* on slow machines this might speed things up a bit */
+-#define EXPLICIT_REGISTER_VARIABLES
++/* #define EXPLICIT_REGISTER_VARIABLES */
+ 
+ /* if you have no usleep() comment out the following line */
+ #define HAS_USLEEP