CVS commit: pkgsrc/editors

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors
From: "Hauke Fath" <hauke%netbsd.org@localhost>
Date: Tue, 23 Sep 2025 16:41:10 +0000

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Sep 23 16:41:10 UTC 2025

Modified Files:
        pkgsrc/editors/xemacs-current: Makefile Makefile.common PLIST distinfo
        pkgsrc/editors/xemacs-current-nox11: Makefile
        pkgsrc/editors/xemacs-current/patches: patch-Makefile.in.in
            patch-configure patch-lib-src_Makefile.in.in

Log Message:
editors/xemacs-current{,-nox11}: Update to 21.5.36

Due to build issues, the external dump file has come back.

>From upstream's ChangeLog:

2025-06-14  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * XEmacs 21.5.36 "leeks" is released.

2025-05-26  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac: Remove support for building ldap, canna,
        postgresql into the temacs binary.
        * configure: Regenerate.

2025-03-04  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac (DUMP_FILE_NAME): New, just xemacs.dmp. Use
        AC_SUBST() to make it available to Makefile.in.in.
        In passing make AC_DEFINE_UNQUOTED(SHEBANG_PROGNAME ...) a bit
        more sensible.
        * configure: Regenerate.

2025-02-24  Stephen Turnbull  <turnbull%sk.tsukuba.ac.jp@localhost>

        * Makefile.in.in:
        Find module auto-autoloads in module build tree, not source tree.

2025-02-03  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac:
        Remove --with-mule as an option, always on.
        Remove --with-default-eol-detection as an option, only relevant
        with non-MULE.
        * configure: Regenerate.

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

        * Makefile.in.in (install-arch-dep):
        Install DOC as DOC-DUMP-ID, to avoid the longstanding irritation
        of installing another XEmacs corrupting the docfile of a running,
        installed, XEmacs.

2024-12-24  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac (XE_COMPLEX_ARG):
        Revise --with-quick-build to turn off --with-dump-in-exec (unless
        otherwise explicitly specified), document this. Remove mention of
        garbage-collection after loading each file during dumping, no
        longer relevant.
        * configure: Regenerate.

2024-12-24  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac (libc_version): Remove detection of libc version
        from configure.ac, it is not remotely as necessary as it was a
        couple of decades ago, and Mats advises me it is buggy on Gentoo.
        * configure: Regenerate.

2024-12-20  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * Makefile.in.in:
        Install the dump file in ${archilibdir}, not in the same directory
        as the XEmacs executable, for better conformance with usual Unix
        practice.

2024-12-20  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * Makefile.in.in:
        Install the dump file properly if non-DUMP_IN_EXEC. No longer
        check the PDUMP define. This is no longer available since it is
        impossible to turn it off, unexec has been removed.

2024-11-03  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac: Only attempt to turn off ASLR if the data and text
        (C code) relative offsets are unpredictable from one invocation
        to the next.
        * configure: Regenerate.

2024-10-17  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac : No longer use XE_PROTECT_LINKER_FLAGS on LDFLAGS,
        comment as to motivation for this. Thank you Mats Lidell and the
        Gentoo users.
        * configure: Regenerate.

2023-11-26  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac: Define _XOPEN_SOURCE as 600 on Linux.
        * configure: Regenerate.

2024-02-15  Richard Hopkins  <xemacs%unbit.co.uk@localhost>

        * Makefile.in.in (etc/PROBLEMS): Improve portability; $^ is not
        available on BSD make for example and would error with

        cp  etc/PROBLEMS
        usage: cp [-R [-H | -L | -P]] [-f | -i] [-alNpv] src target
        cp [-R [-H | -L | -P]] [-f | -i] [-alNpv] src1 ... srcN directory
        *** Error code 1

        `make` now succeeds on BSD make.

2023-05-14  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * CHANGES-beta:
        Correct attribution of OpenSSL bignum support.
        Add new skeleton for 21.5.36.

2023-05-14  Aidan Kehoe  <kehoea%parhasard.net@localhost>

        * configure.ac:
        Default --with-mule to on; document this.

        * configure: Regenerate.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/editors/xemacs-current/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/xemacs-current/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/editors/xemacs-current/PLIST
