diff options
-rw-r--r-- | editors/xemacs/Makefile | 4 | ||||
-rw-r--r-- | editors/xemacs/files/md5 | 8 | ||||
-rw-r--r-- | editors/xemacs/files/patch-sum | 5 | ||||
-rw-r--r-- | editors/xemacs/patches/patch-ag | 12 | ||||
-rw-r--r-- | editors/xemacs/patches/patch-ah | 34 | ||||
-rw-r--r-- | editors/xemacs/pkg/PLIST | 6 |
6 files changed, 22 insertions, 47 deletions
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 25938cecff7..ccdb8e3d66e 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2001/02/16 14:40:55 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2001/02/20 13:04:30 tron Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp -DISTNAME= xemacs-21.1.12 +DISTNAME= xemacs-21.1.14 CATEGORIES= editors MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.1/ \ ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-21.1/ \ diff --git a/editors/xemacs/files/md5 b/editors/xemacs/files/md5 index ba4fef80ad1..517c36fa95f 100644 --- a/editors/xemacs/files/md5 +++ b/editors/xemacs/files/md5 @@ -1,5 +1,5 @@ -$NetBSD: md5,v 1.9 2000/11/25 10:47:16 tron Exp $ +$NetBSD: md5,v 1.10 2001/02/20 13:04:30 tron Exp $ -MD5 (xemacs/xemacs-21.1.12.tar.bz2) = 0793ecbc36c39a5232633ed526ba6b37 -MD5 (xemacs/xemacs-21.1.12-elc.tar.gz) = f8f92769624d8b698c95d290fae9ff2c -MD5 (xemacs/xemacs-21.1.12-info.tar.gz) = 1c815ecdc153000659a7bc0c51ae5737 +MD5 (xemacs/xemacs-21.1.14.tar.bz2) = a1aa60c98319c60720f23dc1a9d1deaa +MD5 (xemacs/xemacs-21.1.14-elc.tar.gz) = e103c8143a92aca750d502da88a2ace5 +MD5 (xemacs/xemacs-21.1.14-info.tar.gz) = 76b23d75e67de550ee51fc92e83a6b02 diff --git a/editors/xemacs/files/patch-sum b/editors/xemacs/files/patch-sum index 2fe6fcb3988..54513dc6ef5 100644 --- a/editors/xemacs/files/patch-sum +++ b/editors/xemacs/files/patch-sum @@ -1,12 +1,11 @@ -$NetBSD: patch-sum,v 1.7 2000/09/28 11:28:24 toshii Exp $ +$NetBSD: patch-sum,v 1.8 2001/02/20 13:04:30 tron Exp $ MD5 (patch-aa) = c5d92bd8fd195c22694f38ee2fb9f6bb MD5 (patch-ab) = 5a2d1fb672b4e76fe93583022d967936 MD5 (patch-ac) = d4b9aaaf02a01e77949dc456b2f13519 MD5 (patch-ad) = c9ff11d00130b14e1cdd29e85ebad5ab MD5 (patch-af) = b1e83f33763647b9498d454e54888824 -MD5 (patch-ag) = 504f7f2faabecc5b3c9d56f915bd8ca0 -MD5 (patch-ah) = 4292edfaf17d1a718c2dc07c7db3294a +MD5 (patch-ah) = 7600abe778f5c3859b88ec8aa6f54208 MD5 (patch-ai) = 76c200f59a51fd7e5c8dc9333ffc0e7e MD5 (patch-ak) = 30f473fa474bc7d48bb7fe6afd66aeb1 MD5 (patch-al) = 46cb11814be5fa3f01c7d2fca56fd450 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) diff --git a/editors/xemacs/pkg/PLIST b/editors/xemacs/pkg/PLIST index 507eac9a202..4d9cf0c1e8a 100644 --- a/editors/xemacs/pkg/PLIST +++ b/editors/xemacs/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2000/11/25 10:47:16 tron Exp $ +@comment $NetBSD: PLIST,v 1.10 2001/02/20 13:04:31 tron Exp $ bin/gnuattach bin/gnuclient bin/gnudoit @@ -748,9 +748,11 @@ lib/${PKGNAME}/lisp/xpm-button.el${ELSUFX} lib/${PKGNAME}/lisp/xpm-button.elc lib/${PKGNAME}/lisp/finder-inf.el${ELSUFX} lib/${PKGNAME}/lisp/finder-inf.elc +lib/${PKGNAME}/lisp/mule/auto-autoloads.el${ELSUFX} lib/${PKGNAME}/lisp/mule/arabic.el${ELSUFX} lib/${PKGNAME}/lisp/mule/canna-leim.el${ELSUFX} lib/${PKGNAME}/lisp/mule/chinese.el${ELSUFX} +lib/${PKGNAME}/lisp/mule/custom-load.el${ELSUFX} lib/${PKGNAME}/lisp/mule/cyrillic.el${ELSUFX} lib/${PKGNAME}/lisp/mule/english.el${ELSUFX} lib/${PKGNAME}/lisp/mule/ethiopic.el${ELSUFX} @@ -774,7 +776,9 @@ lib/${PKGNAME}/lisp/mule/mule-x-init.el${ELSUFX} lib/${PKGNAME}/lisp/mule/mule-tty-init.el${ELSUFX} lib/${PKGNAME}/lisp/mule/thai-xtis-chars.el${ELSUFX} lib/${PKGNAME}/lisp/mule/viet-chars.el${ELSUFX} +lib/${PKGNAME}/lisp/mule/auto-autoloads.elc lib/${PKGNAME}/lisp/mule/arabic.elc +lib/${PKGNAME}/lisp/mule/custom-load.elc lib/${PKGNAME}/lisp/mule/canna-leim.elc lib/${PKGNAME}/lisp/mule/chinese.elc lib/${PKGNAME}/lisp/mule/cyrillic.elc |