CVS commit: pkgsrc/editors

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Jan  2 22:34:59 UTC 2026

Modified Files:
        pkgsrc/editors/xemacs: Makefile Makefile.common distinfo
        pkgsrc/editors/xemacs-nox11: Makefile
        pkgsrc/editors/xemacs/patches: patch-configure
Removed Files:
        pkgsrc/editors/xemacs/patches: patch-Makefile.in.in patch-lisp_gui.el
            patch-lwlib_Makefile.in.in patch-man_lispref_debugging.texi
            patch-man_lispref_intro.texi patch-man_lispref_ldap.texi
            patch-man_xemacs-faq.texi patch-man_xemacs_custom.texi
            patch-src_Makefile.in.in patch-src_config.h.in patch-src_emacs.c
            patch-src_lisp.h patch-src_process.c patch-src_sound.c
            patch-src_unexelf.c patch-src_unexfreebsd.c

Log Message:
xemacs{,-nox11} -- Update to v21.4.25

The update was prompted by an important bytecode fix, in addition
upstream took most of our patches.

>From upstream's changelog:

2026-01-01  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * XEmacs 21.4.25 is released

2026-01-01  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        Changes from Hauke Fath, <hauke%Espresso.Rhein-Neckar.DE@localhost>,
        maintained in NetBSD pkgsrc tree.

        * unexelf.c:
        * unexelf.c (unexec):
        Build on NetBSD/alpha
        * unexfreebsd.c (copy_relocation_site):
        Build on NetBSD/arm*

2026-01-01  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        Change from David Brownlee <abs%NetBSD.org@localhost>, maintained in NetBSD
        pkgsrc tree.
        * emacs.c (main_1):
        * sound.c (vars_of_sound):
        Fix build for non HPUX on HP PA platforms

2026-01-01  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        Change from Hauke Fath, <hauke%Espresso.Rhein-Neckar.DE@localhost>,
        maintained in NetBSD pkgsrc tree.

        * Makefile.in.in:
        Directly substitute the local value of etcdir (``../etc/'')
        into src/Makefile.in.in.  This allows for overriding etcdir via
        INSTALL_MAKE_FLAGS at install-time so that destdir-style installation
        will work.
        liboss support
        SunOS 5 bmake / gmake fixes

2026-01-01  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * bytecode.h:
        Declare Qinvalid_byte_code here.
        * lread.c (Fload_internal):
        Error on encountering a byte compiled file with a byte code
        version greater than 109, with a view to easier version checking
        in the future within compiled functions generated by 21.5 and later.