cvs rdiff -u -r1.44 -r1.45 pkgsrc/editors/xemacs-current/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/editors/xemacs-current-nox11/Makefile
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/editors/xemacs-current/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/editors/xemacs-current/patches/patch-lib-src_Makefile.in.in

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-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.124 pkgsrc/editors/xemacs-current/Makefile:1.125
--- pkgsrc/editors/xemacs-current/Makefile:1.124        Sat Aug 30 22:44:58 2025
+++ pkgsrc/editors/xemacs-current/Makefile      Tue Sep 23 16:41:10 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.124 2025/08/30 22:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2025/09/23 16:41:10 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   8
-COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
+COMMENT=       XEmacs text editor version ${PKGVERSION_NOREV}
 
 .include "Makefile.common"
 

Index: pkgsrc/editors/xemacs-current/Makefile.common
diff -u pkgsrc/editors/xemacs-current/Makefile.common:1.22 pkgsrc/editors/xemacs-current/Makefile.common:1.23
--- pkgsrc/editors/xemacs-current/Makefile.common:1.22  Mon Jun 26 18:21:08 2023
+++ pkgsrc/editors/xemacs-current/Makefile.common       Tue Sep 23 16:41:10 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.22 2023/06/26 18:21:08 hauke Exp $
+# $NetBSD: Makefile.common,v 1.23 2025/09/23 16:41:10 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
 
-DISTNAME=      xemacs-21.5.35
-EMACSVERSION=  21.5-b35
+DISTNAME=      xemacs-21.5.36
+EMACSVERSION=  21.5-b36
 EMACS_DISTNAME=        xemacs-${EMACSVERSION}
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
@@ -25,11 +25,17 @@ USE_TOOLS+=         gtar makeinfo perl
 
 # Having the build path in the dumped emacs is not a problem.
 CHECK_WRKREF_SKIP+=    bin/xemacs*
+CHECK_WRKREF_SKIP+=    lib/xemacs-*/xemacs*.dmp
 
 PRINT_PLIST_AWK+=      { gsub(/${EMACS_DISTNAME}/, "$${DISTNAME}"); }
 PRINT_PLIST_AWK+=      { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); }
 PRINT_PLIST_AWK+=      { gsub(/^share\/applications\/xemacs\.desktop$$/, "$${PLIST.x11}&"); }
 
+# The portable dumper creates a dump file with a build ID in its name
+PRINT_PLIST_AWK+=      { gsub(/-[a-z0-9]+\.dmp$$/, "-$${XEMACS_DUMPID}.dmp"); }
+PRINT_PLIST_AWK+=      { gsub(/DOC-[a-z0-9]+$$/, "DOC-$${XEMACS_DUMPID}"); }
+PLIST_SUBST+=          XEMACS_DUMPID=${XEMACS_DUMPID:!${WRKSRC}/src/xemacs -sd!}
+
 PLIST_SUBST+=          DISTNAME=${EMACS_DISTNAME}
 FILES_SUBST+=          DISTNAME=${EMACS_DISTNAME}
 MESSAGE_SUBST+=                DISTNAME=${EMACS_DISTNAME}
@@ -39,6 +45,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/lib
 CONFIGURE_ARGS+=       --with-infopath=${PREFIX}/${PKGINFODIR}
 CONFIGURE_ARGS+=       --with-clash-detection
+CONFIGURE_ARGS+=       --without-dump-in-exec
 CONFIGURE_ARGS+=       --with-mule
 CONFIGURE_ARGS+=       --with-zlib
 CONFIGURE_ARGS+=       --with-bignum=gmp

Index: pkgsrc/editors/xemacs-current/PLIST
diff -u pkgsrc/editors/xemacs-current/PLIST:1.29 pkgsrc/editors/xemacs-current/PLIST:1.30
--- pkgsrc/editors/xemacs-current/PLIST:1.29    Wed Aug 30 15:02:22 2023
+++ pkgsrc/editors/xemacs-current/PLIST Tue Sep 23 16:41:10 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2023/08/30 15:02:22 vins Exp $
+@comment $NetBSD: PLIST,v 1.30 2025/09/23 16:41:10 hauke Exp $
 bin/ellcc
 bin/gnuattach
 bin/gnuclient
@@ -6,7 +6,6 @@ bin/gnudoit
 bin/ootags
 bin/xemacs
 bin/${DISTNAME}
-bin/xemacs-b2m
 bin/xemacs-ctags
 bin/xemacs-etags
 bin/xemacs-script
