Update patches to 2025-01-06 source tree

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update patches to 2025-01-06 source tree
From: Hauke Fath (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 6 Jan 2025 19:28:21 +0000
Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Mon Jan 6 20:26:22 2025 +0100
Changeset:	e905d212f8662cc406cb4f6b80809fca95560e26

Modified Files:
	xemacs-hg/distinfo
	xemacs-hg/patches/patch-Makefile.in.in
	xemacs-hg/patches/patch-lib-src_Makefile.in.in
	xemacs-hg/patches/patch-lib-src_fakemail.c
	xemacs-hg/patches/patch-src_Makefile.in.in
Removed Files:
	xemacs-hg/patches/patch-configure
	xemacs-hg/patches/patch-src_unexelf.c

Log Message:
Update patches to 2025-01-06 source tree

Build fails dumping xemacs

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

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

diffstat:
 xemacs-hg/distinfo                             | 15 +++------
 xemacs-hg/patches/patch-Makefile.in.in         | 18 ++--------
 xemacs-hg/patches/patch-configure              | 46 --------------------------
 xemacs-hg/patches/patch-lib-src_Makefile.in.in | 37 ++++-----------------
 xemacs-hg/patches/patch-lib-src_fakemail.c     | 15 ++-------
 xemacs-hg/patches/patch-src_Makefile.in.in     | 16 ++++-----
 xemacs-hg/patches/patch-src_unexelf.c          | 38 ---------------------
 7 files changed, 25 insertions(+), 160 deletions(-)

diffs:
diff --git a/xemacs-hg/distinfo b/xemacs-hg/distinfo
index bfc64136f5..d00a80ed8a 100644
--- a/xemacs-hg/distinfo
+++ b/xemacs-hg/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.39 2021/03/28 10:36:33 hauke Exp $
-
-RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
-SHA512 (xemacs-21.5.34.tar.gz) = b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-Size (xemacs-21.5.34.tar.gz) = 15816932 bytes
-SHA1 (patch-Makefile.in.in) = 0c77cdc73c2050fda3d7b7afab229aa817be034b
-SHA1 (patch-configure) = 35fcd1879b429ef121ece7d0aab8f0bd64c99d5c
-SHA1 (patch-lib-src_Makefile.in.in) = 255ef4661d8da0d0ea160d84ce0de2b8ee2bbab1
-SHA1 (patch-lib-src_fakemail.c) = 789de5b4d1e31e848ad359a411186c063e487425
+SHA1 (patch-Makefile.in.in) = 2de1c1859183cebc1699ff9ffee49b1949bb1a1c
+SHA1 (patch-lib-src_Makefile.in.in) = 2ee85127cd953c858106143dea6d9f1367b1f36e
+SHA1 (patch-lib-src_fakemail.c) = fba9371ad10a66c1fd742f494a78a1eb35387b89
 SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0
 SHA1 (patch-modules_common_Makefile.common) = 3fe92f9df07d67f4b58d62bd341bc3d831ea289a
-SHA1 (patch-src_Makefile.in.in) = 3099ec9f7e9d878bfbfecb1488fff4ee4609cd33
+SHA1 (patch-src_Makefile.in.in) = 91c4cbe9f0b765a4b671e1e607a983b583892f75
 SHA1 (patch-src_config.h.in) = 46c434b956ba84c1f159883a23cf13a83ec70daf
 SHA1 (patch-src_dired.c) = e00189eca6f38ff4e86d1fea3f572a7ab5c2e209
-SHA1 (patch-src_unexelf.c) = d8ff6280660f3f2fef32082a9ccccbfeea9f50f2
diff --git a/xemacs-hg/patches/patch-Makefile.in.in b/xemacs-hg/patches/patch-Makefile.in.in
index 7f3bc53769..714b34b80e 100644
--- a/xemacs-hg/patches/patch-Makefile.in.in
+++ b/xemacs-hg/patches/patch-Makefile.in.in
@@ -11,10 +11,7 @@ Prefix {c,e}tags to avoid conflicts.
 
 Make TAR settable, to work around shortcomings in base tar(1)
 
-Deal with a difference between bmake and gmake in using $^ in a
-makefile target
-
---- Makefile.in.in.orig	2021-07-26 11:30:34.000000000 +0000
+--- Makefile.in.in.orig	2025-01-06 18:59:57.709890754 +0000
 +++ Makefile.in.in
 @@ -67,7 +67,7 @@ LC_ALL = C
  RM = rm -f
@@ -25,24 +22,15 @@ makefile target
  
  ## ==================== 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 $@
- 
- ## ==================== Installation ====================
- 
 @@ -416,7 +416,7 @@ 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))