2025-12-09  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * lread.c (vars_of_lread):
        Initialize load_byte_code_version to 20, and make the dumper aware
        of it, avoiding problems where it defaulted to zero and #'read
        calls in the byte compiler (where it was not bound to something
        sensible by #'load-internal) produced unintended ebolified
        compiled functions in the compiled functions vector of top-level
        compiled functions. See #'byte-compile-compiled-obj-to-list.
        Thank you for the bug report, Hauke Fath!

2025-12-31  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        Port part of my 21.4 change of 2bbae1af16ac to 21.4.
        * config.h.in:
        Add entries for HAVE_STRSIGNAL, HAVE_DECL_SYS_SIGLIST here.
        * process.c (signal_name):
        Implement this in terms of strsignal().
        * sysdep.c:
        * sysdep.c (strsignal):
        Provide an implementation of this using sys_siglist[] if strsignal
        was not found.
        * syssignal.h:
        Remove a declaration of sys_siglist[] here.
        * s/linux.h:
        Remove #define HAVE_SYS_SIGLIST from here.

2021-05-10  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        Port my 21.5 change of 1f4ff44e1657 to 21.4.

        * Makefile.in.in (temacs_link_args):
        Place $start_flags after $ldflags in this make variable, for that
        minority of cases where the user has specified LDFLAGS and,
        e.g. -no-pie in $start_flags is necessary to build.

2021-05-10  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        Incorporate my 21.5 change of changeset d5cd82986867 into 21.4, to
        make it more practical to build a 21.4 XEmacs for the packages.

        * config.h.in:
        Update the implementation of the INLINE_HEADER macro and,
        indirectly, the DECLARE_INLINE_HEADER() macro.
        Add some more documentation and explanation.
        Rename the confusingly-named DONT_EXTERN_INLINE_HEADER_FUNCTIONS
        define to FORCE_INLINE_FUNCTION_DEFINITION.
        * inline.c (FORCE_INLINE_FUNCTION_DEFINITION):
        Use this new name in this file.

2015-04-20  Jerry James  <james%xemacs.org@localhost>

        * lisp.h (max_align_t): Do not define if C11 or C++11, or a later
        version of either, is in use.
        (ALIGNOF): Define with native operators in C11 and C++11 and later.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/editors/xemacs/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/editors/xemacs/Makefile.common
cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/xemacs/distinfo
cvs rdiff -u -r1.42 -r1.43 pkgsrc/editors/xemacs-nox11/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/xemacs/patches/patch-Makefile.in.in
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/xemacs/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/xemacs/patches/patch-lisp_gui.el \
    pkgsrc/editors/xemacs/patches/patch-man_lispref_debugging.texi \
    pkgsrc/editors/xemacs/patches/patch-man_lispref_intro.texi \
    pkgsrc/editors/xemacs/patches/patch-man_lispref_ldap.texi \
    pkgsrc/editors/xemacs/patches/patch-man_xemacs-faq.texi \
    pkgsrc/editors/xemacs/patches/patch-man_xemacs_custom.texi \
    pkgsrc/editors/xemacs/patches/patch-src_emacs.c \
    pkgsrc/editors/xemacs/patches/patch-src_process.c \
    pkgsrc/editors/xemacs/patches/patch-src_sound.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/editors/xemacs/patches/patch-lwlib_Makefile.in.in \
    pkgsrc/editors/xemacs/patches/patch-src_Makefile.in.in \
    pkgsrc/editors/xemacs/patches/patch-src_unexelf.c \
    pkgsrc/editors/xemacs/patches/patch-src_unexfreebsd.c
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/xemacs/patches/patch-src_config.h.in
cvs rdiff -u -r1.6 -r0 pkgsrc/editors/xemacs/patches/patch-src_lisp.h

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

Modified files:

Index: pkgsrc/editors/xemacs/Makefile
diff -u pkgsrc/editors/xemacs/Makefile:1.143 pkgsrc/editors/xemacs/Makefile:1.144
--- pkgsrc/editors/xemacs/Makefile:1.143        Sat Aug 30 22:44:58 2025
+++ pkgsrc/editors/xemacs/Makefile      Fri Jan  2 22:34:58 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.143 2025/08/30 22:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.144 2026/01/02 22:34:58 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   24
 COMMENT=       XEmacs text editor version 21.4
 
 .include "Makefile.common"

Index: pkgsrc/editors/xemacs/Makefile.common
diff -u pkgsrc/editors/xemacs/Makefile.common:1.40 pkgsrc/editors/xemacs/Makefile.common:1.41
--- pkgsrc/editors/xemacs/Makefile.common:1.40  Wed Sep 11 14:56:41 2024
+++ pkgsrc/editors/xemacs/Makefile.common       Fri Jan  2 22:34:58 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.40 2024/09/11 14:56:41 hauke Exp $
+# $NetBSD: Makefile.common,v 1.41 2026/01/02 22:34:58 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
 
-DISTNAME=      xemacs-21.4.24
+DISTNAME=      xemacs-21.4.25
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
@@ -101,6 +101,7 @@ INSTALL_MAKE_FLAGS+=        TAR=${TOOLS_PATH.gt
 
 post-extract: post-extract-x11
        cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
+       find ${WRKSRC}/ -name .cvsignore -exec rm \{\} \;
 
 pre-build:
        rm -f ${WRKSRC}/etc/ctags.1.orig

Index: pkgsrc/editors/xemacs/distinfo
diff -u pkgsrc/editors/xemacs/distinfo:1.36 pkgsrc/editors/xemacs/distinfo:1.37
--- pkgsrc/editors/xemacs/distinfo:1.36 Mon Mar 17 13:08:58 2025
+++ pkgsrc/editors/xemacs/distinfo      Fri Jan  2 22:34:58 2026
@@ -1,23 +1,7 @@
-$NetBSD: distinfo,v 1.36 2025/03/17 13:08:58 hauke Exp $
+$NetBSD: distinfo,v 1.37 2026/01/02 22:34:58 hauke Exp $
 
-BLAKE2s (xemacs/xemacs-21.4.24.tar.gz) = 1b186f91ab8d8347e1051a4e867d95393a9897e4e1f5dc51b9f6763a4ca46665
-SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
-Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
-SHA1 (patch-Makefile.in.in) = 80e2a4b696312fa49792410d89aff48addae5436
-SHA1 (patch-configure) = 1f2e71ddd1e061111d48cc11d42b892189d208b8
+BLAKE2s (xemacs/xemacs-21.4.25.tar.gz) = 5ef4211f4be19623914e1104786971fb02631a08fcb62e67162aa67c62380531
+SHA512 (xemacs/xemacs-21.4.25.tar.gz) = 869aa61f7a32f2e9ed5cb8f755c9879e7bc3b1fd3e4bc31c4d978aeca3d19507c642093bbfda5bb4f4a7ea303ab267f3f647dfa3da868adb5d5b9970b4e03886
+Size (xemacs/xemacs-21.4.25.tar.gz) = 8427805 bytes
+SHA1 (patch-configure) = 260a4562450db001396379023a99cccdf240f719
 SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
-SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3
-SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e
-SHA1 (patch-man_lispref_debugging.texi) = 4d6f99c17bc8e25e700a663f7eff147b72fd9a14
-SHA1 (patch-man_lispref_intro.texi) = 5837f8a0e8057649921cdbddd8e8329165ec1104
-SHA1 (patch-man_lispref_ldap.texi) = e66dd13905ab8b34e2346865d529a99bed35a23b
-SHA1 (patch-man_xemacs-faq.texi) = 4229ea06a7f9a9361639fb50af1a58c51211eb49
-SHA1 (patch-man_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59
-SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
-SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
-SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f
-SHA1 (patch-src_lisp.h) = cced6b8e0dac07c4dae887739ad9677b4f9d0c7d
-SHA1 (patch-src_process.c) = b33b37e7e68bd49036d90cfed206170456a4b443
-SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20
-SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305
-SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448

Index: pkgsrc/editors/xemacs-nox11/Makefile
diff -u pkgsrc/editors/xemacs-nox11/Makefile:1.42 pkgsrc/editors/xemacs-nox11/Makefile:1.43
--- pkgsrc/editors/xemacs-nox11/Makefile:1.42   Sat Aug 30 22:44:59 2025
+++ pkgsrc/editors/xemacs-nox11/Makefile        Fri Jan  2 22:34:59 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2025/08/30 22:44:59 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2026/01/02 22:34:59 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   20
 COMMENT=       XEmacs text editor version 21.4 (no x11 support)
 
 .include "../../editors/xemacs/Makefile.common"

Index: pkgsrc/editors/xemacs/patches/patch-configure
diff -u pkgsrc/editors/xemacs/patches/patch-configure:1.4 pkgsrc/editors/xemacs/patches/patch-configure:1.5
--- pkgsrc/editors/xemacs/patches/patch-configure:1.4   Wed Nov 27 14:35:16 2019
+++ pkgsrc/editors/xemacs/patches/patch-configure       Fri Jan  2 22:34:58 2026
@@ -1,61 +1,18 @@
-$NetBSD: patch-configure,v 1.4 2019/11/27 14:35:16 hauke Exp $
+$NetBSD: patch-configure,v 1.5 2026/01/02 22:34:58 hauke Exp $
 
-On progressive Linuxen (Arch here), CPPFLAGS pre-filled with
--D_FORTIFY_SOURCE=2 -Werror will make configure tests fail on
-pre-processor warnings. Make sure we set CPP to something that works.
+Have tested cpp expect input on STDIN
 
-This patch should go upstream into configure.in, but it is really the
-autoconf AC_PROG_CPP macro definition that needs to be amended.
-
-For Solarish, select _XOPEN_SOURCE version depending on __STDC_VERSION__,
-see <https://gist.github.com/jperkin/b08f9108daf8d0ac695067d71f882a9d>
-
---- configure.orig     2015-03-25 11:25:33.000000000 +0000
+--- configure.orig     2026-01-02 21:57:40.021732482 +0000
 +++ configure
-@@ -2362,6 +2362,25 @@ else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-+  # Some Linuxen (Arch) define _FORTIFY_SOURCE in CPPFLAGS together 
-+  # with -Werror. Make sure the warnings do not disrupt feature tests.
-+  CPP="${CC-cc} -E -Wno-cpp"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2370 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-   CPP=/lib/cpp
- fi
- rm -f conftest*
-@@ -2369,6 +2388,8 @@ fi
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
-   CPP="$ac_cv_prog_CPP"
- else
-@@ -2457,7 +2478,11 @@ EOF
-     Defining _XOPEN_SOURCE = 500
- EOF
- cat >> confdefs.h <<\EOF
-+#if __STDC_VERSION__ - 0 < 199901L
- #define _XOPEN_SOURCE 500
-+#else
-+#define _XOPEN_SOURCE 600
-+#endif
- EOF
- }
+@@ -2377,9 +2377,9 @@ fi
+ echo "$ac_t""$CPP" 1>&6
  
+ 
+-if (echo "#warning warning" | $CPP $CPPFLAGS > 9dm64Q.i); then
++if (echo "#warning warning" | $CPP $CPPFLAGS - > 9dm64Q.i); then
+   rm 9dm64Q.i;
+-elif (echo "#warning warning" | $CPP $CPPFLAGS -Wno-cpp > 9dm64Q.i); then
++elif (echo "#warning warning" | $CPP $CPPFLAGS -Wno-cpp - > 9dm64Q.i); then
+   rm 9dm64Q.i;
+   CPPFLAGS="$CPPFLAGS -Wno-cpp";
+ else