Update to 20.7.

PR:		ports/19692
Submitted by:	OKAZAKI Tetsurou <okazaki@be.to>

6 files changed, 68 insertions, 73 deletions

diff --git a/editors/emacs20-dl/files/patch-ai b/editors/emacs20-dl/files/patch-ai
index 1ae2376d3fed..c506c8761586 100644
--- a/editors/emacs20-dl/files/patch-ai
+++ b/editors/emacs20-dl/files/patch-ai
@@ -1,6 +1,6 @@
---- src/unexelf.c.orig	Mon Aug 10 11:33:12 1998
-+++ src/unexelf.c	Sun Jan  3 20:54:08 1999
-@@ -512,6 +512,14 @@
+--- src/unexelf.c.orig	Mon May 15 17:14:02 2000
++++ src/unexelf.c	Sat Jul  1 18:17:15 2000
+@@ -506,6 +506,14 @@
  # include <link.h>	/* get ElfW etc */
  #endif
  
@@ -14,4 +14,4 @@
 +
  #ifndef ElfW
  # ifdef __STDC__
- #  define ElfW(type)	Elf32_##type
+ #  define ElfBitsW(bits, type) Elf##bits##_##type
diff --git a/editors/emacs20-dl/files/patch-ca b/editors/emacs20-dl/files/patch-ca
index 082fd5458fe7..329193d7e25d 100644
--- a/editors/emacs20-dl/files/patch-ca
+++ b/editors/emacs20-dl/files/patch-ca
@@ -1,17 +1,6 @@
---- src/Makefile.in.orig	Fri Jan 14 23:02:09 2000
-+++ src/Makefile.in	Fri Jan 14 23:02:43 2000
-@@ -126,6 +126,10 @@
- #define LIBS_MACHINE
- #endif
- 
-+#ifndef LIBS_XPG
-+#define LIBS_XPG
-+#endif
-+
- #ifndef LIB_MATH
- # ifdef LISP_FLOAT_TYPE
- #  define LIB_MATH -lm
-@@ -418,7 +422,11 @@
+--- src/Makefile.in.orig	Sun Jul  2 12:44:43 2000
++++ src/Makefile.in	Sun Jul  2 12:44:44 2000
+@@ -418,7 +418,11 @@
  libexecdir=${exec_prefix}/libexec
  archlibdir=${libexecdir}/emacs/${version}/${configuration}
  #ifdef __FreeBSD__
@@ -23,21 +12,3 @@
  #else
  #define LINKER $(CC) -nostdlib -rdynamic -Wl,-rpath,${archlibdir}
  #endif
-@@ -569,7 +577,7 @@
- #define LIBS_TERMCAP
- termcapobj = termcap.o tparam.o
- #else /* LIBS_TERMCAP */
--termcapobj = tparam.o
-+termcapobj = terminfo.o
- #endif /* LIBS_TERMCAP */
- #endif /* ! defined (TERMINFO) */
- 
-@@ -814,7 +822,7 @@
-    duplicated symbols.  If the standard libraries were compiled
-    with GCC, we might need gnulib again after them.  */
- LIBES = $(LOADLIBES) $(LDLIBS) $(LIBX) $(LIBDL) LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
--   LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
-+   LIBS_XPG LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
- 
- /* Enable recompilation of certain other files depending on system type.  */
- 
diff --git a/editors/emacs20-dl/files/patch-cb b/editors/emacs20-dl/files/patch-cb
index 28e6f9f1ae15..5a37edcb5321 100644
--- a/editors/emacs20-dl/files/patch-cb
+++ b/editors/emacs20-dl/files/patch-cb
@@ -1,20 +1,26 @@
---- src/s/freebsd.h.orig	Tue Apr 13 03:22:12 1999
-+++ src/s/freebsd.h	Sat Jul 24 01:30:10 1999
-@@ -45,6 +45,13 @@
- #define LIBS_SYSTEM -lutil
- #define LIBS_TERMCAP -ltermcap
+--- src/s/freebsd.h.orig	Tue May  2 21:29:10 2000
++++ src/s/freebsd.h	Sat Jul  1 20:17:45 2000
+@@ -41,8 +41,18 @@
+ 
+ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
  
 +/* Use XPG4 Library for FreeBSD */