+ #if !defined (DUMP_IN_EXEC) && !defined(WIN32_NATIVE)
 @@ -439,7 +439,8 @@ install-arch-dep: mkdir
  # endif /* CYGWIN */
  #endif /* WIN32_NATIVE */
diff --git a/xemacs-hg/patches/patch-configure b/xemacs-hg/patches/patch-configure
deleted file mode 100644
index f7f7b0ed52..0000000000
--- a/xemacs-hg/patches/patch-configure
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2019/11/27 15:11:45 hauke Exp $
-
-Add POSIX syntax for passing ld(1) options through the compiler 
-front end
-
-For Solarish, select _XOPEN_SOURCE version depending on __STDC_VERSION__,
-see <https://gist.github.com/jperkin/b08f9108daf8d0ac695067d71f882a9d>
-
-Remove bashism
-
---- configure.orig	2021-07-28 11:28:27.824674514 +0000
-+++ configure
-@@ -9156,10 +9156,13 @@ case "$opsys" in
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
- 
-       if test "$os_release" -ge 505; then
--     $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
--
-      $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
- 
-+     $as_echo "#if __STDC_VERSION__ - 0 < 199901L" >>confdefs.h
-+     $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-+     $as_echo "#else" >>confdefs.h
-+     $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
-+     $as_echo "#endif" >>confdefs.h
-    fi ;;
-   linux)
-     $as_echo "#define _POSIX_C_SOURCE 199506L" >>confdefs.h
-@@ -10061,7 +10064,7 @@ $as_echo_n "checking for runtime librari
-     linux* | irix*) dash_r="-rpath " ;;
-     *)
-       dash_r=""
--      for try_dash_r in "-R" "-R " "-rpath "; do
-+      for try_dash_r in "-Wl,R" "-R" "-R " "-rpath "; do
-         xe_check_libs="${try_dash_r}/no/such/file-or-directory"
- 
- if test "$GCC" = "yes"; then
-@@ -22507,7 +22510,7 @@ fi
- if test "$have_vdb_mach" = yes ; then
-   echo "  Using mach exception mechanism as vdb fault handler."
- fi
--if test "$have_vdb_fake" = yes && test "$with_vdb" == fake; then
-+if test "$have_vdb_fake" = yes && test "$with_vdb" = fake; then
-   echo "  Virtual dirty bit write barrier manually disabled."
- fi
- test "$with_pdump" = yes && echo "  Using the new portable dumper."
diff --git a/xemacs-hg/patches/patch-lib-src_Makefile.in.in b/xemacs-hg/patches/patch-lib-src_Makefile.in.in
index 8d061c794a..2e8fb8a355 100644
--- a/xemacs-hg/patches/patch-lib-src_Makefile.in.in
+++ b/xemacs-hg/patches/patch-lib-src_Makefile.in.in
@@ -6,35 +6,21 @@ Install internal build scripts as scripts
 
 Prefix {c,e}tags to avoid conflicts
 
---- lib-src/Makefile.in.in.orig	2013-08-21 17:43:44.000000000 +0000
+--- lib-src/Makefile.in.in.orig	2025-01-06 19:10:12.962500316 +0000
 +++ lib-src/Makefile.in.in
