CVS commit: pkgsrc/devel/m4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr  7 12:23:36 UTC 2026

Modified Files:
        pkgsrc/devel/m4: Makefile PLIST distinfo
        pkgsrc/devel/m4/patches: patch-configure patch-lib_sigsegv.c
            patch-m4_sparcv8+.m4
Removed Files:
        pkgsrc/devel/m4/patches: patch-lib_gl__list.h patch-lib_gl__oset.h
            patch-lib_strerror_override.c

Log Message:
m4: update to 1.4.21.

* Noteworthy changes in release 1.4.21 (2026-02-06) [stable]

** Fix the `eval' builtin to reject input like `0x' that C does not
   accept as an integer literal, rather than silently treating it as zero
   (present since "the beginning").

** Fix the `define' and `pushdef' builtins to always warn when attempting
   to concatenate the result of using the `defn' macro on a builtin macro
   with anything else.  This is a counterpart to the change in m4 1.4.11
   that issues a warning when `defn' with multiple arguments attempts to
   perform concatenation.  Attempting to use the output of `defn' anywhere
   other than a lone argument during macro definition has never been
   portable, but now the outcome is always the remaining text, rather
   than being dependent on whether `defn' was used before or after the
   other text (present since "the beginning").

** Port to glibc 2.43, which implements functions like strchr as macros
   when compiled with a C23 compiler.

* Noteworthy changes in release 1.4.20 (2025-05-10) [stable]

** Fix a bug in the `eval' builtin where it does not suppress warnings
   about division by zero that occurs within a more complex expression on
   the right hand side of || or && (present since short-circuiting was
   introduced in 1.4.8b).

** The `syscmd' and `esyscmd' builtins no longer mishandle a command line
   starting with `-' or `+' (present since "the beginning").

** Fix regression introduced in 1.4.19 where trace output (such as with
   `debugmode(t)') could read invalid memory when tracing a series of
   pushed macros that are popped during argument collection.

** Fix regression introduced in 1.4.19 where the `format' builtin
   inadvertently took on locale-dependent parsing and output of floating
   point numbers as a side-effect of introducing message translations.
   While it would be nice for m4 to be fully locale-aware, such a behavior
   change belongs in a major version release such as 1.6, and not a minor
   release.

** Fix regression introduced in 1.4.11 where the experimental `changeword'
   builtin could cause a crash if given a regex that does not match all
   one-byte prefixes of valid longer matches.  As a reminder, `changeword'
   is not recommended for production use, and will likely not be present
   in the next major version release.

** On non-Unix platforms where binary files differ from text, loading a
   frozen file (which should be cross-platform compatible) now correctly
   uses binary mode.

** Several documentation improvements to the manual.

** Update to comply with newer C standards, and inherit portability
   improvements from gnulib.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/devel/m4/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/m4/PLIST
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/m4/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/m4/patches/patch-configure \
    pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/m4/patches/patch-lib_gl__list.h \
    pkgsrc/devel/m4/patches/patch-lib_gl__oset.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/m4/patches/patch-lib_sigsegv.c
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/m4/patches/patch-lib_strerror_override.c

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

Modified files:

Index: pkgsrc/devel/m4/Makefile
diff -u pkgsrc/devel/m4/Makefile:1.83 pkgsrc/devel/m4/Makefile:1.84
--- pkgsrc/devel/m4/Makefile:1.83       Mon Apr  7 15:25:50 2025
+++ pkgsrc/devel/m4/Makefile    Tue Apr  7 12:23:36 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2025/04/07 15:25:50 nia Exp $
+# $NetBSD: Makefile,v 1.84 2026/04/07 12:23:36 wiz Exp $
 
-DISTNAME=      m4-1.4.19
-PKGREVISION=   1
+DISTNAME=      m4-1.4.21
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=m4/}
 

Index: pkgsrc/devel/m4/PLIST
diff -u pkgsrc/devel/m4/PLIST:1.16 pkgsrc/devel/m4/PLIST:1.17
--- pkgsrc/devel/m4/PLIST:1.16  Sat Jun  2 07:51:04 2012
+++ pkgsrc/devel/m4/PLIST       Tue Apr  7 12:23:36 2026
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.16 2012/06/02 07:51:04 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.17 2026/04/07 12:23:36 wiz Exp $
 bin/gm4
 gnu/bin/m4
 gnu/man/man1/m4.1
 info/m4.info
 man/man1/gm4.1