-+#if __FreeBSD_version >= 220000
++#define LIBS_XPG
++#if (__FreeBSD_version >= 220000 && __FreeBSD_version < 400020) \
++    || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
 +#ifdef USE_XPG
++#undef LIBS_XPG
 +#define LIBS_XPG -lxpg4
 +#endif
 +#endif
 +
- #define SYSV_SYSTEM_DIR
- 
- /* freebsd has POSIX-style pgrp behavior. */
-@@ -54,9 +61,16 @@
+ #define LIBS_DEBUG
+-#define LIBS_SYSTEM -lutil
++#define LIBS_SYSTEM -lutil LIBS_XPG
+ #if __FreeBSD_version < 400000
+ #define LIBS_TERMCAP -ltermcap
+ #endif
+@@ -56,9 +66,16 @@
  #ifdef __ELF__
  
  #define LD_SWITCH_SYSTEM
diff --git a/editors/emacs20-dl/files/patch-cc b/editors/emacs20-dl/files/patch-cc
index f643112fc00d..cc565bb5cd40 100644
--- a/editors/emacs20-dl/files/patch-cc
+++ b/editors/emacs20-dl/files/patch-cc
@@ -1,5 +1,5 @@
---- configure.in.orig	Sun May 30 04:26:03 1999
-+++ configure.in	Sat Jul 24 01:33:18 1999
+--- configure.in.orig	Tue Jun  6 00:42:49 2000
++++ configure.in	Sat Jul  1 20:46:31 2000
 @@ -42,6 +42,9 @@
  AC_ARG_WITH(hesiod,
  [  --with-hesiod           support Hesiod to get the POP server host],
@@ -26,7 +26,7 @@
    ## NetBSD ports
    *-*-netbsd* )
      opsys=netbsd
-@@ -943,7 +955,6 @@
+@@ -958,7 +970,6 @@
  				;;
        *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )	        opsys=386bsd ;;
@@ -34,3 +34,12 @@
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
+@@ -1639,7 +1650,7 @@
+ rename closedir mkdir rmdir sysinfo \
+ random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
+ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
+-utimes setrlimit setpgid getcwd shutdown strftime)
++utimes setrlimit setpgid getcwd shutdown strftime getaddrinfo)
+ 
+ # UNIX98 PTYs.
+ AC_CHECK_FUNCS(grantpt)
diff --git a/editors/emacs20-dl/files/patch-cd b/editors/emacs20-dl/files/patch-cd
index 9792250f67b9..bd0d3fe516a2 100644
--- a/editors/emacs20-dl/files/patch-cd
+++ b/editors/emacs20-dl/files/patch-cd
@@ -1,5 +1,5 @@
---- src/config.in.orig	Sat Nov 21 09:00:30 1998
-+++ src/config.in	Sat Nov 21 09:00:58 1998
+--- src/config.in.orig	Mon Jun 26 19:06:49 2000
++++ src/config.in	Mon Jun 26 19:07:38 2000
 @@ -118,6 +118,9 @@
  /* Define to support using a Hesiod database to find the POP server.  */
  #undef HESIOD
@@ -10,3 +10,11 @@
  /* Some things figured out by the configure script, grouped as they are in
     configure.in.  */
  #ifndef _ALL_SOURCE  /* suppress warning if this is pre-defined */