@@ -1287,12 +1286,9 @@ lib/${DISTNAME}/lisp/x-win-sun.el
 lib/${DISTNAME}/lisp/x-win-sun.elc
 lib/${DISTNAME}/lisp/x-win-xfree86.el
 lib/${DISTNAME}/lisp/x-win-xfree86.elc
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/DOC
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/DOC-${XEMACS_DUMPID}
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/add-big-package.sh
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/config.values
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/cvtmail
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/digest-doc
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/fakemail
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/gnuserv
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/gzip-el.sh
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/hexl
@@ -1382,6 +1378,7 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/gui.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/gutter.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/imgproc.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/incbin.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/insdel.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/intl-auto-encap-win32.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/keymap-buttons.h
@@ -1412,6 +1409,7 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/mem-limits.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/menubar.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/miscplay.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/modifiers.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/mule-ccl.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/ndir.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/number-gmp.h
@@ -1493,12 +1491,10 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/mmencode
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.el
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.elc
-${PLIST.ldap}lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/eldap.ell
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/movemail
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/profile
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/rcs2log
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/sorted-doc
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/vcdiff
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/xemacs-${XEMACS_DUMPID}.dmp
 man/man1/gnuattach.1
 man/man1/gnuclient.1
 man/man1/gnudoit.1

Index: pkgsrc/editors/xemacs-current/distinfo
diff -u pkgsrc/editors/xemacs-current/distinfo:1.44 pkgsrc/editors/xemacs-current/distinfo:1.45
--- pkgsrc/editors/xemacs-current/distinfo:1.44 Thu Jun 29 20:57:44 2023
+++ pkgsrc/editors/xemacs-current/distinfo      Tue Sep 23 16:41:10 2025
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.44 2023/06/29 20:57:44 hauke Exp $
+$NetBSD: distinfo,v 1.45 2025/09/23 16:41:10 hauke Exp $
 
-BLAKE2s (xemacs-21.5.35.tar.gz) = 4b1b0fc5f7302180a16168bde9b85b05797e6ad883e1f0d72d77102cd5f36b11
-SHA512 (xemacs-21.5.35.tar.gz) = e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
-Size (xemacs-21.5.35.tar.gz) = 16403617 bytes
-SHA1 (patch-Makefile.in.in) = 2d73b52295a66183063ef8c243e20c7a9c5ea77c
-SHA1 (patch-configure) = 67c6d4e1114aba256156c3d1d286ac509bbba440
-SHA1 (patch-lib-src_Makefile.in.in) = f09f99c363d988f356a3a49a1bf96136502d16aa
-SHA1 (patch-lib-src_fakemail.c) = d786ead6ccf1c640d7310b863202e7bde0e9e93a
+BLAKE2s (xemacs-21.5.36.tar.gz) = 7538ed4273e7d7f6cd7fa4b149199fb109dab9655aed5226ab7e8ea182100dfc
+SHA512 (xemacs-21.5.36.tar.gz) = 42e1bc4283038e6829549c4bf78ff034e94f869cd038a3a28fe48b19a623b358e733e98b4c58b5c53ae7613a2d5da64f9796bb1c794a503e83f7706c4b8123f1
+Size (xemacs-21.5.36.tar.gz) = 16486681 bytes
+SHA1 (patch-Makefile.in.in) = 5048ca8d2eaf09500edc6efc6bd5c4ac8e67a079
+SHA1 (patch-configure) = 7169ad26f4b845e15c9b53bb1241ca7a8b6cd539
+SHA1 (patch-lib-src_Makefile.in.in) = 5e19f13bc96f92999aa221831cabc1645605115c
 SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0
 SHA1 (patch-modules_common_Makefile.common) = d62a23a05e72cc196557e2f7fbbccea791ee0101
 SHA1 (patch-src_Makefile.in.in) = 2a661f2c12bd2c27146285f60dec8b9d407fefcd

Index: pkgsrc/editors/xemacs-current-nox11/Makefile
diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.23 pkgsrc/editors/xemacs-current-nox11/Makefile:1.24
--- pkgsrc/editors/xemacs-current-nox11/Makefile:1.23   Sat Aug 30 22:44:59 2025
+++ pkgsrc/editors/xemacs-current-nox11/Makefile        Tue Sep 23 16:41:10 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2025/08/30 22:44:59 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2025/09/23 16:41:10 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   8
 COMMENT=       *BETA* XEmacs text editor version 21.5 (no X11 support)
 
 .include "../../editors/xemacs-current/Makefile.common"

