Re-import of Emacs 20, which has settled down in editors/emacs.

30 files changed, 2617 insertions, 0 deletions

diff --git a/editors/emacs20/patches/patch-aa b/editors/emacs20/patches/patch-aa
new file mode 100644
index 00000000000..1cec1752b4d
--- /dev/null
+++ b/editors/emacs20/patches/patch-aa
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/04/11 00:31:44 uebayasi Exp $
+
+--- man/Makefile.in.orig	Sat Dec  5 08:33:16 1998
++++ man/Makefile.in	Fri Aug  6 08:34:06 1999
+@@ -14,7 +14,7 @@
+ MAKEINFO = makeinfo
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+ 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+-		../info/info ../info/message ../info/mh-e ../info/reftex \
++		../info/message ../info/mh-e ../info/reftex \
+ 		../info/sc ../info/vip ../info/viper ../info/widget
+ DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi \
+ 		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+@@ -70,6 +70,7 @@
+ 	${srcdir}/glossary.texi \
+ 	${srcdir}/ack.texi
+ 
++all: info
+ info: $(INFO_TARGETS)
+ 
+ dvi: $(DVI_TARGETS)
+@@ -78,12 +79,6 @@
+ # in srcdir.  There is no provision for Info files
+ # to exist in the build directory.
+ # In a distribution of Emacs, the Info files should be up to date.
+-
+-../info/info: ${INFOSOURCES}
+-	cd $(srcdir); $(MAKEINFO) --no-split info.texi
+-
+-info.dvi: ${INFOSOURCES}
+-	$(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+ 
+ ../info/emacs: ${EMACSSOURCES}
+ 	cd $(srcdir); $(MAKEINFO) emacs.texi
diff --git a/editors/emacs20/patches/patch-ab b/editors/emacs20/patches/patch-ab
new file mode 100644
index 00000000000..5ed475d1930
--- /dev/null
+++ b/editors/emacs20/patches/patch-ab
@@ -0,0 +1,1601 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- configure.orig	Mon Jun 12 22:05:56 2000
++++ configure	Tue Oct 22 16:07:48 2002
+@@ -20,6 +20,8 @@
+ ac_help="$ac_help
+   --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
+ ac_help="$ac_help
++  --with-ipv6             support IPv6 stack"
++ac_help="$ac_help
+   --with-x                use the X Window System"
+ 
+ # Initialize some variables set by options.
+@@ -584,7 +586,13 @@
+ 
+ fi
+ 
++# Check whether --with-ipv6 or --without-ipv6 was given.
++if test "${with_ipv6+set}" = set; then
++  withval="$with_ipv6"
++  :
++fi
+ 
++
+ #### Make srcdir absolute, if it isn't already.  It's important to
+ #### avoid running the path through pwd unnecessary, since pwd can
+ #### give you automounter prefixes, which can go away.  We do all this
+@@ -657,7 +665,7 @@
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:661: checking host system type" >&5
++echo "configure:669: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -718,9 +726,13 @@
+ 			machine=hp9000s300 ;;
+       powerpc-apple-netbsd*) machine=macppc ;;
+       mips-*-netbsd*)	machine=pmax ;;
++      mipsel-*-netbsd*)	machine=pmax ;;
++      mipsev-*-netbsd*)	machine=mips ;;		# HF: what else?
+       ns32k-*-netbsd*)	machine=ns32000 ;;
+-      sparc-*-netbsd*)	machine=sparc ;;
++      powerpc-*-netbsd*) machine=macppc ;;
++      sparc*-*-netbsd*)	machine=sparc ;;
+       vax-*-netbsd*)	machine=vax ;;
++      arm*-*-netbsd*)	machine=arm ;;
+     esac
+   ;;
+ 
+@@ -1613,7 +1625,7 @@
+   * ) # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1617: checking for $ac_word" >&5
++echo "configure:1629: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1643,7 +1655,7 @@
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1647: checking for $ac_word" >&5
++echo "configure:1659: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1694,7 +1706,7 @@
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1698: checking for $ac_word" >&5
++echo "configure:1710: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1726,7 +1738,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1742: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1737,12 +1749,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1741 "configure"
++#line 1753 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1768,12 +1780,12 @@
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1777: checking whether we are using GNU C" >&5
++echo "configure:1789: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1782,7 +1794,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1801,7 +1813,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1805: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1817: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1881,7 +1893,7 @@
+ #### #undef clause to src/config.h.in for autoconf to modify.
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:1885: checking whether ln -s works" >&5
++echo "configure:1897: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1902,7 +1914,7 @@
+ fi
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1906: checking how to run the C preprocessor" >&5
++echo "configure:1918: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1917,13 +1929,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1921 "configure"
++#line 1933 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1934,13 +1946,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1938 "configure"
++#line 1950 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1951,13 +1963,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 1955 "configure"
++#line 1967 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1993,7 +2005,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:1997: checking for a BSD compatible install" >&5
++echo "configure:2009: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2050,7 +2062,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2054: checking for $ac_word" >&5
++echo "configure:2066: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2082,9 +2094,9 @@
+ 
+ 
+ echo $ac_n "checking for AIX""... $ac_c" 1>&6
+-echo "configure:2086: checking for AIX" >&5
++echo "configure:2098: checking for AIX" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2088 "configure"
++#line 2100 "configure"
+ #include "confdefs.h"
+ #ifdef _AIX
+   yes
+@@ -2110,17 +2122,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2114: checking for $ac_hdr" >&5
++echo "configure:2126: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2119 "configure"
++#line 2131 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2147,12 +2159,12 @@
+ done
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:2151: checking for ANSI C header files" >&5
++echo "configure:2163: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2156 "configure"
++#line 2168 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -2160,7 +2172,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2177,7 +2189,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 2181 "configure"
++#line 2193 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -2195,7 +2207,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 2199 "configure"
++#line 2211 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -2216,7 +2228,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2220 "configure"
++#line 2232 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -2227,7 +2239,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -2251,12 +2263,12 @@
+ fi
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:2255: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:2267: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2260 "configure"
++#line 2272 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -2265,7 +2277,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -2286,12 +2298,12 @@
+ fi
+ 
+ echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
+-echo "configure:2290: checking for sys_siglist declaration in signal.h or unistd.h" >&5
++echo "configure:2302: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2295 "configure"
++#line 2307 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2303,7 +2315,7 @@
+ char *msg = *(sys_siglist + 1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_decl_sys_siglist=yes
+ else
+@@ -2325,12 +2337,12 @@
+ 
+ 
+ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
+-echo "configure:2329: checking for struct utimbuf" >&5
++echo "configure:2341: checking for struct utimbuf" >&5
+ if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2334 "configure"
++#line 2346 "configure"
+ #include "confdefs.h"
+ #ifdef TIME_WITH_SYS_TIME
+ #include <sys/time.h>
+@@ -2349,7 +2361,7 @@
+ static struct utimbuf x; x.actime = x.modtime;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   emacs_cv_struct_utimbuf=yes
+ else
+@@ -2370,12 +2382,12 @@
+ fi
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:2374: checking return type of signal handlers" >&5
++echo "configure:2386: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2379 "configure"
++#line 2391 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2392,7 +2404,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -2412,12 +2424,12 @@
+ 
+ 
+ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
+-echo "configure:2416: checking for struct timeval" >&5
++echo "configure:2428: checking for struct timeval" >&5
+ if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2421 "configure"
++#line 2433 "configure"
+ #include "confdefs.h"
+ #ifdef TIME_WITH_SYS_TIME
+ #include <sys/time.h>
+@@ -2433,7 +2445,7 @@
+ static struct timeval x; x.tv_sec = x.tv_usec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   emacs_cv_struct_timeval=yes
+ else
+@@ -2455,12 +2467,12 @@
+ fi
+ 
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+-echo "configure:2459: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:2471: checking whether struct tm is in sys/time.h or time.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2464 "configure"
++#line 2476 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -2468,7 +2480,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm=time.h
+ else
+@@ -2489,12 +2501,12 @@
+ fi
+ 
+ echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
+-echo "configure:2493: checking for tm_zone in struct tm" >&5
++echo "configure:2505: checking for tm_zone in struct tm" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2498 "configure"
++#line 2510 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_cv_struct_tm>
+@@ -2502,7 +2514,7 @@
+ struct tm tm; tm.tm_zone;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm_zone=yes
+ else
+@@ -2522,12 +2534,12 @@
+ 
+ else
+   echo $ac_n "checking for tzname""... $ac_c" 1>&6
+-echo "configure:2526: checking for tzname" >&5
++echo "configure:2538: checking for tzname" >&5
+ if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2531 "configure"
++#line 2543 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ #ifndef tzname /* For SGI.  */
+@@ -2537,7 +2549,7 @@
+ atoi(*tzname);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_var_tzname=yes
+ else
+@@ -2560,12 +2572,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:2564: checking for working const" >&5
++echo "configure:2576: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2569 "configure"
++#line 2581 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2614,7 +2626,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -2636,7 +2648,7 @@
+ 
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:2640: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:2652: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2664,7 +2676,7 @@
+ 
+ 
+ echo $ac_n "checking for long file names""... $ac_c" 1>&6
+-echo "configure:2668: checking for long file names" >&5
++echo "configure:2680: checking for long file names" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2715,7 +2727,7 @@
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:2719: checking for X" >&5
++echo "configure:2731: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -2777,12 +2789,12 @@
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 2781 "configure"
++#line 2793 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2851,7 +2863,7 @@
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2855 "configure"
++#line 2867 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2858,7 +2870,7 @@
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -3033,7 +3045,7 @@
+ echo "checking the machine- and system-dependent files to find out
+  - which libraries the lib-src programs will want, and
+  - whether the GNU malloc routines are usable" 1>&6
+-echo "configure:3037: checking the machine- and system-dependent files to find out
++echo "configure:3049: checking the machine- and system-dependent files to find out
+  - which libraries the lib-src programs will want, and
+  - whether the GNU malloc routines are usable" >&5
+ 
+@@ -3163,12 +3175,12 @@
+ GNU_MALLOC=yes
+ doug_lea_malloc=yes
+ echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
+-echo "configure:3167: checking for malloc_get_state" >&5
++echo "configure:3179: checking for malloc_get_state" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_malloc_get_state'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3172 "configure"
++#line 3184 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char malloc_get_state(); below.  */
+@@ -3191,7 +3203,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_malloc_get_state=yes"
+ else
+@@ -3212,12 +3224,12 @@
+ fi
+ 
+ echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
+-echo "configure:3216: checking for malloc_set_state" >&5
++echo "configure:3228: checking for malloc_set_state" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_malloc_set_state'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3221 "configure"
++#line 3233 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char malloc_set_state(); below.  */
+@@ -3240,7 +3252,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_malloc_set_state=yes"
+ else
+@@ -3261,12 +3273,12 @@
+ fi
+ 
+ echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
+-echo "configure:3265: checking whether __after_morecore_hook exists" >&5
++echo "configure:3277: checking whether __after_morecore_hook exists" >&5
+ if eval "test \"`echo '$''{'emacs_cv_var___after_morecore_hook'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3270 "configure"
++#line 3282 "configure"
+ #include "confdefs.h"
+ extern void (* __after_morecore_hook)();
+ int main() {
+@@ -3273,7 +3285,7 @@
+ __after_morecore_hook = 0
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   emacs_cv_var___after_morecore_hook=yes
+ else
+@@ -3323,7 +3335,7 @@
+ LIBS="$libsrc_libs $LIBS"
+ 
+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:3327: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:3339: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3331,7 +3343,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3335 "configure"
++#line 3347 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3342,7 +3354,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3371,7 +3383,7 @@
+ 
+ 
+ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
+-echo "configure:3375: checking for main in -lXbsd" >&5
++echo "configure:3387: checking for main in -lXbsd" >&5
+ ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3379,7 +3391,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXbsd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3383 "configure"
++#line 3395 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3386,7 +3398,7 @@
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3408,7 +3420,7 @@
+ 
+ 
+ echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
+-echo "configure:3412: checking for cma_open in -lpthreads" >&5
++echo "configure:3424: checking for cma_open in -lpthreads" >&5
+ ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3416,7 +3428,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthreads  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3420 "configure"
++#line 3432 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3427,7 +3439,7 @@
+ cma_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3456,7 +3468,7 @@
+ 
+ 
+ echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6
+-echo "configure:3460: checking for XFree86 in /usr/X386" >&5
++echo "configure:3472: checking for XFree86 in /usr/X386" >&5
+ if test -d /usr/X386/include; then
+   HAVE_XFREE386=yes
+   : ${C_SWITCH_X_SITE="-I/usr/X386/include"}
+@@ -3485,9 +3497,9 @@
+ 
+   if test "${opsys}" = "gnu-linux"; then
+     echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6
+-echo "configure:3489: checking whether X on GNU/Linux needs -b to link" >&5
++echo "configure:3501: checking whether X on GNU/Linux needs -b to link" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 3491 "configure"
++#line 3503 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3494,7 +3506,7 @@
+ XOpenDisplay ("foo");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   xlinux_first_failure=no
+ else
+@@ -3514,7 +3526,7 @@
+       CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
+       LIBS="$LIBS -b i486-linuxaout"
+       cat > conftest.$ac_ext <<EOF
+-#line 3518 "configure"
++#line 3530 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3521,7 +3533,7 @@
+ XOpenDisplay ("foo");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   xlinux_second_failure=no
+ else
+@@ -3551,12 +3563,12 @@
+ XScreenNumberOfScreen XSetWMProtocols
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3555: checking for $ac_func" >&5
++echo "configure:3567: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3560 "configure"
++#line 3572 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3579,7 +3591,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3607,12 +3619,12 @@
+ 
+ if test "${window_system}" = "x11"; then
+   echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
+-echo "configure:3611: checking X11 version 6" >&5
++echo "configure:3623: checking X11 version 6" >&5
+   if eval "test \"`echo '$''{'emacs_cv_x11_version_6'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3616 "configure"
++#line 3628 "configure"
+ #include "confdefs.h"
+ #include <X11/Xlib.h>
+ int main() {
+@@ -3622,7 +3634,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   emacs_cv_x11_version_6=yes
+ else
+@@ -3647,12 +3659,12 @@
+ 
+ if test "${window_system}" = "x11"; then
+   echo $ac_n "checking X11 version 5""... $ac_c" 1>&6
+-echo "configure:3651: checking X11 version 5" >&5
++echo "configure:3663: checking X11 version 5" >&5
+   if eval "test \"`echo '$''{'emacs_cv_x11_version_5'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3656 "configure"
++#line 3668 "configure"
+ #include "confdefs.h"
+ #include <X11/Xlib.h>
+ int main() {
+@@ -3662,7 +3674,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   emacs_cv_x11_version_5=yes
+ else
+@@ -3690,12 +3702,12 @@
+ if test x"${USE_X_TOOLKIT}" = xmaybe; then
+   if test x"${HAVE_X11R5}" = xyes; then
+     echo $ac_n "checking X11 version 5 with Xaw""... $ac_c" 1>&6
+-echo "configure:3694: checking X11 version 5 with Xaw" >&5
++echo "configure:3706: checking X11 version 5 with Xaw" >&5
+     if eval "test \"`echo '$''{'emacs_cv_x11_version_5_with_xaw'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3699 "configure"
++#line 3711 "configure"
+ #include "confdefs.h"
+ 
+ #include <X11/Intrinsic.h>
+@@ -3704,7 +3716,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   emacs_cv_x11_version_5_with_xaw=yes
+ else
+@@ -3732,12 +3744,12 @@
+ 
+ if test "${USE_X_TOOLKIT}" != "none"; then
+   echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6
+-echo "configure:3736: checking X11 toolkit version" >&5
++echo "configure:3748: checking X11 toolkit version" >&5
+   if eval "test \"`echo '$''{'emacs_cv_x11_toolkit_version_6'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3741 "configure"
++#line 3753 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int main() {
+@@ -3747,7 +3759,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   emacs_cv_x11_toolkit_version_6=yes
+ else
+@@ -3777,7 +3789,7 @@
+     LIBS="-lXt $LIBS"
+   fi
+   echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
+-echo "configure:3781: checking for XmuConvertStandardSelection in -lXmu" >&5
++echo "configure:3793: checking for XmuConvertStandardSelection in -lXmu" >&5
+ ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3785,7 +3797,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXmu  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3789 "configure"
++#line 3801 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3796,7 +3808,7 @@
+ XmuConvertStandardSelection()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3823,17 +3835,64 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++  if test x$HAVE_X11XTR6 = xyes; then
++    LIBS="$LIBS -lXpm"
++    echo $ac_n "checking for XawPixmapsInitialize in -lXaw""... $ac_c" 1>&6
++echo "configure:3842: checking for XawPixmapsInitialize in -lXaw" >&5
++ac_lib_var=`echo Xaw'_'XawPixmapsInitialize | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lXaw  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 3850 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char XawPixmapsInitialize();
++
++int main() {
++XawPixmapsInitialize()
++; return 0; }
++EOF
++if { (eval echo configure:3861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++   LIBXPM="-lXpm" 
++else
++  echo "$ac_t""no" 1>&6
++ LIBXPM=""
++fi
++
++  else
++    LIBXPM=""
++  fi
++  
+   LIBS="$OLDLIBS"
+ fi
+ 
+ if test "${USE_X_TOOLKIT}" = "MOTIF"; then
+   echo $ac_n "checking for Motif version 2.1""... $ac_c" 1>&6
+-echo "configure:3832: checking for Motif version 2.1" >&5
++echo "configure:3891: checking for Motif version 2.1" >&5
+ if eval "test \"`echo '$''{'emacs_cv_motif_version_2_1'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3837 "configure"
++#line 3896 "configure"
+ #include "confdefs.h"
+ #include <Xm/Xm.h>
+ int main() {
+@@ -3844,7 +3903,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   emacs_cv_motif_version_2_1=yes
+ else
+@@ -3864,7 +3923,7 @@
+ EOF
+ 
+     echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6
+-echo "configure:3868: checking for XpCreateContext in -lXp" >&5
++echo "configure:3927: checking for XpCreateContext in -lXp" >&5
+ ac_lib_var=`echo Xp'_'XpCreateContext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3872,7 +3931,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXp  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3876 "configure"
++#line 3935 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3883,7 +3942,7 @@
+ XpCreateContext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3915,12 +3974,12 @@
+ 
+ # If netdb.h doesn't declare h_errno, we must declare it by hand.
+ echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
+-echo "configure:3919: checking whether netdb declares h_errno" >&5
++echo "configure:3978: checking whether netdb declares h_errno" >&5
+ if eval "test \"`echo '$''{'emacs_cv_netdb_declares_h_errno'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3924 "configure"
++#line 3983 "configure"
+ #include "confdefs.h"
+ #include <netdb.h>
+ int main() {
+@@ -3927,7 +3986,7 @@
+ return h_errno;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   emacs_cv_netdb_declares_h_errno=yes
+ else
+@@ -3950,12 +4009,12 @@
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:3954: checking for working alloca.h" >&5
++echo "configure:4013: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3959 "configure"
++#line 4018 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+@@ -3962,7 +4021,7 @@
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+@@ -3983,12 +4042,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:3987: checking for alloca" >&5
++echo "configure:4046: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3992 "configure"
++#line 4051 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -4016,7 +4075,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -4048,12 +4107,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:4052: checking whether alloca needs Cray hooks" >&5
++echo "configure:4111: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4057 "configure"
++#line 4116 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -4078,12 +4137,12 @@
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4082: checking for $ac_func" >&5
++echo "configure:4141: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4087 "configure"
++#line 4146 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4106,7 +4165,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4133,7 +4192,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:4137: checking stack direction for C alloca" >&5
++echo "configure:4196: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4141,7 +4200,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4145 "configure"
++#line 4204 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -4160,7 +4219,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:4164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+@@ -4185,7 +4244,7 @@
+ # fmod, logb, and frexp are found in -lm on most systems.
+ # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
+ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
+-echo "configure:4189: checking for sqrt in -lm" >&5
++echo "configure:4248: checking for sqrt in -lm" >&5
+ ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4193,7 +4252,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4197 "configure"
++#line 4256 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4204,7 +4263,7 @@
+ sqrt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4234,7 +4293,7 @@
+ 
+ # Check for mail-locking functions in a "mail" library
+ echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
+-echo "configure:4238: checking for maillock in -lmail" >&5
++echo "configure:4297: checking for maillock in -lmail" >&5
+ ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4242,7 +4301,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmail  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4246 "configure"
++#line 4305 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4253,7 +4312,7 @@
+ maillock()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4275,12 +4334,12 @@
+ 	     for ac_func in touchlock
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4279: checking for $ac_func" >&5
++echo "configure:4338: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4284 "configure"
++#line 4343 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4303,7 +4362,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4331,17 +4390,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4335: checking for $ac_hdr" >&5
++echo "configure:4394: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4340 "configure"
++#line 4399 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4379,12 +4438,12 @@
+ utimes setrlimit setpgid getcwd shutdown strftime
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4383: checking for $ac_func" >&5
++echo "configure:4442: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4388 "configure"
++#line 4447 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4407,7 +4466,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4436,12 +4495,12 @@
+ for ac_func in grantpt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4440: checking for $ac_func" >&5
++echo "configure:4499: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4445 "configure"
++#line 4504 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4464,7 +4523,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4493,12 +4552,12 @@
+ for ac_func in getpt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4497: checking for $ac_func" >&5
++echo "configure:4556: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4502 "configure"
++#line 4561 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4521,7 +4580,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4551,7 +4610,7 @@
+ # It's better to believe a function is not available
+ # than to expect to find it in ncurses.
+ echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6
+-echo "configure:4555: checking for tparm in -lncurses" >&5
++echo "configure:4614: checking for tparm in -lncurses" >&5
+ ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4559,7 +4618,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lncurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4563 "configure"
++#line 4622 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4570,7 +4629,7 @@
+ tparm()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4601,7 +4660,7 @@
+ # Solaris requires -lintl if you want strerror (which calls dgettext)
+ # to return localized messages.
+ echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
+-echo "configure:4605: checking for dgettext in -lintl" >&5
++echo "configure:4664: checking for dgettext in -lintl" >&5
+ ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4609,7 +4668,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4613 "configure"
++#line 4672 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4620,7 +4679,7 @@
+ dgettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4649,7 +4708,7 @@
+ 
+ 
+ echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
+-echo "configure:4653: checking whether localtime caches TZ" >&5
++echo "configure:4712: checking whether localtime caches TZ" >&5
+ if eval "test \"`echo '$''{'emacs_cv_localtime_cache'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4659,7 +4718,7 @@
+ emacs_cv_localtime_cache=yes
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4663 "configure"
++#line 4722 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ #if STDC_HEADERS
+@@ -4694,7 +4753,7 @@
+   exit (0);
+ }
+ EOF
+-if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   emacs_cv_localtime_cache=no
+ else
+@@ -4722,12 +4781,12 @@
+ 
+ if test "x$HAVE_TIMEVAL" = xyes; then
+ echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6
+-echo "configure:4726: checking whether gettimeofday can accept two arguments" >&5
++echo "configure:4785: checking whether gettimeofday can accept two arguments" >&5
+ if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4731 "configure"
++#line 4790 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef TIME_WITH_SYS_TIME
+@@ -4749,7 +4808,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   emacs_cv_gettimeofday_two_arguments=yes
+ else
+@@ -4772,12 +4831,12 @@
+ 
+ ok_so_far=yes
+ echo $ac_n "checking for socket""... $ac_c" 1>&6
+-echo "configure:4776: checking for socket" >&5
++echo "configure:4835: checking for socket" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4781 "configure"
++#line 4840 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char socket(); below.  */
+@@ -4800,7 +4859,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_socket=yes"
+ else
+@@ -4823,17 +4882,17 @@
+ if test $ok_so_far = yes; then
+   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
+-echo "configure:4827: checking for netinet/in.h" >&5
++echo "configure:4886: checking for netinet/in.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4832 "configure"
++#line 4891 "configure"
+ #include "confdefs.h"
+ #include <netinet/in.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4859,17 +4918,17 @@
+ if test $ok_so_far = yes; then
+   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
+-echo "configure:4863: checking for arpa/inet.h" >&5
++echo "configure:4922: checking for arpa/inet.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4868 "configure"
++#line 4927 "configure"
+ #include "confdefs.h"
+ #include <arpa/inet.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4906,6 +4965,64 @@
+ 
+ fi
+ 
++if test "x$with_ipv6" = xyes; then
++  for ac_func in getaddrinfo
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:4973: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 4978 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:5001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++fi
++
+ # Set up the CFLAGS for real compilation, so we can substitute it.
+ CFLAGS="$REAL_CFLAGS"
+ 
+@@ -5211,6 +5328,7 @@
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@YACC@%$YACC%g
+ s%@SET_MAKE@%$SET_MAKE%g
++s%@LIBXPM@%$LIBXPM%g
+ s%@ALLOCA@%$ALLOCA%g
+ s%@version@%$version%g
+ s%@configuration@%$configuration%g
diff --git a/editors/emacs20/patches/patch-ac b/editors/emacs20/patches/patch-ac
new file mode 100644
index 00000000000..239456be488
--- /dev/null
+++ b/editors/emacs20/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+--- config.sub.orig	Sat Oct  6 22:14:24 2001
++++ config.sub	Sat Oct  6 22:15:18 2001
+@@ -168,7 +168,7 @@
+ 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+ 		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+ 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
++		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipseb | mipsel | mips64el \
+ 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+ 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+ 		| mips64vr5000 | miprs64vr5000el \
+@@ -201,7 +201,7 @@
+ 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+ 	      | clipper-* | orion-* \
+ 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
++	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipseb-* | mipsel-* \
+ 	      | mips64el-* | mips64orion-* | mips64orionel-* \
+ 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+ 	      | mipstx39-* | mipstx39el-* \
diff --git a/editors/emacs20/patches/patch-ad b/editors/emacs20/patches/patch-ad
new file mode 100644
index 00000000000..b6956a5a5a6
--- /dev/null
+++ b/editors/emacs20/patches/patch-ad
@@ -0,0 +1,7 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- etc/ctags.1.orig	Fri Jul 17 18:58:29 1992
++++ etc/ctags.1	Sat Feb 21 20:59:45 1998
+@@ -1 +1 @@
+-.so man1/etags.1
++.so man1/emacs-etags.1
diff --git a/editors/emacs20/patches/patch-ae b/editors/emacs20/patches/patch-ae
new file mode 100644
index 00000000000..d80065ad89d
--- /dev/null
+++ b/editors/emacs20/patches/patch-ae
@@ -0,0 +1,50 @@
+$NetBSD: patch-ae,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- Makefile.in.orig	Sat Apr 10 04:16:24 1999
++++ Makefile.in	Sat Aug  7 15:24:03 1999
+@@ -386,27 +386,23 @@
+ 	      chmod a+r ${infodir}/dir); \
+ 	   fi; \
+ 	   cd ${srcdir}/info ; \
+-	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \
++	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* reftex* sc* vip* widget*; do \
+ 	     (cd $${thisdir}; \
+-	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
+-	      chmod a+r ${infodir}/$$f); \
++	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
+ 	   done); \
+ 	else true; fi
+-	-thisdir=`/bin/pwd`; \
+-	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+-	then \
+-	  for f in ccmode cl dired-x ediff emacs forms gnus info message mh-e reftex sc vip viper widget; do \
+-	    (cd $${thisdir}; \
+-	     ${INSTALL_INFO} --dir-file=${infodir}/dir --info-file=${infodir}/$$f); \
+-	  done; \
+-	else true; fi
+ 	-chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
+ 	thisdir=`/bin/pwd`; \
+ 	cd ${srcdir}/etc; \
+ 	for page in emacs etags ctags ; do \
+ 	  (cd $${thisdir}; \
+-	   ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
+-	   chmod a+r ${man1dir}/$${page}${manext}); \
++	   if [ $${page} = emacs ]; then \
++	     ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
++	     chmod a+r ${man1dir}/$${page}${manext}; \
++	   else \
++	     ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/emacs-$${page}${manext}; \
++	     chmod a+r ${man1dir}/emacs-$${page}${manext}; \
++	   fi) \
+ 	done
+ 
+ ### Install LEIM files.  Although they are machine-independent, we
+@@ -458,7 +454,7 @@
+ 	    esac ;					\
+ 	  fi ;						\
+ 	done
+-	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
++	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
+ 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
+ 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
+ 
diff --git a/editors/emacs20/patches/patch-af b/editors/emacs20/patches/patch-af
new file mode 100644
index 00000000000..9efb2bbe21a
--- /dev/null
+++ b/editors/emacs20/patches/patch-af
@@ -0,0 +1,47 @@
+$NetBSD: patch-af,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/Makefile.in.orig	Thu Jan 16 19:08:48 2003
++++ src/Makefile.in
+@@ -329,7 +329,7 @@
+ #ifdef USE_X_TOOLKIT
+ #define @X_TOOLKIT_TYPE@
+ #if defined (LUCID) || defined (ATHENA)
+-LIBW= -lXaw
++LIBW= -lXaw @LIBXPM@
+ #endif
+ #ifdef MOTIF
+ #if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP)
+@@ -402,7 +402,7 @@
+    ask GCC explicitly where to find libgcc.a.  */
+ 
+ #ifndef LINKER
+-#define LINKER $(CC) -nostdlib
++#define LINKER $(CC) -nostartfiles
+ #endif
+ 
+ #ifndef LIB_GCC
+@@ -457,7 +457,7 @@
+ #endif /* not ORDINARY_LINK */
+ 
+ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
+-	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS)
++	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
+ 
+ /* A macro which other sections of Makefile can redefine to munge the
+    flags before they're passed to LD.  This is helpful if you have
+@@ -804,14 +804,7 @@
+ #define OBJECTS_MACHINE
+ #endif
+ 
+-all: emacs bytecomp OTHER_FILES
+-
+-bytecomp: emacs
+-	./emacs -batch -q -f batch-byte-compile \
+-	${lispsource}ange-ftp.el ${lispsource}international/ccl.el \
+-	${lispsource}international/mule-cmds.el \
+-	${lispsource}international/mule.el \
+-	${lispsource}international/titdic-cnv.el
++all: emacs OTHER_FILES
+ 
+ emacs: temacs ${etc}DOC ${lisp}
+ #ifdef CANNOT_DUMP
diff --git a/editors/emacs20/patches/patch-ag b/editors/emacs20/patches/patch-ag
new file mode 100644
index 00000000000..5f676207f21
--- /dev/null
+++ b/editors/emacs20/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- 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
+ #undef HAVE_INET_SOCKETS
diff --git a/editors/emacs20/patches/patch-ah b/editors/emacs20/patches/patch-ah
new file mode 100644
index 00000000000..63a8850e395
--- /dev/null
+++ b/editors/emacs20/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- 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;
+ }
+ 
+-#ifdef unix
++#ifdef __NetBSD__
++#define unix 42
++#endif
+ 
++#ifdef unix
+ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
+   "Tell Unix to finish all pending disk updates.")
+   ()
diff --git a/editors/emacs20/patches/patch-ai b/editors/emacs20/patches/patch-ai
new file mode 100644
index 00000000000..9be9169c817
--- /dev/null
+++ b/editors/emacs20/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- 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 @@
+  *
+  */
+ 
++#if !(defined (__NetBSD__) && defined (__ELF__))
+ #ifndef HAVE_TEXT_START
+ char *
+ start_of_text ()
+@@ -2151,6 +2152,7 @@
+ #endif /* TEXT_START */
+ }
+ #endif /* not HAVE_TEXT_START */
++#endif
+ 
+ /*
+  *	Return the address of the start of the data segment prior to
diff --git a/editors/emacs20/patches/patch-aj b/editors/emacs20/patches/patch-aj
new file mode 100644
index 00000000000..467048d02ff
--- /dev/null
+++ b/editors/emacs20/patches/patch-aj
@@ -0,0 +1,163 @@
+$NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/process.c.orig	Wed May 24 04:10:16 2000
++++ src/process.c	Mon Sep  4 14:15:19 2000
+@@ -1,7 +1,18 @@
++/*
++ * Locally hacked process.c to add ipv6 support. -wsr
++ *
++ * The configure.in file should define "HAVE_GETADDRINFO" if it is found 
++ * in libc.
++ * 
++ */
++
+ /* Asynchronous subprocess control for GNU Emacs.
+    Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 1998
+       Free Software Foundation, Inc.
+ 
++   ipv6 changes are
++   Copyright (C) 1999 Wolfgang S. Rupprecht
++
+ This file is part of GNU Emacs.
+ 
+ GNU Emacs is free software; you can redistribute it and/or modify
+@@ -1810,15 +1821,21 @@
+ {
+   Lisp_Object proc;
+   register int i;
++#ifdef HAVE_GETADDRINFO
++  struct addrinfo hints, *res, *lres;
++  int ret = 0;
++  int xerrno = 0;
++  char *portstring, portbuf [128];
++#else /* HAVE_GETADDRINFO */
+   struct sockaddr_in address;
+   struct servent *svc_info;
+   struct hostent *host_info_ptr, host_info;
+   char *(addr_list[2]);
+   IN_ADDR numeric_addr;
+-  int s, outch, inch;
+-  char errstring[80];
+-  int port;
+   struct hostent host_info_fixed;
++  int port;
++#endif /* HAVE_GETADDRINFO */
++  int s = -1, outch, inch;
+   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
+   int retry = 0;
+   int count = specpdl_ptr - specpdl;
+@@ -1831,6 +1848,22 @@
+   GCPRO4 (name, buffer, host, service);
+   CHECK_STRING (name, 0);
+   CHECK_STRING (host, 0);
++
++#ifdef HAVE_GETADDRINFO
++  /*
++   * caution: service can either be a string or int.
++   * Convert to a C string for later use by getaddrinfo.
++   */
++  if (INTEGERP (service)) {
++      snprintf (portbuf, sizeof (portbuf), "%d", XINT (service));
++      portstring = portbuf;
++  }
++  else
++    {
++      CHECK_STRING (service, 0);
++      portstring = XSTRING (service)->data;
++    }
++#else /* HAVE_GETADDRINFO */
+   if (INTEGERP (service))
+     port = htons ((unsigned short) XINT (service));
+   else
+@@ -1841,6 +1874,7 @@
+ 	error ("Unknown service \"%s\"", XSTRING (service)->data);
+       port = svc_info->s_port;
+     }
++#endif /* HAVE_GETADDRINFO */
+ 
+   /* Slow down polling to every ten seconds.
+      Some kernels have a bug which causes retrying connect to fail
+@@ -1850,6 +1884,75 @@
+ #endif
+ 
+ #ifndef TERM
++#ifdef HAVE_GETADDRINFO               /* We have a modern OS. -wsr */
++  immediate_quit = 1;
++  QUIT;
++  memset(&hints, 0, sizeof(hints));
++  hints.ai_flags = 0;
++  hints.ai_family = AF_UNSPEC;
++  hints.ai_socktype = SOCK_STREAM;
++  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));
++  immediate_quit = 0;
++
++  for (lres = res; lres ; lres = lres->ai_next)
++    {
++      s = socket(lres->ai_family, lres->ai_socktype, lres->ai_protocol);
++      if (s < 0)
++	{
++	  xerrno = errno;
++	  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.  */
++      if (interrupt_input)
++        unrequest_sigio ();
++
++    loop:
++      immediate_quit = 1;
++      QUIT;
++
++      if (connect(s, lres->ai_addr, lres->ai_addrlen) == 0 ||
++	  errno == EISCONN)
++	break;
++
++      xerrno = errno;
++      immediate_quit = 0;
++
++      if (errno == EINTR)
++	goto loop;
++      if (errno == EADDRINUSE && retry < 20)
++	{
++	  /* A delay here is needed on some FreeBSD systems,
++	     and it is harmless, since this retrying takes time anyway
++	     and should be infrequent.  */
++	  Fsleep_for (make_number (1), Qnil);
++	  retry++;
++	  goto loop;
++	}
++      
++      close(s);
++      s = -1;
++    }
++
++  freeaddrinfo(res);
++  if (s < 0)
++    {
++      if (interrupt_input)
++        request_sigio ();
++      
++      errno = xerrno;
++      report_file_error ("connection failed",
++			 Fcons (host, Fcons (name, Qnil)));
++    }
++#else /* HAVE_GETADDRINFO */
+   while (1)
+     {
+ #ifdef TRY_AGAIN
+@@ -1940,6 +2043,7 @@
+       report_file_error ("connection failed",
+ 			 Fcons (host, Fcons (name, Qnil)));
+     }
++#endif /* HAVE_GETADDRINFO */
+ 
+   immediate_quit = 0;
+ 
diff --git a/editors/emacs20/patches/patch-ak b/editors/emacs20/patches/patch-ak
new file mode 100644
index 00000000000..b9d8cab7b7e
--- /dev/null
+++ b/editors/emacs20/patches/patch-ak
@@ -0,0 +1,23 @@
+$NetBSD: patch-ak,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lib-src/Makefile.in.orig	Sun Aug  2 02:22:55 1998
++++ lib-src/Makefile.in	Fri Sep  4 01:40:32 1998
+@@ -286,12 +286,14 @@
+ 	@echo
+ 	@echo "Installing utilities for users to run."
+ 	for file in ${INSTALLABLES} ; do \
+-	  $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
+-	  chmod a+rx ${bindir}/$${file}; \
++	  if [ $${file} = emacsclient ] ; then \
++	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
++	  else \
++	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/emacs-$${file} ; \
++	  fi ; \
+ 	done
+ 	for file in ${INSTALLABLE_SCRIPTS} ; do \
+-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
+-	  chmod a+rx ${bindir}/$${file}; \
++	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/emacs-$${file} ; \
+ 	done
+ 
+ uninstall:
diff --git a/editors/emacs20/patches/patch-al b/editors/emacs20/patches/patch-al
new file mode 100644
index 00000000000..c04f17dd12c
--- /dev/null
+++ b/editors/emacs20/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/xfaces.c.orig	Wed Nov 18 02:36:41 1998
++++ src/xfaces.c	Sun Sep  1 15:35:41 2002
+@@ -20,6 +20,10 @@
+ 
+ /* This is derived from work by Lucid (some parts very loosely so).  */
+ 
++#ifdef __sun__
++#include <strings.h>
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
diff --git a/editors/emacs20/patches/patch-am b/editors/emacs20/patches/patch-am
new file mode 100644
index 00000000000..60a59c0bb51
--- /dev/null
+++ b/editors/emacs20/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/xfns.c.orig	Thu Jul  1 02:09:39 1999
++++ src/xfns.c	Sun Sep  1 15:36:55 2002
+@@ -22,6 +22,10 @@
+ 
+ /* Rewritten for X11 by Joseph Arceneaux */
+ 
++#ifdef __sun__
++#include <strings.h>
++#endif
++
+ #include <signal.h>
+ #include <config.h>
+ 
diff --git a/editors/emacs20/patches/patch-ax b/editors/emacs20/patches/patch-ax
new file mode 100644
index 00000000000..65f91de40f4
--- /dev/null
+++ b/editors/emacs20/patches/patch-ax
@@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/m/mips.h-orig	Mon Jun 23 03:49:57 1997
++++ src/m/mips.h	Sat Jan 30 14:28:48 1999
+@@ -149,8 +149,10 @@
+ #define LD_SWITCH_MACHINE -D 800000
+ #define LIBS_DEBUG
+ 
++#if defined (__NetBSD__) || defined (__OpenBSD__)
++#else  /* bsd with elf */
+ #define LINKER /bsd43/bin/ld
+-  
++#endif /* bsd with elf */
+ #else /* not BSD_SYSTEM */
+ 
+ #if defined(__GNUC__) && defined(_ABIN32)
diff --git a/editors/emacs20/patches/patch-ay b/editors/emacs20/patches/patch-ay
new file mode 100644
index 00000000000..f581e3770f1
--- /dev/null
+++ b/editors/emacs20/patches/patch-ay
@@ -0,0 +1,25 @@
+$NetBSD: patch-ay,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/m/pmax.h.orig	Sun Sep  7 01:23:09 1997
++++ src/m/pmax.h	Fri Feb 18 18:45:03 2000
+@@ -30,9 +30,8 @@
+ #if defined (__NetBSD__) || defined (__OpenBSD__)
+ #undef START_FILES
+ #undef RUN_TIME_REMAP
+-#define START_FILES pre-crt0.o /usr/lib/crt0.o
+-#define CANNOT_DUMP
+ #undef UNEXEC
++#define UNEXEC unexelf.o
+ #endif /* NetBSD || OpenBSD */
+ 
+ /* Supposedly the following will overcome a kernel bug.  */
+@@ -51,7 +50,9 @@
+ #endif
+ 
+ /* Override what mips.h says about this.  */
++#if !defined (__NetBSD__)
+ #undef LINKER
++#endif
+ 
+ #ifdef ultrix
+ /* Ultrix 4.2 (perhaps also 4.1) implements O_NONBLOCK
diff --git a/editors/emacs20/patches/patch-az b/editors/emacs20/patches/patch-az
new file mode 100644
index 00000000000..467c6243a3d
--- /dev/null
+++ b/editors/emacs20/patches/patch-az
@@ -0,0 +1,171 @@
+$NetBSD: patch-az,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/unexelf.c.orig	Mon May 15 01:14:02 2000
++++ src/unexelf.c	Tue Sep 26 14:18:05 2000
+@@ -470,7 +470,7 @@
+ /*
+  * NetBSD does not have normal-looking user-land ELF support.
+  */
+-# ifdef __alpha__
++# if defined(__alpha__) || defined(__sparc_v9__)
+ #  define ELFSIZE	64
+ # else
+ #  define ELFSIZE	32
+@@ -479,6 +479,7 @@
+ 
+ # ifndef PT_LOAD
+ #  define PT_LOAD	Elf_pt_load
++#  define SHT_PROGBITS	Elf_sht_progbits
+ #  define SHT_SYMTAB	Elf_sht_symtab
+ #  define SHT_DYNSYM	Elf_sht_dynsym
+ #  define SHT_NULL	Elf_sht_null
+@@ -495,9 +496,14 @@
+ #  include <sys/exec_ecoff.h>
+ #  define HDRR		struct ecoff_symhdr
+ #  define pHDRR		HDRR *
+-# endif
++# endif /* __alpha__ */
+ #endif /* __NetBSD__ */
+ 
++# ifdef __mips__
++#  define SHT_MIPS_DEBUG	DT_MIPS_FLAGS
++#  define HDRR		struct Elf_Shdr
++# endif /* __mips__ */
++
+ #ifdef __OpenBSD__
+ # include <sys/exec_elf.h>
+ #endif
+@@ -512,7 +518,7 @@
+ # else
+ #  define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
+ # endif
+-# ifdef _LP64
++# if defined (_LP64) || defined(__alpha__)
+ #  define ELFSIZE 64
+ # else
+ #  define ELFSIZE 32
+@@ -522,6 +528,14 @@
+ # define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
+ #endif
+ 
++#if defined ( __sony_news) && defined (_SYSTYPE_SYSV)
++# define HAVE_MIPS_SBSS
++#endif
++
++#if defined (__mips__) && (defined(__NetBSD__) || defined(__OpenBSD__))
++# define HAVE_MIPS_SBSS
++#endif
++
+ #ifndef ELF_BSS_SECTION_NAME
+ #define ELF_BSS_SECTION_NAME ".bss"
+ #endif
+@@ -613,12 +627,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))
++/* We are using  ECOFF symbols embedded in ELF. */
++
++void
++relocate_ecoff_symhdr(symhdr, diff)
++    HDRR *symhdr;
++    ElfW(Word) diff;
++{
++  symhdr->cbLineOffset += diff;
++  symhdr->cbDnOffset   += diff;
++  symhdr->cbPdOffset   += diff;
++  symhdr->cbSymOffset  += diff;
++  symhdr->cbOptOffset  += diff;
++  symhdr->cbAuxOffset  += diff;
++  symhdr->cbSsOffset   += diff;
++  symhdr->cbSsExtOffset += diff;
++  symhdr->cbFdOffset   += diff;
++  symhdr->cbRfdOffset  += diff;
++  symhdr->cbExtOffset  += diff;
++}
++#endif /* __alpha__ or __sony_news and systype_sysv */
++
++#ifdef notyet
++void
++relocate_elf_proghdr(p, diff)
++    HDRR *symhdr;
++    Elfw(Word) diff;
++{
++	phdr->sh_name  += diff;
++	phdr->sh_type  += diff;
++	phdr->sh_flags += diff;
++	phdr->sh_addr  += diff;
++	phdr->sh_offset += diff;
++	phdr->sh_size  += diff;
++	phdr->sh_link  += diff;
++	phdr->sh_info  += diff;
++	phdr->sh_addralign += diff;
++	phdr->sh_entsize += diff;
++};
++#endif /* notyet */
++
+ /* ****************************************************************
+  * unexec
+  *
+@@ -1005,22 +1060,11 @@
+ 	  == 0)
+ 	{
+ 	  pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base);
+-
+-	  symhdr->cbLineOffset += new_data2_size;
+-	  symhdr->cbDnOffset += new_data2_size;
+-	  symhdr->cbPdOffset += new_data2_size;
+-	  symhdr->cbSymOffset += new_data2_size;
+-	  symhdr->cbOptOffset += new_data2_size;
+-	  symhdr->cbAuxOffset += new_data2_size;
+-	  symhdr->cbSsOffset += new_data2_size;
+-	  symhdr->cbSsExtOffset += new_data2_size;
+-	  symhdr->cbFdOffset += new_data2_size;
+-	  symhdr->cbRfdOffset += new_data2_size;
+-	  symhdr->cbExtOffset += new_data2_size;
++	  relocate_ecoff_symhdr(symhdr, new_data2_size);
+ 	}
+ #endif /* __alpha__ */
+ 
+-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
++#ifdef HAVE_MIPS_SBSS
+       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
+ 	  && old_mdebug_index != -1) 
+         {
+@@ -1030,20 +1074,17 @@
+ 
+ 	  if (diff)
+ 	    {
+-	      phdr->cbLineOffset += diff;
+-	      phdr->cbDnOffset   += diff;
+-	      phdr->cbPdOffset   += diff;
+-	      phdr->cbSymOffset  += diff;
+-	      phdr->cbOptOffset  += diff;
+-	      phdr->cbAuxOffset  += diff;
+-	      phdr->cbSsOffset   += diff;
+-	      phdr->cbSsExtOffset += diff;
+-	      phdr->cbFdOffset   += diff;
+-	      phdr->cbRfdOffset  += diff;
+-	      phdr->cbExtOffset  += diff;
++#if defined ( __sony_news) && defined (_SYSTYPE_SYSV)
++	      relocate_ecoff_symhdr(phdr, diff);
++#else
++	      /* xxxBSD with  GNU binutils has .mdebug, but not ecoff(???)  */
++#ifdef DEBUG
++	      printf("Dont know how to relocate mdebug syms by %0x\n", diff);
++#endif
++#endif
+ 	    }
+ 	}
+-#endif /* __sony_news && _SYSTYPE_SYSV */
++#endif /* HAVE_MIPS_SBSS */
+ 
+ #if __sgi
+       /* Adjust  the HDRR offsets in .mdebug and copy the 
diff --git a/editors/emacs20/patches/patch-bc b/editors/emacs20/patches/patch-bc
new file mode 100644
index 00000000000..2b820ac3c6a
--- /dev/null
+++ b/editors/emacs20/patches/patch-bc
@@ -0,0 +1,12 @@
+$NetBSD: patch-bc,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- /dev/null	Fri Mar 26 07:52:59 1999
++++ lisp/site-init.el	Wed Mar 24 09:37:17 1999
+@@ -0,0 +1,7 @@
++;; NetBSD puts info files in /usr/share.
++(setq Info-default-directory-list
++      (cons "/usr/share/info/"
++	    Info-default-directory-list))
++
++(autoload 'send-pr "/usr/share/gnats/send-pr.el" 
++  "Command to create and send a problem report." t)
diff --git a/editors/emacs20/patches/patch-bf b/editors/emacs20/patches/patch-bf
new file mode 100644
index 00000000000..4a1c1182528
--- /dev/null
+++ b/editors/emacs20/patches/patch-bf
@@ -0,0 +1,30 @@
+$NetBSD: patch-bf,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/s/netbsd.h.orig	Sat Apr 11 20:15:19 1998
++++ src/s/netbsd.h	Sat Jan 22 20:22:29 2000
+@@ -57,7 +57,7 @@
+ #define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data))
+ #define N_TRELOFF(x) N_RELOFF(x)
+ #endif
+-#endif /* not NO_SHARED_LIBS */
++#endif /* not NO_SHARED_LIBS and not ELF */
+ 
+ #define HAVE_WAIT_HEADER
+ #define WAIT_USE_INT
+@@ -66,11 +66,15 @@
+ 
+ #define AMPERSAND_FULL_NAME
+ 
+-#ifdef __ELF__
+ /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
+    says where to find X windows at run time.  We convert it to a -rpath option
+    which is what OSF1 uses.  */
+ #define LD_SWITCH_SYSTEM `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
++
++#ifdef __ELF__
++#define HAVE_TEXT_START		/* No need to define `start_of_text'.  */
++#define UNEXEC unexelf.o
++#define ORDINARY_LINK
+ #endif /* __ELF__ */
+ 
+ /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
diff --git a/editors/emacs20/patches/patch-bg b/editors/emacs20/patches/patch-bg
new file mode 100644
index 00000000000..110f4cc8e6a
--- /dev/null
+++ b/editors/emacs20/patches/patch-bg
@@ -0,0 +1,54 @@
+$NetBSD: patch-bg,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- configure.in.orig	Mon Jun  5 17:42:49 2000
++++ configure.in	Tue Oct 22 15:59:01 2002
+@@ -66,6 +66,8 @@
+ 	  esac
+ 	  with_x_toolkit=$val
+ ])
++AC_ARG_WITH(ipv6,
++[  --with-ipv6             support IPv6 stack])
+ 
+ #### Make srcdir absolute, if it isn't already.  It's important to
+ #### avoid running the path through pwd unnecessary, since pwd can
+@@ -158,9 +160,13 @@
+ 			machine=hp9000s300 ;;
+       powerpc-apple-netbsd*) machine=macppc ;;
+       mips-*-netbsd*)	machine=pmax ;;
++      mipsel-*-netbsd*)	machine=pmax ;;
++      mipsev-*-netbsd*)	machine=mips ;;		# HF: what else?
+       ns32k-*-netbsd*)	machine=ns32000 ;;
+-      sparc-*-netbsd*)	machine=sparc ;;
++      powerpc-*-netbsd*) machine=macppc ;;
++      sparc*-*-netbsd*)	machine=sparc ;;
+       vax-*-netbsd*)	machine=vax ;;
++      arm*-*-netbsd*)	machine=arm ;;
+     esac
+   ;;
+ 
+@@ -1594,6 +1600,14 @@
+     LIBS="-lXt $LIBS"
+   fi
+   AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
++  if test x$HAVE_X11XTR6 = xyes; then
++dnl Check if Xaw needs Xpm
++    LIBS="$LIBS -lXpm"
++    AC_CHECK_LIB(Xaw, XawPixmapsInitialize, [ LIBXPM="-lXpm" ], [ LIBXPM=""])
++  else
++    LIBXPM=""
++  fi
++  AC_SUBST(LIBXPM)
+   LIBS="$OLDLIBS"
+ fi
+ 
+@@ -1747,6 +1761,10 @@
+   AC_DEFINE(HAVE_AIX_SMT_EXP)
+ fi
+ 
++if test "x$with_ipv6" = xyes; then
++  AC_CHECK_FUNCS(getaddrinfo)
++fi
++
+ # Set up the CFLAGS for real compilation, so we can substitute it.
+ CFLAGS="$REAL_CFLAGS"
+ 
diff --git a/editors/emacs20/patches/patch-bh b/editors/emacs20/patches/patch-bh
new file mode 100644
index 00000000000..d1479a95039
--- /dev/null
+++ b/editors/emacs20/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/frame.h.orig	Sat Apr 25 16:17:34 1998
++++ ./src/frame.h	Tue Sep 26 09:38:18 2000
+@@ -186,7 +186,7 @@
+      it is defined in xterm.h.  
+      struct w32_output is used for W32 window frames;
+      it is defined in w32term.h.  */
+-  union output_data { struct x_output *x; struct w32_output *w32; int nothing; } output_data;
++  union output_data { struct x_output *x; struct w32_output *w32; EMACS_INT nothing; } output_data;
+ 
+ #ifdef MULTI_KBOARD
+   /* A pointer to the kboard structure associated with this frame.
diff --git a/editors/emacs20/patches/patch-bi b/editors/emacs20/patches/patch-bi
new file mode 100644
index 00000000000..a06374554df
--- /dev/null
+++ b/editors/emacs20/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/gmalloc.c.orig	Mon Feb 21 05:21:51 2000
++++ ./src/gmalloc.c	Tue Sep 26 09:44:47 2000
+@@ -371,7 +371,7 @@
+ /* Are you experienced?  */
+ int __malloc_initialized;
+ 
+-__malloc_size_t __malloc_extra_blocks;
++__malloc_size_t __malloc_extra_blocks = 0;
+ 
+ void (*__malloc_initialize_hook) PP ((void));
+ void (*__after_morecore_hook) PP ((void));
diff --git a/editors/emacs20/patches/patch-bj b/editors/emacs20/patches/patch-bj
new file mode 100644
index 00000000000..76aeb437f64
--- /dev/null
+++ b/editors/emacs20/patches/patch-bj
@@ -0,0 +1,104 @@
+$NetBSD: patch-bj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/lisp.h.orig	Sun Jan  3 08:31:23 1999
++++ ./src/lisp.h	Tue Sep 26 09:48:10 2000
+@@ -123,25 +123,25 @@
+   {
+     /* Used for comparing two Lisp_Objects;
+        also, positive integers can be accessed fast this way.  */
+-    int i;
++    long int i;
+ 
+     struct
+       {
+-	int val: VALBITS;
+-	int type: GCTYPEBITS+1;
++	long int val: VALBITS;
++	long int type: GCTYPEBITS+1;
+       } s;
+     struct
+       {
+-	unsigned int val: VALBITS;
+-	int type: GCTYPEBITS+1;
++	long unsigned int val: VALBITS;
++	long int type: GCTYPEBITS+1;
+       } u;
+     struct
+       {
+-	unsigned int val: VALBITS;
++	long unsigned int val: VALBITS;
+ 	enum Lisp_Type type: GCTYPEBITS;
+ 	/* The markbit is not really part of the value of a Lisp_Object,
+ 	   and is always zero except during garbage collection.  */
+-	unsigned int markbit: 1;
++	long unsigned int markbit: 1;
+       } gu;
+   }
+ Lisp_Object;
+@@ -153,17 +153,17 @@
+   {
+     /* Used for comparing two Lisp_Objects;
+        also, positive integers can be accessed fast this way.  */
+-    int i;
++    long int i;
+ 
+     struct
+       {
+-	int type: GCTYPEBITS+1;
+-	int val: VALBITS;
++	long int type: GCTYPEBITS+1;
++	long int val: VALBITS;
+       } s;
+     struct
+       {
+-	int type: GCTYPEBITS+1;
+-	unsigned int val: VALBITS;
++	long int type: GCTYPEBITS+1;
++	long unsigned int val: VALBITS;
+       } u;
+     struct
+       {
+@@ -171,7 +171,7 @@
+ 	   and is always zero except during garbage collection.  */
+ 	unsigned int markbit: 1;
+ 	enum Lisp_Type type: GCTYPEBITS;
+-	unsigned int val: VALBITS;
++	long unsigned int val: VALBITS;
+       } gu;
+   }
+ Lisp_Object;
+@@ -270,14 +270,14 @@
+ /* Extract the value of a Lisp_Object as a signed integer.  */
+ 
+ #ifndef XINT   /* Some machines need to do this differently.  */
+-#define XINT(a) (((a) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))
++#define XINT(a) (EMACS_INT) (((a) << (BITS_PER_EMACS_INT-VALBITS)) >> (BITS_PER_EMACS_INT-VALBITS))
+ #endif
+ 
+ /* Extract the value as an unsigned integer.  This is a basis
+    for extracting it as a pointer to a structure in storage.  */
+ 
+ #ifndef XUINT
+-#define XUINT(a) ((a) & VALMASK)
++#define XUINT(a) (EMACS_UINT) ((a) & VALMASK)
+ #endif
+ 
+ #ifndef XPNTR
+@@ -358,7 +358,7 @@
+ 
+ #ifdef EXPLICIT_SIGN_EXTEND
+ /* Make sure we sign-extend; compilers have been known to fail to do so.  */
+-#define XINT(a) (((a).i << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))
++#define XINT(a) (((a).i << (BITS_PER_EMACS_INT-VALBITS)) >> (BITS_PER_EMACS_INT-VALBITS))
+ #else
+ #define XINT(a) ((a).s.val)
+ #endif /* EXPLICIT_SIGN_EXTEND */
+@@ -367,7 +367,7 @@
+ #define XPNTR(a) ((a).u.val)
+ 
+ #define XSET(var, vartype, ptr) \
+-   (((var).s.type = ((char) (vartype))), ((var).s.val = ((int) (ptr))))
++   (((var).s.type = ((char) (vartype))), ((var).s.val = ((EMACS_INT) (ptr))))
+ 
+ extern Lisp_Object make_number ();
+ 
diff --git a/editors/emacs20/patches/patch-bk b/editors/emacs20/patches/patch-bk
new file mode 100644
index 00000000000..d693bceea9f
--- /dev/null
+++ b/editors/emacs20/patches/patch-bk
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./lib-src/sorted-doc.c.orig	Tue Mar 30 11:07:02 1999
++++ ./lib-src/sorted-doc.c	Tue Sep 26 09:32:51 2000
+@@ -7,6 +7,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ extern char *malloc ();
+ char *xmalloc ();
diff --git a/editors/emacs20/patches/patch-bl b/editors/emacs20/patches/patch-bl
new file mode 100644
index 00000000000..fa7f097ba54
--- /dev/null
+++ b/editors/emacs20/patches/patch-bl
@@ -0,0 +1,40 @@
+$NetBSD: patch-bl,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/m/sparc.h.orig	Sat Sep  6 11:51:04 1997
++++ ./src/m/sparc.h	Tue Sep 26 12:36:05 2000
+@@ -117,3 +117,35 @@
+ #define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
+ 
+ #endif /* not __NetBSD__ and not __linux__ and not __OpenBSD__ */
++
++#ifdef __arch64__		/* GCC, 64-bit ABI.  */
++#define EMACS_INT long
++#define BITS_PER_LONG 64
++#define BITS_PER_EMACS_INT BITS_PER_LONG
++#define EMACS_UINT unsigned long
++#define SPECIAL_EMACS_INT
++
++/* On the 64 bit architecture, we can use 60 bits for addresses */
++
++#define VALBITS         60
++
++/* This definition of MARKBIT is necessary because of the comparison of
++   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
++
++#define MARKBIT         0x8000000000000000L
++
++/* Define XINT and XUINT so that they can take arguments of type int */
++
++#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
++#define XUINT(a) ((long) (a) & VALMASK)
++
++/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
++
++#define XPNTR(a) XUINT (a)
++
++#define PNTR_COMPARISON_TYPE unsigned long
++#ifndef _LP64
++#define _LP64			/* Done on Alpha -- not sure if it
++				   should be here.  -- fx */
++#endif
++#endif
diff --git a/editors/emacs20/patches/patch-bm b/editors/emacs20/patches/patch-bm
new file mode 100644
index 00000000000..cfb21861577
--- /dev/null
+++ b/editors/emacs20/patches/patch-bm
@@ -0,0 +1,19 @@
+$NetBSD: patch-bm,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- ./src/alloc.c.orig	Thu Sep 16 00:20:15 1999
++++ ./src/alloc.c	Tue Sep 26 11:54:24 2000
+@@ -53,12 +53,13 @@
+ 
+ #if defined (__STDC__) && __STDC__
+ #include <stddef.h>
++#include <malloc.h>
+ #define	__malloc_size_t		size_t
+ #else
+ #define	__malloc_size_t		unsigned int
+ #endif
+ extern __malloc_size_t _bytes_used;
+-extern int __malloc_extra_blocks;
++extern __malloc_size_t __malloc_extra_blocks;
+ #endif /* !defined(DOUG_LEA_MALLOC) */
+ 
+ #define max(A,B) ((A) > (B) ? (A) : (B))
diff --git a/editors/emacs20/patches/patch-bn b/editors/emacs20/patches/patch-bn
new file mode 100644
index 00000000000..f9e6b39989b
--- /dev/null
+++ b/editors/emacs20/patches/patch-bn
@@ -0,0 +1,17 @@
+$NetBSD: patch-bn,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lib-src/cvtmail.c.orig	Tue Jul 16 22:08:02 1996
++++ lib-src/cvtmail.c	Fri Jul 19 02:34:38 2002
+@@ -35,10 +35,8 @@
+ 
+ 
+ #include <stdio.h>
+-
+-char *malloc ();
+-char *realloc ();
+-char *getenv ();
++#include <string.h>
++#include <stdlib.h>
+ 
+ char *xmalloc ();
+ char *xrealloc ();
diff --git a/editors/emacs20/patches/patch-bo b/editors/emacs20/patches/patch-bo
new file mode 100644
index 00000000000..b1fe49e701e
--- /dev/null
+++ b/editors/emacs20/patches/patch-bo
@@ -0,0 +1,22 @@
+$NetBSD: patch-bo,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lib-src/yow.c.orig	Fri Feb 26 11:30:08 1999
++++ lib-src/yow.c	Fri Jul 19 02:33:37 2002
+@@ -12,6 +12,8 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
++#include <stdlib.h>
+ #include <../src/epaths.h>      /* For PATH_DATA.  */
+ 
+ #define BUFSIZE  80
+@@ -32,8 +34,6 @@
+     strcpy (p + 4, rel);\
+     &res;})
+ #endif
+-
+-char *malloc(), *realloc();
+ 
+ void yow();
+ void setup_yow();
diff --git a/editors/emacs20/patches/patch-bp b/editors/emacs20/patches/patch-bp
new file mode 100644
index 00000000000..64615ff4f96
--- /dev/null
+++ b/editors/emacs20/patches/patch-bp
@@ -0,0 +1,15 @@
+$NetBSD: patch-bp,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- lwlib/lwlib.c.orig	Mon Apr  6 10:24:33 1998
++++ lwlib/lwlib.c	Fri Jul 19 02:38:04 2002
+@@ -29,10 +29,8 @@
+ #include "lwlib-utils.h"
+ #include <X11/StringDefs.h>
+ 
+-#ifdef __osf__
+ #include <string.h>
+ #include <stdlib.h>
+-#endif
+ extern long *xmalloc();
+ 
+ #if defined (USE_LUCID)
diff --git a/editors/emacs20/patches/patch-bq b/editors/emacs20/patches/patch-bq
new file mode 100644
index 00000000000..c44d0947296
--- /dev/null
+++ b/editors/emacs20/patches/patch-bq
@@ -0,0 +1,14 @@
+$NetBSD: patch-bq,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/callproc.c.orig	Wed May 24 13:58:24 2000
++++ src/callproc.c	Fri Jul 19 02:40:39 2002
+@@ -24,6 +24,9 @@
+ 
+ #include <config.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ extern int errno;
+ extern char *strerror ();
diff --git a/editors/emacs20/patches/patch-br b/editors/emacs20/patches/patch-br
new file mode 100644
index 00000000000..a3cd9799f3a
--- /dev/null
+++ b/editors/emacs20/patches/patch-br
@@ -0,0 +1,15 @@
+$NetBSD: patch-br,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+
+--- src/m/alpha.h.orig	Fri Feb  4 12:25:47 2000
++++ src/m/alpha.h	Fri Jul 19 02:56:24 2002
+@@ -147,7 +147,9 @@
+    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
++#  ifndef __NetBSD__
++#   define C_SWITCH_MACHINE	-fno-common
++#  endif
+ # else
+ #  error What gives?  Fix me if DEC Unix supports ELF now.
+ # endif