+@@ -236,6 +239,7 @@
+ #undef HAVE_STRFTIME
+ #undef HAVE_GRANTPT
+ #undef HAVE_GETPT
++#undef HAVE_GETADDRINFO
+ 
+ #undef LOCALTIME_CACHE
+ #undef HAVE_INET_SOCKETS
diff --git a/editors/emacs20-dl/files/patch-cg b/editors/emacs20-dl/files/patch-cg
index c0d8ff436c75..b1087db71b9e 100644
--- a/editors/emacs20-dl/files/patch-cg
+++ b/editors/emacs20-dl/files/patch-cg
@@ -1,5 +1,5 @@
---- src/process.c-dist	Fri Aug 14 22:51:44 1998
-+++ src/process.c	Fri Jul 30 12:21:11 1999
+--- src/process.c.orig	Wed May 24 04:10:16 2000
++++ src/process.c	Sat Jul  1 20:37:08 2000
 @@ -1,7 +1,18 @@
 +/*
 + * Locally hacked process.c to add ipv6 support. -wsr
@@ -19,7 +19,7 @@
  This file is part of GNU Emacs.
  
  GNU Emacs is free software; you can redistribute it and/or modify
-@@ -1808,15 +1819,22 @@
+@@ -1810,15 +1821,22 @@
  {
    Lisp_Object proc;
    register int i;
@@ -45,7 +45,7 @@
    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
    int retry = 0;
    int count = specpdl_ptr - specpdl;
-@@ -1829,6 +1847,22 @@
+@@ -1831,6 +1849,22 @@
    GCPRO4 (name, buffer, host, service);
    CHECK_STRING (name, 0);
    CHECK_STRING (host, 0);
@@ -68,7 +68,7 @@
    if (INTEGERP (service))
      port = htons ((unsigned short) XINT (service));
    else
-@@ -1839,6 +1873,8 @@
+@@ -1841,6 +1875,8 @@
  	error ("Unknown service \"%s\"", XSTRING (service)->data);
        port = svc_info->s_port;
      }
@@ -77,11 +77,11 @@
  
    /* Slow down polling to every ten seconds.
       Some kernels have a bug which causes retrying connect to fail
-@@ -1848,6 +1884,62 @@
+@@ -1850,6 +1886,62 @@
  #endif
  
  #ifndef TERM
-+#ifdef HAVE_GETADDRINFO		/* We have a modern OS. -wsr */
++#ifdef HAVE_GETADDRINFO               /* We have a modern OS. -wsr */
 +  {
 +      immediate_quit = 1;
 +      QUIT;
@@ -92,8 +92,8 @@
 +      hints.ai_protocol = 0;
 +      ret = getaddrinfo(XSTRING (host)->data, portstring, &hints, &res);
 +      if (ret){
-+	  error("%s/%s %s", XSTRING (host)->data, portstring,
-+		gai_strerror(ret));
++        error("%s/%s %s", XSTRING (host)->data, portstring,
++              gai_strerror(ret));
 +      }
 +      immediate_quit = 0;
 +  }
@@ -101,25 +101,25 @@
 +  for (lres = res; lres ; lres = lres->ai_next) { /* address loop */
 +      s = socket(lres->ai_family, lres->ai_socktype, lres->ai_protocol);
 +      if (s < 0) 
-+	  continue;
++        continue;
 +
 +      /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
-+	 when connect is interrupted.  So let's not let it get interrupted.
-+	 Note we do not turn off polling, because polling is only used
-+	 when not interrupt_input, and thus not normally used on the systems
-+	 which have this bug.  On systems which use polling, there's no way
-+	 to quit if polling is turned off.  */
++       when connect is interrupted.  So let's not let it get interrupted.
++       Note we do not turn off polling, because polling is only used
++       when not interrupt_input, and thus not normally used on the systems
++       which have this bug.  On systems which use polling, there's no way
++       to quit if polling is turned off.  */
 +      if (interrupt_input)
-+	  unrequest_sigio ();
++        unrequest_sigio ();
 +
 +      immediate_quit = 1;
 +      QUIT;
 +
 +      ret = connect(s, lres->ai_addr, lres->ai_addrlen);
 +      if (ret){
-+	  close(s);
-+	  s= -1;
-+	  continue;
++        close(s);
++        s= -1;
++        continue;
 +      }
 +
 +      break;
@@ -129,21 +129,22 @@
 +  if (s < 0)
 +  {
 +      if (interrupt_input)
-+	  request_sigio ();
++        request_sigio ();
 +
 +      errno = xerrno;
 +      report_file_error ("connection failed",
-+			 Fcons (host, Fcons (name, Qnil)));
++                       Fcons (host, Fcons (name, Qnil)));
 +  }
 +#else /* HAVE_GETADDRINFO */
 +
    while (1)
      {
  #ifdef TRY_AGAIN
-@@ -1938,6 +2030,7 @@
+@@ -1940,6 +2032,7 @@
        report_file_error ("connection failed",
  			 Fcons (host, Fcons (name, Qnil)));
      }
 +#endif /* HAVE_GETADDRINFO */
  
    immediate_quit = 0;
+