+share/examples/m4/barem4.m4
 share/examples/m4/capitalize.m4
 share/examples/m4/capitalize2.m4
 share/examples/m4/comments.m4
@@ -41,6 +42,7 @@ share/examples/m4/stack.m4
 share/examples/m4/stack_sep.m4
 share/examples/m4/sync-lines.m4
 share/examples/m4/sysv-args.m4
+share/examples/m4/testbarem4.m4
 share/examples/m4/trace.m4
 share/examples/m4/translit.m4
 share/examples/m4/undivert.m4

Index: pkgsrc/devel/m4/distinfo
diff -u pkgsrc/devel/m4/distinfo:1.55 pkgsrc/devel/m4/distinfo:1.56
--- pkgsrc/devel/m4/distinfo:1.55       Mon Apr 28 17:24:43 2025
+++ pkgsrc/devel/m4/distinfo    Tue Apr  7 12:23:36 2026
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.55 2025/04/28 17:24:43 tnn Exp $
+$NetBSD: distinfo,v 1.56 2026/04/07 12:23:36 wiz Exp $
 
-BLAKE2s (m4-1.4.19.tar.gz) = f1380114d839935b2afa53fdd7162dc5df2bbeb6d5eab48528916a138f483cbc
-SHA512 (m4-1.4.19.tar.gz) = f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2
-Size (m4-1.4.19.tar.gz) = 2953876 bytes
-SHA1 (patch-configure) = 941bba8b1a10c3fc305d20abdb247cf45e44d534
-SHA1 (patch-lib_gl__list.h) = cf0b6776d3c7b758dc10387232df48cd37942616
-SHA1 (patch-lib_gl__oset.h) = 69fa55daea013dc4835411dbe43516408806259b
-SHA1 (patch-lib_sigsegv.c) = 5f49ac75d55aae5a5ad5530a212ec25e15c679e8
-SHA1 (patch-lib_strerror_override.c) = 29905fecf6c92f75c4999f1e3cb56e14fe2f4aae
-SHA1 (patch-m4_sparcv8+.m4) = 761e592a700ea47ac0ba15d960f073115005dedd
+BLAKE2s (m4-1.4.21.tar.gz) = 99bf52b43b7ff479a4c99bca41186b5983448abd940054682a2646f94855ce89
+SHA512 (m4-1.4.21.tar.gz) = 4d573245d31e14a1b2856abf7cd16f82ec01036956bb2c9ee09e6d9d3fcca518cf77d6864c915d4defa07771bf8503241017b37ce9027dcf4fafdd0fb20db582
+Size (m4-1.4.21.tar.gz) = 3558201 bytes
+SHA1 (patch-configure) = ba2ffe2c03dc215a9f0d08a7162382ca9127d9a4
+SHA1 (patch-lib_sigsegv.c) = d773bc9690261b1749cceda8396536384f662665
+SHA1 (patch-m4_sparcv8+.m4) = 612dc5fb22124bc43054f5efa88d73982b514143

Index: pkgsrc/devel/m4/patches/patch-configure
diff -u pkgsrc/devel/m4/patches/patch-configure:1.1 pkgsrc/devel/m4/patches/patch-configure:1.2
--- pkgsrc/devel/m4/patches/patch-configure:1.1 Mon Nov 15 13:20:04 2021
+++ pkgsrc/devel/m4/patches/patch-configure     Tue Apr  7 12:23:36 2026
@@ -1,13 +1,14 @@
-$NetBSD: patch-configure,v 1.1 2021/11/15 13:20:04 nia Exp $
+$NetBSD: patch-configure,v 1.2 2026/04/07 12:23:36 wiz Exp $
 
 PR pkg/56498: "devel/m4" build fails on netbsd-9/sparc
+Sent to bug-m4 mailing list on 2026-04-07.
 
---- configure.orig     2021-05-28 18:49:43.000000000 +0000
+--- configure.orig     2026-02-06 19:48:17.000000000 +0000
 +++ configure
-@@ -8835,7 +8835,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10300,7 +10300,7 @@ printf '%s\n' "$gl_cv_sparc_v8plus" >&6; }
  fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sparc_v8plus" >&5
- printf "%s\n" "$gl_cv_sparc_v8plus" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sparc_v8plus" >&5
+ printf '%s\n' "$gl_cv_sparc_v8plus" >&6; }
 -        if test $gl_cv_sparc_v8plus = no; then
 +        if test $gl_cv_sparc_v8plus != no; then
                                CC="$CC -mcpu=v9"
