[pkgsrc/trunk]: pkgsrc/editors/xemacs-current/patches Upgrade to XEmacs 21.5.34

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5193bd1d838f
branches:  trunk
changeset: 371581:5193bd1d838f
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Wed Nov 15 14:53:27 2017 +0000

description:
Upgrade to XEmacs 21.5.34

Enhance ELF macros to deal with 32/64 bit arches
Special-case alpha

Was patch-ad

diffstat:

 editors/xemacs-current/patches/patch-ad            |  35 -------------------
 editors/xemacs-current/patches/patch-src_unexelf.c |  40 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 35 deletions(-)

diffs (83 lines):

diff -r db67d1c766ac -r 5193bd1d838f editors/xemacs-current/patches/patch-ad
--- a/editors/xemacs-current/patches/patch-ad   Wed Nov 15 14:52:02 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/09/04 09:20:51 martin Exp $
-
---- src/unexelf.c.orig 2005-10-29 09:18:21.000000000 +0200
-+++ src/unexelf.c      2006-08-30 17:51:08.000000000 +0200
-@@ -492,10 +492,19 @@
- 
- #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
-@@ -961,7 +970,7 @@
-       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)
diff -r db67d1c766ac -r 5193bd1d838f editors/xemacs-current/patches/patch-src_unexelf.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/patches/patch-src_unexelf.c        Wed Nov 15 14:53:27 2017 +0000
@@ -0,0 +1,40 @@
+$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
+
+Was patch-ad
+
+--- 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)