Updated to 20.7. Tests needed.

9 files changed, 53 insertions, 246 deletions

diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab
index 2de9ea25e9d..f5d3b9fbc61 100644
--- a/editors/emacs/patches/patch-ab
+++ b/editors/emacs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2000/03/01 05:07:41 minoura Exp $
+$NetBSD: patch-ab,v 1.11 2000/06/24 17:03:38 minoura Exp $
 
---- configure.orig	Fri Dec  3 16:41:15 1999
-+++ configure	Tue Feb 29 15:36:45 2000
+--- configure.orig	Tue Jun 13 05:05:56 2000
++++ configure	Sun Jun 18 09:18:13 2000
 @@ -21,6 +21,9 @@
    --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
  ac_help="$ac_help
@@ -12,20 +12,20 @@ $NetBSD: patch-ab,v 1.10 2000/03/01 05:07:41 minoura Exp $
  
  # Initialize some variables set by options.
  # The variables have the same names as the options, with
-@@ -715,9 +718,12 @@
+@@ -718,9 +721,12 @@
  			machine=hp9000s300 ;;
        powerpc-apple-netbsd*) machine=macppc ;;
        mips-*-netbsd*)	machine=pmax ;;
 +      mipsel-*-netbsd*)	machine=pmax ;;
        ns32k-*-netbsd*)	machine=ns32000 ;;
-+      powerpc-*-netbsd*) machine=powerpc ;;
++      powerpc-*-netbsd*) machine=macppc ;;
        sparc-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
 +      arm*-*-netbsd*)	machine=arm ;;
      esac
    ;;
  
-@@ -4690,6 +4696,64 @@
+@@ -4903,6 +4909,64 @@
    cat >> confdefs.h <<\EOF
  #define HAVE_AIX_SMT_EXP 1
  EOF
diff --git a/editors/emacs/patches/patch-ag b/editors/emacs/patches/patch-ag
index 324631b0101..b2fd6bfc6a9 100644
--- a/editors/emacs/patches/patch-ag
+++ b/editors/emacs/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.6 1999/12/28 14:08:56 tron Exp $
+$NetBSD: patch-ag,v 1.7 2000/06/24 17:03:38 minoura Exp $
 
---- src/config.in.orig	Mon Apr 26 14:19:44 1999
-+++ src/config.in	Fri Dec 17 14:32:45 1999
-@@ -234,6 +234,7 @@
- #undef HAVE_GETCWD
- #undef HAVE_SHUTDOWN
+--- src/config.in.orig	Sat May 20 23:58:21 2000
++++ src/config.in	Sun Jun 18 09:00:34 2000
+@@ -236,6 +236,7 @@
  #undef HAVE_STRFTIME
+ #undef HAVE_GRANTPT
+ #undef HAVE_GETPT
 +#undef HAVE_GETADDRINFO
  
  #undef LOCALTIME_CACHE
diff --git a/editors/emacs/patches/patch-ah b/editors/emacs/patches/patch-ah
index 9e2a050fc99..46dfbf872e7 100644
--- a/editors/emacs/patches/patch-ah
+++ b/editors/emacs/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 1999/12/28 14:08:57 tron Exp $
+$NetBSD: patch-ah,v 1.3 2000/06/24 17:03:38 minoura Exp $
 
---- src/fileio.c.orig	Thu Jul  8 07:36:06 1999
-+++ src/fileio.c	Fri Aug  6 08:56:39 1999
-@@ -3207,8 +3207,11 @@
+--- src/fileio.c.orig	Tue May 16 20:02:13 2000
++++ src/fileio.c	Sun Jun 18 09:19:08 2000
+@@ -3252,8 +3252,11 @@
    return value;
  }
  
diff --git a/editors/emacs/patches/patch-ai b/editors/emacs/patches/patch-ai
index 838825bec0d..9db5e501b6b 100644
--- a/editors/emacs/patches/patch-ai
+++ b/editors/emacs/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 1999/12/28 14:08:57 tron Exp $
+$NetBSD: patch-ai,v 1.3 2000/06/24 17:03:38 minoura Exp $
 
---- src/sysdep.c.orig	Wed Nov  4 19:44:59 1998
-+++ src/sysdep.c	Sat Aug  7 14:00:26 1999
-@@ -2127,6 +2127,7 @@
+--- src/sysdep.c.orig	Wed May 24 22:59:14 2000
++++ src/sysdep.c	Sun Jun 18 09:19:44 2000
+@@ -2134,6 +2134,7 @@
   *
   */
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.2 1999/12/28 14:08:57 tron Exp $
  #ifndef HAVE_TEXT_START
  char *
  start_of_text ()
