CVS commit: pkgsrc/textproc/groff

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 16 11:51:09 UTC 2026

Modified Files:
        pkgsrc/textproc/groff: distinfo
Added Files:
        pkgsrc/textproc/groff/patches: patch-src_include_lib.h
            patch-src_libs_libgroff_getopt.c

Log Message:
groff: Various build fixes. Exact details in patch comments.

Tested and verified to build on FreeBSD, macOS, OpenBSD, NetBSD, Linux.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/groff/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/groff/patches/patch-src_include_lib.h \
    pkgsrc/textproc/groff/patches/patch-src_libs_libgroff_getopt.c

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

Modified files:

Index: pkgsrc/textproc/groff/distinfo
diff -u pkgsrc/textproc/groff/distinfo:1.34 pkgsrc/textproc/groff/distinfo:1.35
--- pkgsrc/textproc/groff/distinfo:1.34 Thu May  8 05:29:47 2025
+++ pkgsrc/textproc/groff/distinfo      Tue Jun 16 11:51:09 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2025/05/08 05:29:47 dbj Exp $
+$NetBSD: distinfo,v 1.35 2026/06/16 11:51:09 nia Exp $
 
 BLAKE2s (groff-1.23.0.tar.gz) = e8cffb11a7d2bf3449546d89940646cfddd89e0a3c7edd7957bfea0ea42e3530
 SHA512 (groff-1.23.0.tar.gz) = eff473fd1d0e6b27527318452ef2b7c6c7aba0b1c27fc529036496eccba5717f3639df0b81a297a57f700e27543196d7086b15e43d7e3c7bf075f95feb7f4089
@@ -6,4 +6,6 @@ Size (groff-1.23.0.tar.gz) = 7433031 byt
 SHA1 (patch-aa) = b2f2942d66455a02d9178030d5019cf81aafa6d3
 SHA1 (patch-configure) = 24bc3ac283a8aa988021c2c4053519410de314f2
 SHA1 (patch-lib_math.in.h) = ca5b3763fce8d29b4dd8c5044fe5537dbe43663a
+SHA1 (patch-src_include_lib.h) = 7db4da95c48ca7161d70670fda3669dc9e9359b5
+SHA1 (patch-src_libs_libgroff_getopt.c) = e7e66c15315dd4e4f0f8f34e590fa02b88502909
 SHA1 (patch-src_libs_libgroff_tmpfile.cpp) = 3794a028dc7c569e5adea6b7b876c3ac085376ba

Added files:

Index: pkgsrc/textproc/groff/patches/patch-src_include_lib.h
diff -u /dev/null pkgsrc/textproc/groff/patches/patch-src_include_lib.h:1.1
--- /dev/null   Tue Jun 16 11:51:09 2026
+++ pkgsrc/textproc/groff/patches/patch-src_include_lib.h       Tue Jun 16 11:51:09 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_include_lib.h,v 1.1 2026/06/16 11:51:09 nia Exp $
+
+Declare inline function static to avoid multiple definitions in
+a static library:
+
+src/include/lib.h:111: multiple definition of
+ `is_invalid_input_char'; libgroff.a
+
+This is safe because libgroff.a is private.
+
+--- src/include/lib.h.orig     2026-06-16 10:45:35.068542661 +0000
++++ src/include/lib.h
+@@ -106,7 +106,7 @@ int mksdir(char *tmpl);
+ 
+   extern char invalid_char_table[];
+ 
+-  inline bool is_invalid_input_char(int c)
++  static inline bool is_invalid_input_char(int c)
+   {
+     return (c >= 0 && invalid_char_table[c]);
+   }
Index: pkgsrc/textproc/groff/patches/patch-src_libs_libgroff_getopt.c
diff -u /dev/null pkgsrc/textproc/groff/patches/patch-src_libs_libgroff_getopt.c:1.1
--- /dev/null   Tue Jun 16 11:51:09 2026
+++ pkgsrc/textproc/groff/patches/patch-src_libs_libgroff_getopt.c      Tue Jun 16 11:51:09 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_libs_libgroff_getopt.c,v 1.1 2026/06/16 11:51:09 nia Exp $
+
+Use the correct, standards-conforming arguments for the local
+getenv prototype. This is necessary for C23 and GCC 15 compatibility.
+We can't include <stdlib.h> for the real prototype because it
+conflicts wit the getopt override.
+
+--- src/libs/libgroff/getopt.c.orig    2023-07-02 16:09:34.000000000 +0000
++++ src/libs/libgroff/getopt.c
+@@ -122,7 +122,7 @@ static struct _getopt_data getopt_data;
+    whose names are inconsistent.  */
+ 
+ #ifndef getenv
+-extern char *getenv ();
++extern char *getenv (const char *);
+ #endif
+ 
+ #endif /* not __GNU_LIBRARY__ */