2 files changed, 9 insertions, 37 deletions
diff --git a/editors/xemacs/patches/patch-ag b/editors/xemacs/patches/patch-ag
deleted file mode 100644
index 5975702949b..00000000000
--- a/editors/xemacs/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/06/29 23:13:41 tron Exp $
-
---- src/s/netbsd.h.orig	Fri Jul 24 05:57:27 1998
-+++ src/s/netbsd.h	Fri Jul 24 05:58:34 1998
-@@ -60,3 +60,7 @@
- #define ORDINARY_LINK
-+#ifdef __ELF__
-+#define UNEXEC "unexelf.o" /* we're not in an a.out world anymore friends */
-+#else
- #define UNEXEC "unexfreebsd.o"  /* ironic, considering history of unexfreebsd */
-+#endif
- 
diff --git a/editors/xemacs/patches/patch-ah b/editors/xemacs/patches/patch-ah
index 7926b5b7936..7f718f814ed 100644
--- a/editors/xemacs/patches/patch-ah
+++ b/editors/xemacs/patches/patch-ah
@@ -1,38 +1,22 @@
-$NetBSD: patch-ah,v 1.4 2000/09/28 11:28:24 toshii Exp $
+$NetBSD: patch-ah,v 1.5 2001/02/20 13:04:31 tron Exp $
 
---- src/unexelf.c.orig	Sat Dec  4 13:13:06 1999
-+++ src/unexelf.c
-@@ -482,6 +482,7 @@
- # endif
- # include <sys/exec_elf.h>
- 
-+# ifndef PT_LOAD
- # define PT_LOAD	Elf_pt_load
- # define SHT_SYMTAB	Elf_sht_symtab
- # define SHT_DYNSYM	Elf_sht_dynsym
-@@ -493,6 +494,7 @@
- # define SHN_UNDEF	Elf_eshn_undefined
- # define SHN_ABS	Elf_eshn_absolute
- # define SHN_COMMON	Elf_eshn_common
-+# endif
- 
- # ifdef __alpha__
- #  include <sys/exec_ecoff.h>
-@@ -511,10 +513,18 @@
+--- src/unexelf.c.orig	Tue Jan  9 04:27:56 2001
++++ src/unexelf.c	Tue Feb 20 11:48:04 2001
+@@ -481,10 +481,18 @@
  
  #ifndef ElfW
  # ifdef __STDC__
 -#  define ElfW(type)	Elf32_##type
 +#  define ElfBitsW(bits, type) Elf##bits##_##type
-+# else
+ # else
+-#  define ElfW(type)	Elf32_/**/type
 +#  define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
-+# endif
+ # endif
 +# if defined (_LP64) || defined(__alpha__)
 +#  define ELFSIZE 64
- # else
--#  define ElfW(type)	Elf32_/**/type
++# else
 +#  define ELFSIZE 32
- # endif
++# endif
 +  /* This macro expands `bits' before invoking ElfBitsW.  */
 +# define ElfExpandBitsW(bits, type) ElfBitsW (bits, type)
 +# define ElfW(type) ElfExpandBitsW (ELFSIZE, type)