-@@ -2144,6 +2145,7 @@
+@@ -2151,6 +2152,7 @@
  #endif /* TEXT_START */
  }
  #endif /* not HAVE_TEXT_START */
diff --git a/editors/emacs/patches/patch-aj b/editors/emacs/patches/patch-aj
index 2e24b19c1a8..5383bc56c7a 100644
--- a/editors/emacs/patches/patch-aj
+++ b/editors/emacs/patches/patch-aj
@@ -1,8 +1,7 @@
-$NetBSD: patch-aj,v 1.6 2000/03/18 02:31:31 minoura Exp $
+$NetBSD: patch-aj,v 1.7 2000/06/24 17:03:38 minoura Exp $
 
- 
---- src/process.c.orig	Tue Feb 15 19:16:26 2000
-+++ src/process.c	Sat Mar 18 11:17:04 2000
+--- src/process.c.orig	Wed May 24 04:10:16 2000
++++ src/process.c	Sun Jun 18 09:20:15 2000
 @@ -1,7 +1,18 @@
 +/*
 + * Locally hacked process.c to add ipv6 support. -wsr
@@ -22,7 +21,7 @@ $NetBSD: patch-aj,v 1.6 2000/03/18 02:31:31 minoura Exp $
  This file is part of GNU Emacs.
  
  GNU Emacs is free software; you can redistribute it and/or modify
-@@ -1806,15 +1817,21 @@
+@@ -1810,15 +1821,21 @@
  {
    Lisp_Object proc;
    register int i;
@@ -47,7 +46,7 @@ $NetBSD: patch-aj,v 1.6 2000/03/18 02:31:31 minoura Exp $
    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
    int retry = 0;
    int count = specpdl_ptr - specpdl;
-@@ -1827,6 +1844,22 @@
+@@ -1831,6 +1848,22 @@
    GCPRO4 (name, buffer, host, service);
    CHECK_STRING (name, 0);
    CHECK_STRING (host, 0);
@@ -70,7 +69,7 @@ $NetBSD: patch-aj,v 1.6 2000/03/18 02:31:31 minoura Exp $
    if (INTEGERP (service))
      port = htons ((unsigned short) XINT (service));
    else
-@@ -1837,6 +1870,8 @@
+@@ -1841,6 +1874,8 @@
  	error ("Unknown service \"%s\"", XSTRING (service)->data);
        port = svc_info->s_port;
      }
@@ -79,7 +78,7 @@ $NetBSD: patch-aj,v 1.6 2000/03/18 02:31:31 minoura Exp $
  
    /* Slow down polling to every ten seconds.
       Some kernels have a bug which causes retrying connect to fail
-@@ -1846,6 +1881,88 @@
+@@ -1850,6 +1885,88 @@
  #endif
  
  #ifndef TERM
@@ -168,7 +167,7 @@ $NetBSD: patch-aj,v 1.6 2000/03/18 02:31:31 minoura Exp $
    while (1)
      {
  #ifdef TRY_AGAIN
-@@ -1936,6 +2053,7 @@
+@@ -1940,6 +2057,7 @@
        report_file_error ("connection failed",
  			 Fcons (host, Fcons (name, Qnil)));
      }
diff --git a/editors/emacs/patches/patch-aw b/editors/emacs/patches/patch-aw
deleted file mode 100644
index 326dfef5689..00000000000
--- a/editors/emacs/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.2 1999/12/28 14:09:14 tron Exp $
-
---- src/emacs.c.orig	Wed Jun 30 02:11:06 1999
-+++ src/emacs.c	Fri Aug  6 08:59:59 1999
-@@ -1048,7 +1048,7 @@
-     }
- 
-   no_loadup
--    = !argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
-+    = argmatch (argv, argc, "-nl", "--no-loadup", 6, NULL, &skip_args);
- 
- 
- #ifdef HAVE_X_WINDOWS
diff --git a/editors/emacs/patches/patch-az b/editors/emacs/patches/patch-az
index 67d158e0251..2fb02021bc0 100644
--- a/editors/emacs/patches/patch-az
+++ b/editors/emacs/patches/patch-az
@@ -1,33 +1,8 @@
-$NetBSD: patch-az,v 1.8 2000/02/18 23:57:54 mycroft Exp $
+$NetBSD: patch-az,v 1.9 2000/06/24 17:03:39 minoura Exp $
 
---- src/unexelf.c.orig	Fri Dec  3 04:09:21 1999
-+++ src/unexelf.c	Fri Feb 18 18:56:56 2000
-@@ -478,6 +478,13 @@
- # endif
- # include <sys/exec_elf.h>
- 
-+#include <sys/param.h>
-+
-+/* NetBSD 1.4M has sane <elf.h> */
-+
-+#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 104130000
-+# include <sys/exec_elf.h>
-+
- # define PT_LOAD	Elf_pt_load
- # define SHT_SYMTAB	Elf_sht_symtab
- # define SHT_DYNSYM	Elf_sht_dynsym
-@@ -490,6 +497,10 @@
- # define SHN_ABS	Elf_eshn_absolute
- # define SHN_COMMON	Elf_eshn_common
- 
-+#else
-+# include <elf.h>
-+#endif
-+
- /*
-  * The magic of picking the right size types is handled by the ELFSIZE
-  * definition above.
-@@ -504,9 +515,14 @@
+--- src/unexelf.c.orig	Mon May 15 17:14:02 2000
++++ src/unexelf.c	Sun Jun 18 09:44:41 2000
+@@ -495,9 +495,14 @@
  #  include <sys/exec_ecoff.h>
  #  define HDRR		struct ecoff_symhdr
  #  define pHDRR		HDRR *
@@ -43,8 +18,8 @@ $NetBSD: patch-az,v 1.8 2000/02/18 23:57:54 mycroft Exp $
  #ifdef __OpenBSD__
  # include <sys/exec_elf.h>
  #endif
-@@ -530,6 +546,14 @@
- extern void fatal (char *, ...);
+@@ -522,6 +527,14 @@
+ # define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
  #endif
  
 +#if defined ( __sony_news) && defined (_SYSTYPE_SYSV)
@@ -58,8 +33,15 @@ $NetBSD: patch-az,v 1.8 2000/02/18 23:57:54 mycroft Exp $
  #ifndef ELF_BSS_SECTION_NAME
  #define ELF_BSS_SECTION_NAME ".bss"
  #endif
-@@ -588,6 +612,47 @@
-   return x - rem + y;
+@@ -613,12 +626,53 @@
+       if (noerror)
+ 	return -1;
+       else
+-	fatal ("Can't find %s in %s.\n", name, file_name, 0);
++	fatal ("Can't find %s in %s.\n", name, file_name);
+     }
+ 
+   return idx;
  }
  
 +#if defined(__alpha__) || (defined ( __sony_news) && defined (_SYSTYPE_SYSV))
@@ -106,7 +88,7 @@ $NetBSD: patch-az,v 1.8 2000/02/18 23:57:54 mycroft Exp $
  /* ****************************************************************
   * unexec
   *
-@@ -983,22 +1048,11 @@
+@@ -1005,22 +1059,11 @@
  	  == 0)
  	{
  	  pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base);
@@ -128,10 +110,10 @@ $NetBSD: patch-az,v 1.8 2000/02/18 23:57:54 mycroft Exp $
  
 -#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
 +#ifdef HAVE_MIPS_SBSS
-       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG && old_mdebug_index) 
+       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
+ 	  && old_mdebug_index != -1) 
          {
- 	  int diff = NEW_SECTION_H(nn).sh_offset 
-@@ -1007,20 +1061,17 @@
+@@ -1030,20 +1073,17 @@
  
  	  if (diff)
  	    {
diff --git a/editors/emacs/patches/patch-bd b/editors/emacs/patches/patch-bd
deleted file mode 100644
index 154018396c7..00000000000
--- a/editors/emacs/patches/patch-bd
+++ /dev/null
@@ -1,161 +0,0 @@
-$NetBSD: patch-bd,v 1.2 1999/06/04 04:15:44 mycroft Exp $
-
---- /dev/null	Thu Jun  3 22:42:46 1999
-+++ src/m/powerpc.h	Thu Jun  3 23:04:00 1999
-@@ -0,0 +1,156 @@
-+/* machine description file For the PowerPC chip.
-+   Copyright (C) 1994, 1997 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 1, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#define WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+ * to be corrected before they can be used as byte counts.  */
-+
-+/* #define WORD_MACHINE */
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+
-+/* __powerpc__ defined automatically */
-+
-+
-+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#define EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+   Then the function dump-emacs will not be defined
-+   and temacs will do (load "loadup") automatically unless told otherwise.  */
-+
-+/* #define CANNOT_DUMP */
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+   pure and impure space as loaded can vary, and even their
-+   relative order cannot be relied on.
-+
-+   Otherwise Emacs assumes that text space precedes data space,
-+   numerically.  */
-+
-+/* #define VIRT_ADDR_VARIES */
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#define HAVE_ALLOCA
-+
-+/* GNU malloc and the relocating allocator do not work together
-+   with X.   [Who wrote that?]  */
-+
-+/* May 1995: reportedly [Rainer Schoepf <schoepf@uni-mainz.de>] both the
-+   system and the gnu malloc system work with "alpha-dec-osf3.0" and
-+   "alpha-dec-osf3.2".  */
-+
-+/* May 1995: it seems to me [Morten Welinder <terra@diku.dk>] that both
-+   mallocs work with "alpha-dec-osf2.0", but I daren't break anything
-+   right now.  Feel free to play if you want.  */
-+
-+/* #define SYSTEM_MALLOC */
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+   to change the boundary between the text section and data section
-+   when Emacs is dumped.  If you define this, the preloaded Lisp
-+   code will not be sharable; but that's better than failing completely.  */
-+
-+#define NO_REMAP
-+
-+/* Some really obscure 4.2-based systems (like Sequent DYNIX)
-+ * do not support asynchronous I/O (using SIGIO) on sockets,
-+ * even though it works fine on tty's.  If you have one of
-+ * these systems, define the following, and then use it in
-+ * config.h (or elsewhere) to decide when (not) to use SIGIO.
-+ *
-+ * You'd think this would go in an operating-system description file,
-+ * but since it only occurs on some, but not all, BSD systems, the
-+ * reasonable place to select for it is in the machine description
-+ * file.
-+ */
-+
-+/* #define NO_SOCK_SIGIO */
-+
-+
-+#ifdef __ELF__
-+/* With ELF, make sure that all common symbols get allocated to in the
-+   data section.  Otherwise, the dump of temacs may miss variables in
-+   the shared library that have been initialized.  For example, with
-+   GNU libc, __malloc_initialized would normally be resolved to the
-+   shared library's .bss section, which is fatal.  */
-+# ifdef __GNUC__
-+#  define C_SWITCH_MACHINE	-fno-common
-+# else
-+#  error What gives?  Fix me if DEC Unix supports ELF now.
-+# endif
-+#endif
-+
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#define ORDINARY_LINK
-+#endif
-+
-+#ifdef __ELF__
-+#undef UNEXEC
-+#define UNEXEC unexelf.o
-+#endif
-+
-+/* On the Alpha it's best to avoid including TERMIO since struct
-+   termio and struct termios are mutually incompatible.  */
-+#define NO_TERMIO
-+
-+#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-+# define TEXT_END ({ extern int _etext; &_etext; })
-+#endif
-+
-+#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
diff --git a/editors/emacs/patches/patch-bg b/editors/emacs/patches/patch-bg
index 0405adec27b..a81910a5b41 100644
--- a/editors/emacs/patches/patch-bg
+++ b/editors/emacs/patches/patch-bg
@@ -1,7 +1,7 @@
-$NetBSD: patch-bg,v 1.1 2000/03/01 07:16:59 minoura Exp $
+$NetBSD: patch-bg,v 1.2 2000/06/24 17:03:39 minoura Exp $
 
---- configure.in.orig	Mon Nov 29 03:18:39 1999
-+++ configure.in	Tue Feb 29 14:10:24 2000
+--- configure.in.orig	Tue Jun  6 00:42:49 2000
++++ configure.in	Sun Jun 18 09:22:42 2000
 @@ -66,6 +66,8 @@
  	  esac
  	  with_x_toolkit=$val
@@ -17,14 +17,14 @@ $NetBSD: patch-bg,v 1.1 2000/03/01 07:16:59 minoura Exp $
        mips-*-netbsd*)	machine=pmax ;;
 +      mipsel-*-netbsd*)	machine=pmax ;;
        ns32k-*-netbsd*)	machine=ns32000 ;;
-+      powerpc-*-netbsd*) machine=powerpc ;;
++      powerpc-*-netbsd*) machine=macppc ;;
        sparc-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
 +      arm*-*-netbsd*)	machine=arm ;;
      esac
    ;;
  
-@@ -1724,6 +1729,10 @@
+@@ -1745,6 +1750,10 @@
  
  if test -f /usr/lpp/X11/bin/smt.exp; then
    AC_DEFINE(HAVE_AIX_SMT_EXP)