Index: pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in
diff -u pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in:1.5 pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in:1.6
--- pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in:1.5      Thu Jun 29 20:57:44 2023
+++ pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in  Tue Sep 23 16:41:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in.in,v 1.5 2023/06/29 20:57:44 hauke Exp $
+$NetBSD: patch-Makefile.in.in,v 1.6 2025/09/23 16:41:10 hauke Exp $
 
 Sprinkle DESTDIR dust.
 
@@ -15,7 +15,7 @@ Make TAR settable, to work around shortc
 
 was patch-aa
 
---- Makefile.in.in.orig        2023-05-13 18:09:51.000000000 +0000
+--- Makefile.in.in.orig        2025-06-14 22:52:22.000000000 +0000
 +++ Makefile.in.in
 @@ -67,7 +67,7 @@ LC_ALL = C
  RM = rm -f
@@ -26,35 +26,30 @@ was patch-aa
  
  ## ==================== Things `configure' Might Edit ====================
  
-@@ -374,7 +374,7 @@ src/.gdbinit: ${srcdir}/src/.gdbinit.in.
-       ./config.status && touch $@
- 
- etc/PROBLEMS: $(srcdir)/PROBLEMS
--      cp $^ $@
-+      cp $(srcdir)/PROBLEMS etc/PROBLEMS
- 
- ## ==================== Installation ====================
- 
-@@ -416,7 +416,7 @@ install-arch-dep: mkdir
+@@ -416,11 +416,11 @@ install-arch-dep: mkdir
           fi; \
           ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \
