wip/xemacs-hg -- update to HEAD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/xemacs-hg -- update to HEAD
From: Hauke Fath (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 16 Mar 2026 15:48:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Mon Mar 16 16:45:06 2026 +0100
Changeset:	cb2fc951a694cc310a1bd7c912018f6e74c3ad7d

Modified Files:
	xemacs-hg/Makefile
	xemacs-hg/PLIST
	xemacs-hg/distinfo
	xemacs-hg/patches/patch-Makefile.in.in

Log Message:
wip/xemacs-hg -- update to HEAD

Deal with a recently added build support script

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb2fc951a694cc310a1bd7c912018f6e74c3ad7d

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

diffstat:
 xemacs-hg/Makefile                     | 11 ++++++++++-
 xemacs-hg/PLIST                        |  7 +++++--
 xemacs-hg/distinfo                     |  4 +++-
 xemacs-hg/patches/patch-Makefile.in.in | 10 ++++++----
 4 files changed, 24 insertions(+), 8 deletions(-)

diffs:
diff --git a/xemacs-hg/Makefile b/xemacs-hg/Makefile
index 2c10031b14..1c221e6a14 100644
--- a/xemacs-hg/Makefile
+++ b/xemacs-hg/Makefile
@@ -24,7 +24,7 @@ LIBDIR=			${PREFIX}/lib/${DISTNAME}
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=		perl makeinfo
+USE_TOOLS+=		pkg-config perl makeinfo
 TEXINFO_REQD=		4.12
 
 TOOL_DEPENDS+=		gtexinfo>=4.12:../../devel/gtexinfo
@@ -52,10 +52,19 @@ INSTALL_MAKE_FLAGS+=	TAR=${TOOLS_PATH.gtar}
 CPPFLAGS+=	-DTERMINFO
 .endif
 
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Fixing script interpreter path
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	lisp/ellcc.el
+SUBST_SED.paths=	-E -e "s,^\#!.[^ ]+ (.+),\#!${PREFIX}/bin/\1,g"
+
 # Having the build path in the dumped emacs is not a problem.
 CHECK_WRKREF_SKIP+=	bin/xemacs*
 CHECK_WRKREF_SKIP+=	lib/xemacs-*/xemacs*.dmp
 
+# configure just recording the tool paths used for the build
+CHECK_WRKREF_SKIP+=	lib/xemacs-21.5-b36/x86_64--netbsd/config.values
+
 # 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}"); }
diff --git a/xemacs-hg/PLIST b/xemacs-hg/PLIST
index 6ce4602a2f..a28fc8331d 100644
--- a/xemacs-hg/PLIST
+++ b/xemacs-hg/PLIST
@@ -787,6 +787,8 @@ lib/${DISTNAME}/lisp/compose.el
 lib/${DISTNAME}/lisp/compose.elc
 lib/${DISTNAME}/lisp/config.el
 lib/${DISTNAME}/lisp/config.elc
+lib/${DISTNAME}/lisp/config.values.el
+lib/${DISTNAME}/lisp/config.values.elc
 lib/${DISTNAME}/lisp/console.el
 lib/${DISTNAME}/lisp/console.elc
 lib/${DISTNAME}/lisp/cus-dep.el
@@ -832,6 +834,8 @@ lib/${DISTNAME}/lisp/easy-mmode.el
 lib/${DISTNAME}/lisp/easy-mmode.elc
 lib/${DISTNAME}/lisp/easymenu.el
 lib/${DISTNAME}/lisp/easymenu.elc
+lib/${DISTNAME}/lisp/ellcc.el
+lib/${DISTNAME}/lisp/ellcc.elc
 lib/${DISTNAME}/lisp/etags.el
 lib/${DISTNAME}/lisp/etags.elc
 lib/${DISTNAME}/lisp/events.el
@@ -967,6 +971,7 @@ lib/${DISTNAME}/lisp/loadhist.elc
 lib/${DISTNAME}/lisp/loadup-el.el
 lib/${DISTNAME}/lisp/loadup.el
 lib/${DISTNAME}/lisp/make-docfile.el
+lib/${DISTNAME}/lisp/make-docfile.elc
 lib/${DISTNAME}/lisp/map-ynp.el
 lib/${DISTNAME}/lisp/map-ynp.elc
 lib/${DISTNAME}/lisp/menubar-items.el
@@ -1310,7 +1315,6 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/array.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/backtrace.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/balloon_help.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/bitmaps.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/blocktype.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/buffer.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/bufslots.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/bytecode-ops.h
@@ -1489,7 +1493,6 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/xintrinsicp.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/xmmanagerp.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/xmotif.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/xmprimitivep.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/make-docfile
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/mmencode
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.el
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.elc
diff --git a/xemacs-hg/distinfo b/xemacs-hg/distinfo
index f747a8e3f7..faf436942d 100644
--- a/xemacs-hg/distinfo
+++ b/xemacs-hg/distinfo
@@ -1,4 +1,6 @@
-SHA1 (patch-Makefile.in.in) = 375308d036f68de2670b6834adfc108fba2eba26
+$NetBSD$
+
+SHA1 (patch-Makefile.in.in) = 9d90a61ae710a6d2a0e3746b60cc1cede4c8e642
 SHA1 (patch-lib-src_Makefile.in.in) = 2ee85127cd953c858106143dea6d9f1367b1f36e
 SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0
 SHA1 (patch-modules_common_Makefile.common) = 3fe92f9df07d67f4b58d62bd341bc3d831ea289a
diff --git a/xemacs-hg/patches/patch-Makefile.in.in b/xemacs-hg/patches/patch-Makefile.in.in
index 7a00fdc5e3..4b598c143f 100644
--- a/xemacs-hg/patches/patch-Makefile.in.in
+++ b/xemacs-hg/patches/patch-Makefile.in.in
@@ -11,7 +11,7 @@ Prefix {c,e}tags to avoid conflicts.
 
 Make TAR settable, to work around shortcomings in base tar(1)
 
---- Makefile.in.in.orig	2025-05-15 14:32:16.075154519 +0000
+--- Makefile.in.in.orig	2026-03-16 13:45:47.000000000 +0000
 +++ Makefile.in.in
 @@ -67,7 +67,7 @@ LC_ALL = C
  RM = rm -f
@@ -22,7 +22,7 @@ Make TAR settable, to work around shortcomings in base tar(1)
  
  ## ==================== Things `configure' Might Edit ====================
  
-@@ -416,11 +416,11 @@ install-arch-dep: mkdir
+@@ -419,11 +419,11 @@ install-arch-dep: mkdir
  	   fi; \
  	   ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \
  	   ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC-`src/${PROGNAME} -sd`; \
@@ -36,7 +36,7 @@ Make TAR settable, to work around shortcomings in base tar(1)
  #endif
  #ifdef WIN32_NATIVE
  	${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}
-@@ -439,7 +439,8 @@ install-arch-dep: mkdir
+@@ -443,7 +443,8 @@ install-arch-dep: mkdir
  # endif /* CYGWIN */
  #endif /* WIN32_NATIVE */
  #ifdef HAVE_SHLIB
@@ -46,7 +46,7 @@ Make TAR settable, to work around shortcomings in base tar(1)
  #endif
  
  install-arch-indep: mkdir info
-@@ -474,14 +475,19 @@ install-arch-indep: mkdir info
+@@ -478,15 +479,20 @@ install-arch-indep: mkdir info
  	    ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \
  	  fi ; \
  	  for file in *.info* ; do \
@@ -55,6 +55,8 @@ Make TAR settable, to work around shortcomings in base tar(1)
  	    chmod 0644 $(DESTDIR)${infodir}/$${file}; \
  	  done ; \
  	fi
+-	chmod 0755 ${lispdir}/ellcc.elc
++	chmod 0755 $(DESTDIR)${lispdir}/ellcc.elc
  	cd ${srcdir}/etc && \
  	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
 -	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \
Prev by Date: prometheus-lts: Update to 3.5.1
Next by Date: prometheus-lts: Complete the build
Previous by Thread: prometheus-lts: Update to 3.5.1
Next by Thread: prometheus-lts: Complete the build
Indexes:
Home | Main Index | Thread Index | Old Index