Index: pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4
diff -u pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4:1.1 pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4:1.2
--- pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4:1.1    Mon Nov 15 13:20:04 2021
+++ pkgsrc/devel/m4/patches/patch-m4_sparcv8+.m4        Tue Apr  7 12:23:36 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-m4_sparcv8+.m4,v 1.1 2021/11/15 13:20:04 nia Exp $
+$NetBSD: patch-m4_sparcv8+.m4,v 1.2 2026/04/07 12:23:36 wiz Exp $
 
 pkg/56498: "devel/m4" build fails on netbsd-9/sparc
+Sent to bug-m4 mailing list on 2026-04-07.
 
 --- m4/sparcv8+.m4.orig        2021-04-22 20:28:47.000000000 +0000
 +++ m4/sparcv8+.m4

Index: pkgsrc/devel/m4/patches/patch-lib_sigsegv.c
diff -u pkgsrc/devel/m4/patches/patch-lib_sigsegv.c:1.2 pkgsrc/devel/m4/patches/patch-lib_sigsegv.c:1.3
--- pkgsrc/devel/m4/patches/patch-lib_sigsegv.c:1.2     Tue Feb 18 15:07:14 2025
+++ pkgsrc/devel/m4/patches/patch-lib_sigsegv.c Tue Apr  7 12:23:36 2026
@@ -1,11 +1,13 @@
-$NetBSD: patch-lib_sigsegv.c,v 1.2 2025/02/18 15:07:14 wiz Exp $
+$NetBSD: patch-lib_sigsegv.c,v 1.3 2026/04/07 12:23:36 wiz Exp $
 
 Use older regnames on MacOS X 10.4 "Tiger", taken from
 <https://github.com/macports/macports-ports/blob/f9641f5f5cb7287e6787b566945fff460a80bc39/devel/m4/files/patch-m4-use-older-regnames-on-tiger.diff>
 
---- lib/sigsegv.c.orig 2021-05-19 14:36:49.000000000 +0000
+Sent to bug-m4 mailing list on 2026-04-07.
+
+--- lib/sigsegv.c.orig 2026-02-03 19:04:18.000000000 +0000
 +++ lib/sigsegv.c
-@@ -33,6 +33,9 @@
+@@ -35,6 +35,9 @@
  # include <sys/param.h> /* defines macro OpenBSD */
  #endif
  
@@ -15,7 +17,7 @@ Use older regnames on MacOS X 10.4 "Tige
  
  /* Version number.  */
  int libsigsegv_version = LIBSIGSEGV_VERSION;
-@@ -562,7 +565,11 @@ int libsigsegv_version = LIBSIGSEGV_VERS
+@@ -660,7 +663,11 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
       - 'ucontext_t' and 'struct __darwin_ucontext' in <sys/_types/_ucontext.h>,
       - 'struct __darwin_mcontext64' in <i386/_mcontext.h>, and
       - 'struct __darwin_x86_thread_state64' in <mach/i386/_structs.h>.  */
@@ -27,7 +29,7 @@ Use older regnames on MacOS X 10.4 "Tige
  
  # elif defined __i386__
  
-@@ -570,7 +577,11 @@ int libsigsegv_version = LIBSIGSEGV_VERS
+@@ -668,7 +675,11 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
       - 'ucontext_t' and 'struct __darwin_ucontext' in <sys/_types/_ucontext.h>,
       - 'struct __darwin_mcontext32' in <i386/_mcontext.h>, and
       - 'struct __darwin_i386_thread_state' in <mach/i386/_structs.h>.  */
@@ -39,15 +41,3 @@ Use older regnames on MacOS X 10.4 "Tige
  
  # elif defined __arm64__
  
-@@ -586,7 +597,11 @@ int libsigsegv_version = LIBSIGSEGV_VERS
-      - 'ucontext_t' and 'struct __darwin_ucontext' in <sys/_structs.h>,
-      - 'struct __darwin_mcontext' in <ppc/_structs.h>, and
-      - 'struct __darwin_ppc_thread_state' in <mach/ppc/_structs.h>.  */
-+# if __MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-+#  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext->ss.r1
-+# else
- #  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext->__ss.__r1
-+#endif
- 
- # endif
-