-          ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \
+          ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC-`src/${PROGNAME} -sd`; \
 -         for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
 +         for subdir in `find $(DESTDIR)${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
             do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
        else true; fi
- #if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE))
-@@ -439,7 +439,8 @@ install-arch-dep: mkdir
+ #if !defined (DUMP_IN_EXEC) && !defined(WIN32_NATIVE)
+-      ${INSTALL_DATA} src/${PROGNAME}.dmp ${archlibdir}/${PROGNAME}-`src/${PROGNAME} -sd`.dmp
++      ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${archlibdir}/${PROGNAME}-`src/${PROGNAME} -sd`.dmp
+ #endif
+ #ifdef WIN32_NATIVE
+       ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}
+@@ -439,6 +439,8 @@ install-arch-dep: mkdir
  # endif /* CYGWIN */
  #endif /* WIN32_NATIVE */
  #ifdef HAVE_SHLIB
--      $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir)
-+      $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.el $(DESTDIR)$(moduledir)
-+      $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.elc $(DESTDIR)$(moduledir)
++      $(INSTALL_DATA) modules/auto-autoloads.el $(DESTDIR)$(moduledir)
++      $(INSTALL_DATA) modules/auto-autoloads.elc $(DESTDIR)$(moduledir)
+       $(INSTALL_DATA) modules/auto-autoloads.* $(DESTDIR)$(moduledir)
  #endif
  
- install-arch-indep: mkdir info
-@@ -474,14 +475,19 @@ install-arch-indep: mkdir info
+@@ -474,14 +476,19 @@ install-arch-indep: mkdir info
            ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \
          fi ; \
          for file in *.info* ; do \
@@ -76,7 +71,7 @@ was patch-aa
          done
        @echo "If you would like to save approximately 4M of disk space, do"
        @echo "make gzip-el"
-@@ -500,7 +506,7 @@ gzip-el:
+@@ -500,7 +507,7 @@ gzip-el:
  mkdir: FRC.mkdir
        for dir in \
            ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \

Index: pkgsrc/editors/xemacs-current/patches/patch-configure
diff -u pkgsrc/editors/xemacs-current/patches/patch-configure:1.6 pkgsrc/editors/xemacs-current/patches/patch-configure:1.7
--- pkgsrc/editors/xemacs-current/patches/patch-configure:1.6   Wed May 24 11:40:11 2023
+++ pkgsrc/editors/xemacs-current/patches/patch-configure       Tue Sep 23 16:41:10 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.6 2023/05/24 11:40:11 hauke Exp $
+$NetBSD: patch-configure,v 1.7 2025/09/23 16:41:10 hauke Exp $
 
 The 21.5 requirement of makeinfo 4.12 seems arbitrary - the
 NetBSD-enclosed makeinfo 4.8 appears to work just fine. Plus, simply
 not setting MAKEINFO will leave us without .info files.
 
---- configure.orig     2023-05-13 18:09:51.000000000 +0000
+--- configure.orig     2025-06-14 22:52:22.000000000 +0000
 +++ configure
-@@ -11434,14 +11434,14 @@ done
+@@ -11341,15 +11341,15 @@ done
  test -n "$YACC" || YACC="yacc"
  
  
@@ -15,7 +15,8 @@ not setting MAKEINFO will leave us witho
 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for makeinfo >= 4.8" >&5
 +printf %s "checking for makeinfo >= 4.8... " >&6; }
  MAKEINFO=
- for prog in `which -a makeinfo`; do
+ if prog=`command -v makeinfo`
+ then
    mi_verstr=`$prog --version | sed -n '1s/^.* \([0-9][0-9.]*\)$/\1/p'`
    mi_major=`echo $mi_verstr | cut -d. -f1`
    mi_minor=`echo $mi_verstr | cut -d. -f2`
@@ -23,8 +24,8 @@ not setting MAKEINFO will leave us witho
 +  if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 && test "$mi_minor" -ge 8 );
    then
      MAKEINFO=$prog
-     break
-@@ -11450,8 +11450,8 @@ done
+   fi
+@@ -11357,8 +11357,8 @@ fi
  if test -z $MAKEINFO; then
    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
  printf "%s\n" "no" >&6; }

Index: pkgsrc/editors/xemacs-current/patches/patch-lib-src_Makefile.in.in
diff -u pkgsrc/editors/xemacs-current/patches/patch-lib-src_Makefile.in.in:1.2 pkgsrc/editors/xemacs-current/patches/patch-lib-src_Makefile.in.in:1.3
--- pkgsrc/editors/xemacs-current/patches/patch-lib-src_Makefile.in.in:1.2      Sun May 21 00:13:56 2023
+++ pkgsrc/editors/xemacs-current/patches/patch-lib-src_Makefile.in.in  Tue Sep 23 16:41:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib-src_Makefile.in.in,v 1.2 2023/05/21 00:13:56 hauke Exp $
+$NetBSD: patch-lib-src_Makefile.in.in,v 1.3 2025/09/23 16:41:10 hauke Exp $
 
 Add missing DESTDIR prefixes
 
@@ -8,9 +8,9 @@ Prefix {c,e}tags to avoid conflicts
 
 Was patch-ac
 
---- lib-src/Makefile.in.in.orig        2023-05-13 18:09:52.000000000 +0000
+--- lib-src/Makefile.in.in.orig        2025-06-14 22:52:22.000000000 +0000
 +++ lib-src/Makefile.in.in
-@@ -246,12 +246,12 @@ do-blessmail: $(blessmail)
+@@ -239,12 +239,12 @@ do-blessmail: $(blessmail)
  ${archlibdir}: all
        @echo; echo "Installing utilities run internally by XEmacs."
        ./make-path $(DESTDIR)${archlibdir}
@@ -25,7 +25,7 @@ Was patch-ac
             != "`(cd ${srcdir}     && $(pwd))`"; then \
          for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
            (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \
-@@ -261,10 +261,20 @@ ${archlibdir}: all
+@@ -254,10 +254,20 @@ ${archlibdir}: all
  install: ${archlibdir}
        @echo; echo "Installing utilities for users to run."
        for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
@@ -48,12 +48,3 @@ Was patch-ac
        done
  
  uninstall:
-@@ -380,7 +390,7 @@ make-dump-id: ${srcdir}/make-dump-id.c
- #ifdef DUMP_IN_EXEC
- insert-data-in-exec: ${srcdir}/insert-data-in-exec.c
-       $(CC) $(cflags) ${srcdir}/insert-data-in-exec.c $(ldflags) -o $@
--#endif /* not DUMP_IN_EXEC */
-+#endif /* DUMP_IN_EXEC */
- 
- cflags_gnuserv  = $(CFLAGS) $(cppflags) $(c_switch_all)
- ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) @libs_xauth@ $(ld_libs_general)

Prev by Date: CVS commit: pkgsrc/textproc/tree-sitter
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/textproc/tree-sitter
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index