-@@ -69,6 +69,7 @@ sitemoduledir=@sitemoduledir@
- INSTALL = @install_pp@ @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 
- ## ========================== Lists of Files ===========================
- 
-@@ -245,25 +246,35 @@ do-blessmail: $(blessmail)
+@@ -242,9 +242,9 @@ do-blessmail: $(blessmail)
  ${archlibdir}: all
  	@echo; echo "Installing utilities run internally by XEmacs."
  	./make-path $(DESTDIR)${archlibdir}
 -	if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
 +	if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
  	  for f in ${PRIVATE_INSTALLABLE_EXES}; do \
- 	    (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \
- 	  done ; \
- 	fi
--	if test "`(cd ${archlibdir} && $(pwd))`" \
-+	if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" \
- 	     != "`(cd ${srcdir}     && $(pwd))`"; then \
- 	  for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
--	    (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \
-+	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \
+-	    (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \
++	    (cd .. && $(INSTALL_SCRIPT) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \
  	  done ; \
  	fi
- 
+ 	if test "`(cd ${archlibdir} && $(pwd))`" \
+@@ -257,10 +257,20 @@ ${archlibdir}: all
  install: ${archlibdir}
  	@echo; echo "Installing utilities for users to run."
  	for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
@@ -47,7 +33,7 @@ Prefix {c,e}tags to avoid conflicts
 +          fi \
  	done
  	for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \
--	  (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \
+-	  (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \
 +          if [ $${file} = rcs-checkin ] || [ $${file} = send-pr ] ; \
 +            then \
 +              (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/xemacs-$${file}) ; \
@@ -57,12 +43,3 @@ Prefix {c,e}tags to avoid conflicts
  	done
  
  uninstall:
-@@ -379,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)
diff --git a/xemacs-hg/patches/patch-lib-src_fakemail.c b/xemacs-hg/patches/patch-lib-src_fakemail.c
index b92ef3e6aa..6bd646678d 100644
--- a/xemacs-hg/patches/patch-lib-src_fakemail.c
+++ b/xemacs-hg/patches/patch-lib-src_fakemail.c
@@ -2,23 +2,14 @@ $NetBSD: patch-lib-src_fakemail.c,v 1.1 2017/11/15 14:57:58 hauke Exp $
 
 Fix build on DragonFly.
 
---- lib-src/fakemail.c.orig	2013-08-21 17:43:44.000000000 +0000
+--- lib-src/fakemail.c.orig	2025-01-06 18:59:57.821754390 +0000
 +++ lib-src/fakemail.c
-@@ -148,15 +148,13 @@ extern char *malloc (), *realloc ();
+@@ -140,7 +140,7 @@ static boolean no_problems = true;
  #include <osreldate.h>
  #endif
  
 -#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 || defined(__DragonFly__)
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000  || defined(__DragonFly__)
  #define CURRENT_USER 
  #endif 
  
- #ifdef CURRENT_USER
- extern struct passwd *getpwuid ();
--#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 
--extern uid_t geteuid (); 
--#else 
-+#if defined(__FreeBSD_version) && __FreeBSD_version < 400000 
- extern unsigned short geteuid (); 
- #endif 
- static struct passwd *my_entry;
diff --git a/xemacs-hg/patches/patch-src_Makefile.in.in b/xemacs-hg/patches/patch-src_Makefile.in.in
index f4bc118483..68692aab11 100644
--- a/xemacs-hg/patches/patch-src_Makefile.in.in
+++ b/xemacs-hg/patches/patch-src_Makefile.in.in
@@ -4,9 +4,9 @@ Deal with bulk build namespace intrusion.
 
 SunOS 5 bmake / gmake fixes
 
---- src/Makefile.in.in.orig	2013-08-21 17:43:45.000000000 +0000
+--- src/Makefile.in.in.orig	2025-01-06 18:59:58.012563463 +0000
 +++ src/Makefile.in.in
-@@ -392,9 +392,9 @@ ldflags  = $(LDFLAGS) $(ld_switch_all) $
+@@ -362,9 +362,9 @@ ldflags  = $(LDFLAGS) $(ld_switch_all) $
  
  #ifdef SOLARIS2
  %.o : %.c
@@ -18,13 +18,13 @@ SunOS 5 bmake / gmake fixes
  	$(CC) -c $(cflags) $<
  
  ## Create preprocessor output (debugging purposes only)
-@@ -437,10 +437,10 @@ RAW_EXE  = temacs
+@@ -402,10 +402,10 @@ RAW_EXE  = temacs.exe
  DO_TEMACS = $(DUMPENV) ./$(RAW_EXE)
  DO_XEMACS = ./$(PROGNAME)
  
--BATCH = -no-packages -batch
-+MY_BATCH = -no-packages -batch
- BATCH_PACKAGES = -vanilla -batch
+-BATCH = -no-packages -no-configured-paths -batch
++MY_BATCH = -no-packages -no-configured-paths -batch
+ BATCH_PACKAGES = -vanilla -no-configured-paths -batch
 -TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH)
 -XEMACS_BATCH = $(DO_XEMACS) $(BATCH)
 +TEMACS_BATCH = $(DO_TEMACS) -nd $(MY_BATCH)
@@ -32,7 +32,7 @@ SunOS 5 bmake / gmake fixes
  XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES)
  temacs_loadup_args = -l $(LISP)/loadup.el
  dump_temacs_args   = $(temacs_loadup_args) dump
-@@ -644,7 +644,7 @@ load-shadows: update-elc-2
+@@ -610,7 +610,7 @@ load-shadows: update-elc-2
  
  release: all
  	-if [ -w $(LISP) ]; then \
@@ -41,7 +41,7 @@ SunOS 5 bmake / gmake fixes
  	else true; fi
  	-$(dump_temacs)
  	touch release
-@@ -931,7 +931,7 @@ run-rtcmacs: rtcmacs
+@@ -897,7 +897,7 @@ run-rtcmacs: rtcmacs
  	ignore POLL; \
  	check -access; \
  	suppress rui; \
diff --git a/xemacs-hg/patches/patch-src_unexelf.c b/xemacs-hg/patches/patch-src_unexelf.c
deleted file mode 100644
index ba05c549dd..0000000000
--- a/xemacs-hg/patches/patch-src_unexelf.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-src_unexelf.c,v 1.1 2017/11/15 14:53:27 hauke Exp $
-
-Enhance ELF macros to deal with 32/64 bit arches
-Special-case alpha
-
---- src/unexelf.c.orig	2013-08-21 17:43:45.000000000 +0000
-+++ src/unexelf.c
-@@ -490,10 +490,19 @@ typedef struct {
- 
- #ifndef ElfW
- # ifdef __STDC__
--#  define ElfW(type)	Elf32_##type
-+#  define ElfBitsW(bits, type) Elf##bits##_##type
- # else
--#  define ElfW(type)	Elf32_/**/type
-+#  define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
- # endif
-+# if defined (_LP64) || defined(__alpha__)
-+#  define ELFSIZE 64
-+# else
-+#  define ELFSIZE 32
-+# endif
-+  /* This macro expands `bits' before invoking ElfBitsW.  */
-+# define ElfExpandBitsW(bits, type) ElfBitsW (bits, type)
-+# define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
-+
- #endif
- 
- #ifndef ELF_BSS_SECTION_NAME
-@@ -959,7 +968,7 @@ unexec (Extbyte *new_name, Extbyte *old_
-       memcpy (NEW_SECTION_H (nn).sh_offset + new_base, src,
- 	      NEW_SECTION_H (nn).sh_size);
- 
--#ifdef __alpha__
-+#if defined(__alpha__) && !defined(__NetBSD__)
-       /* Update Alpha COFF symbol table: */
-       if (strcmp (old_section_names + OLD_SECTION_H (n).sh_name, ".mdebug")
- 	  == 0)
Prev by Date: lpjs: Update to 0.0.5.205
Next by Date: naev12: forgot the TODO
Previous by Thread: lpjs: Update to 0.0.5.205
Next by Thread: naev12: forgot the TODO
Indexes:
Home | Main Index | Thread Index | Old Index