pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/xemacs-hg -- update to HEAD as of 2026-10-25



Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Sun Oct 25 16:21:52 2026 +0100
Changeset:	f2becf0100bfa322ed0f7d0185ef6bfcc27733de

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 as of 2026-10-25

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

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

diffstat:
 xemacs-hg/Makefile                     |  4 ++--
 xemacs-hg/PLIST                        | 14 ++++++-------
 xemacs-hg/distinfo                     |  2 +-
 xemacs-hg/patches/patch-Makefile.in.in | 37 ++++++++++++++++++++++++----------
 4 files changed, 36 insertions(+), 21 deletions(-)

diffs:
diff --git a/xemacs-hg/Makefile b/xemacs-hg/Makefile
index 1c221e6a14..0974056145 100644
--- a/xemacs-hg/Makefile
+++ b/xemacs-hg/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	xemacs
-EMACSVERSION=	21.5-b36
+EMACSVERSION=	21.5-b37
 EMACS_DISTNAME=	xemacs-${EMACSVERSION}
 CATEGORIES=	editors
 MASTER_SITES=	# Use hg repository
@@ -63,7 +63,7 @@ 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
+CHECK_WRKREF_SKIP+=	lib/xemacs-${EMACSVERSION}/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"); }
diff --git a/xemacs-hg/PLIST b/xemacs-hg/PLIST
index a28fc8331d..c165be400c 100644
--- a/xemacs-hg/PLIST
+++ b/xemacs-hg/PLIST
@@ -1500,13 +1500,13 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/movemail
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/rcs2log
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/vcdiff
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/xemacs-${XEMACS_DUMPID}.dmp
-man/gnuattach.1
-man/gnuclient.1
-man/gnudoit.1
-man/gnuserv.1
-man/xemacs-ctags.1
-man/xemacs-etags.1
-man/xemacs.1
+man/man1/gnuattach.1
+man/man1/gnuclient.1
+man/man1/gnudoit.1
+man/man1/gnuserv.1
+man/man1/xemacs-ctags.1
+man/man1/xemacs-etags.1
+man/man1/xemacs.1
 ${PLIST.x11}share/applications/xemacs.desktop
 @pkgdir lib/xemacs/site-modules
 @pkgdir lib/xemacs/site-lisp
diff --git a/xemacs-hg/distinfo b/xemacs-hg/distinfo
index faf436942d..2edc988560 100644
--- a/xemacs-hg/distinfo
+++ b/xemacs-hg/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (patch-Makefile.in.in) = 9d90a61ae710a6d2a0e3746b60cc1cede4c8e642
+SHA1 (patch-Makefile.in.in) = 5edfcfd48843ee2d42ba8a7b940077f9f70c5f13
 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 4b598c143f..6bf38fb42b 100644
--- a/xemacs-hg/patches/patch-Makefile.in.in
+++ b/xemacs-hg/patches/patch-Makefile.in.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in.in,v 1.3 2021/03/28 10:36:33 hauke Exp $
+$NetBSD$
 
 Sprinkle DESTDIR dust.
 
@@ -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	2026-03-16 13:45:47.000000000 +0000
+--- Makefile.in.in.orig	2026-10-25 14:52:16.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 ====================
  
-@@ -419,11 +419,11 @@ install-arch-dep: mkdir
+@@ -419,17 +419,17 @@ 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,17 +36,23 @@ Make TAR settable, to work around shortcomings in base tar(1)
  #endif
  #ifdef WIN32_NATIVE
  	${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}
-@@ -443,7 +443,8 @@ install-arch-dep: mkdir
+ 	-chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}
+ #else
+-	${INSTALL_PROGRAM} ${buildlispdir}/ellcc.elc $(DESDTIR)${bindir}/ellcc
++	${INSTALL_PROGRAM} ${buildlispdir}/ellcc.elc $(DESTDIR)${bindir}/ellcc
+ 	-chmod 0755 $(DESTDIR)${bindir}/ellcc
+ # ifdef CYGWIN
+ 	${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
+@@ -444,6 +444,8 @@ install-arch-dep: mkdir
  # endif /* CYGWIN */
  #endif /* WIN32_NATIVE */
  #ifdef HAVE_SHLIB
--	$(INSTALL_DATA) 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
-@@ -478,15 +479,20 @@ install-arch-indep: mkdir info
+@@ -479,15 +481,20 @@ install-arch-indep: mkdir info
  	    ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \
  	  fi ; \
  	  for file in *.info* ; do \
@@ -63,10 +69,19 @@ Make TAR settable, to work around shortcomings in base tar(1)
 -	    chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \
 +            if [ $${page} = etags ] || [ $${page} = ctags ] ; \
 +            then \
-+              ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/xemacs-$${page}${manext} ; \
++              ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/man1/xemacs-$${page}${manext} ; \
 +            else \
-+              ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \
++              ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/man1/$${page}${manext} ; \
 +            fi \
  	  done
  	@echo "If you would like to save approximately 4M of disk space, do"
  	@echo "make gzip-el"
+@@ -506,7 +513,7 @@ gzip-el:
+ mkdir: FRC.mkdir
+ 	for dir in \
+ 	    ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \
+-	    ${mandir} ${bindir} ${datadir} ${libdir} \
++	    ${mandir}/man1 ${bindir} ${datadir} ${libdir} \
+ #ifdef HAVE_SHLIB
+ 	    ${moduledir} ${sitemoduledir} \
+ #endif


Home | Main Index | Thread Index | Old Index