Add DragonFly support. Fix errno. Remove patch-ac, it gets

overriden by the GNU_CONFIGURE magic anyway.

17 files changed, 293 insertions, 1498 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index bb7584b9716..c5167f78775 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/04 17:00:32 joerg Exp $
 
 DISTNAME=	emacs-20.7
 PKGREVISION=	6
@@ -37,12 +37,13 @@ CHECK_WRKREF_SKIP+=	${PREFIX}/bin/emacs-20.7
 .include "../../mk/bsd.prefs.mk"
 
 # This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1.
-.if ${OPSYS} == "NetBSD" && \
+.if (${OPSYS} == "NetBSD" && \
     (empty(OS_VERSION:M1.[0-5]*) && \
      empty(OS_VERSION:M1.6_*) && \
      empty(OS_VERSION:M1.6) && \
      empty(OS_VERSION:M1.6.[0-9]*) && \
-     empty(OS_VERSION:M1.6[A-P]*))
+     empty(OS_VERSION:M1.6[A-P]*))) || \
+    (${OPSYS} == "DragonFly")
 # If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
 # sections and .data reloc sections, both of which Emacs can't handle
 # properly.  Analyzed by Stephen Ma.
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index f2668b80f12..a668e2698c8 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 17:15:10 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/01/04 17:00:32 joerg Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
@@ -13,19 +13,25 @@ SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
 Size (emacs20-xim-20000713.diff) = 21296 bytes
 SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
-SHA1 (patch-ab) = 78e013ab8adc619ec295e8bc9dc4bc133f26cf52
-SHA1 (patch-ac) = 9586951e581271664b28d5e812ee14105de508cf
+SHA1 (patch-ab) = 3d9497d4894cd126ca49636d9adfdd14cc31b017
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880
 SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca
 SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
-SHA1 (patch-ah) = 2cfb03c57fad97db9eaaf9cda610f5d6c906aa4a
-SHA1 (patch-ai) = d1e5bb8fe797761f63fad42dbfb48834284f4533
-SHA1 (patch-aj) = 34490603ca6985fb6e02879c6fe50337d9ce31dd
+SHA1 (patch-ah) = 451954e31fd60e7f85d22eb02a2949818d5e5e4e
+SHA1 (patch-ai) = 36a90bc66633618569c32fd38552ead1fc8958ac
+SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256
 SHA1 (patch-ak) = 604f80fbf7d24ec7b732c7ac3cc99a07fb4a2eb6
 SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
 SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
-SHA1 (patch-an) = 93abb2d07998b6a99a674308787a57457391baf0
+SHA1 (patch-an) = 59cffa7847fe84bc29a44d3b0e4c2eb09719126f
+SHA1 (patch-ao) = 628564fd9ffb47c9f12f53da6c3dea7129502b65
+SHA1 (patch-ap) = f0453313569cd000af36230bc193ab777db80974
+SHA1 (patch-aq) = 17897dc84bc40f6e5229b6c833f87066d9e065ed
+SHA1 (patch-ar) = 0c04e0dd0e0e91099404ba47a01c1a556884773a
+SHA1 (patch-as) = d098417b487676fdc958feb0d7b5977226efe9df
+SHA1 (patch-at) = 8d0b76a7ff397796ecc8ee5e588a11968415a164
+SHA1 (patch-au) = 9d416d2dcd2e5a2ef3a73f0841196ac86efea3c0
 SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
 SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
 SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e
@@ -41,7 +47,7 @@ SHA1 (patch-bm) = 148b3148587a31ec7a0674c5c1a359e8f09d952f
 SHA1 (patch-bn) = 247c04ae1accf3bc6b07b22767eb3cf2cdb55013
 SHA1 (patch-bo) = f9b8b73af91a445dbf50f9e862b84c7abc2b730e
 SHA1 (patch-bp) = bb7b824378b25ab1229fe21bd888170f023a774c
-SHA1 (patch-bq) = 142a3b447560b617c5d20a40d38e24b6530bf4ba
+SHA1 (patch-bq) = 5d8cf584bb6d83df975a339c262902da1d35776e
 SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
 SHA1 (patch-bs) = bc8d0b83efd20cf67e657b955def8f3ce329a687
 SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
@@ -50,5 +56,5 @@ SHA1 (patch-bv) = fa51f5ad5152c344e83f056a3c565129a9b7a1ef
 SHA1 (patch-bw) = 5de9f12d129b2f13a1d9c1702c7a889cd6b922f4
 SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
 SHA1 (patch-by) = a383206a32e902c448a1b529cf1eefc485f5beab
-SHA1 (patch-bz) = ef28314afc69c37da92ec208252e477bbb522458
+SHA1 (patch-bz) = c395a2acb2aa1e2c1582f6bb46a32bcfa4661b85
 SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
diff --git a/editors/emacs20/patches/patch-ab b/editors/emacs20/patches/patch-ab
index 38c3a76be03..1e753f40b56 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
+$NetBSD: patch-ab,v 1.3 2006/01/04 17:00:32 joerg Exp $
 
---- configure.orig	2000-06-12 22:05:56.000000000 +0200
-+++ configure	2004-02-28 21:50:33.000000000 +0100
-@@ -20,6 +20,8 @@
+--- configure.orig	2000-06-12 20:05:56.000000000 +0000
++++ configure
+@@ -20,6 +20,8 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
  ac_help="$ac_help
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
    --with-x                use the X Window System"
  
  # Initialize some variables set by options.
-@@ -584,6 +586,12 @@
+@@ -584,6 +586,12 @@ Currently, \`yes', \`athena' and \`lucid
  
  fi
  
@@ -24,16 +24,7 @@ $NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
  
  #### Make srcdir absolute, if it isn't already.  It's important to
  #### avoid running the path through pwd unnecessary, since pwd can
-@@ -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,14 @@
+@@ -718,9 +726,14 @@ case "${canonical}" in
  			machine=hp9000s300 ;;
        powerpc-apple-netbsd*) machine=macppc ;;
        mips-*-netbsd*)	machine=pmax ;;
@@ -49,896 +40,15 @@ $NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
      esac
    ;;
  
-@@ -1613,7 +1626,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 +1656,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 +1707,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 +1739,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 +1750,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 +1781,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 +1795,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 +1814,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 +1894,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 +1915,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 +1930,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 +1947,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 +1964,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 +2006,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 +2063,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 +2095,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 +2123,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 +2160,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 +2173,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 +2190,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 +2208,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 +2229,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 +2240,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 +2264,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 +2278,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 +2299,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 +2316,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 +2338,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 +2362,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 +2383,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 +2405,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 +2425,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 +2446,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 +2468,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 +2481,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 +2502,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 +2515,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 +2535,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 +2550,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 +2573,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 +2627,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 +2649,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 +2677,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 +2728,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 +2790,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,14 +2864,14 @@
-   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() {
- ${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 +3046,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 +3176,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 +3204,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 +3225,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 +3253,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,19 +3274,19 @@
- 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() {
- __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 +3336,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 +3344,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 +3355,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 +3384,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,14 +3392,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lXbsd  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3383 "configure"
-+#line 3395 "configure"
- #include "confdefs.h"
- 
- int main() {
- 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 +3421,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 +3429,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 +3440,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 +3469,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,16 +3498,16 @@
- 
-   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() {
- 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,14 +3527,14 @@
-       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() {
- 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 +3564,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 +3592,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 +3620,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 +3635,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 +3660,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 +3675,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 +3703,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 +3717,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 +3745,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 +3760,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 +3790,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 +3798,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 +3809,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 +3836,64 @@
+@@ -1519,6 +1532,7 @@ case "${canonical}" in
+       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
+       *-386bsd* )	        opsys=386bsd ;;
+       *-freebsd* )	        opsys=freebsd ;;
++      *-dragonfly* )		opsys=dragonfly ;;
+       *-nextstep* )             opsys=nextstep ;;
+       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
+     esac
+@@ -3823,6 +3837,53 @@ else
    echo "$ac_t""no" 1>&6
  fi
  
@@ -992,534 +102,7 @@ $NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
    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 +3904,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 +3924,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 +3932,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 +3943,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,19 +3975,19 @@
- 
- # 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() {
- 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,19 +4010,19 @@
- # 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() {
- 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 +4043,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 +4076,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 +4108,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 +4138,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 +4166,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 +4193,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 +4201,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 +4220,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 +4245,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 +4253,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 +4264,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 +4294,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 +4302,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 +4313,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 +4335,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 +4363,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 +4391,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 +4439,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 +4467,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 +4496,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 +4524,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 +4553,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 +4581,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 +4611,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 +4619,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 +4630,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 +4661,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 +4669,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 +4680,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 +4709,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 +4719,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 +4754,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 +4782,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 +4809,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 +4832,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 +4860,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 +4883,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 +4919,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 +4966,64 @@
+@@ -4906,6 +4967,64 @@ EOF
  
  fi
  
@@ -1584,7 +167,7 @@ $NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  
-@@ -5211,6 +5329,7 @@
+@@ -5211,6 +5330,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g
diff --git a/editors/emacs20/patches/patch-ac b/editors/emacs20/patches/patch-ac
deleted file mode 100644
index 239456be488..00000000000
--- a/editors/emacs20/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$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-ah b/editors/emacs20/patches/patch-ah
index 63a8850e395..bca52903550 100644
--- a/editors/emacs20/patches/patch-ah
+++ b/editors/emacs20/patches/patch-ah
@@ -1,8 +1,19 @@
-$NetBSD: patch-ah,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-ah,v 1.2 2006/01/04 17:00:32 joerg 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 @@
+--- src/fileio.c.orig	2000-05-16 11:02:13.000000000 +0000
++++ src/fileio.c
+@@ -61,10 +61,6 @@ Boston, MA 02111-1307, USA.  */
+ 
+ #include <errno.h>
+ 
+-#ifndef vax11c
+-extern int errno;
+-#endif
+-
+ extern char *strerror ();
+ 
+ #ifdef APOLLO
+@@ -3252,8 +3248,11 @@ The value is an integer.")
    return value;
  }
  
diff --git a/editors/emacs20/patches/patch-ai b/editors/emacs20/patches/patch-ai
index 9be9169c817..549027a43b6 100644
--- a/editors/emacs20/patches/patch-ai
+++ b/editors/emacs20/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-ai,v 1.2 2006/01/04 17:00:32 joerg 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 @@
+--- src/sysdep.c.orig	2000-05-24 13:59:14.000000000 +0000
++++ src/sysdep.c
+@@ -104,8 +104,6 @@ extern unsigned start __asm__ ("start");
+ #endif
+ #endif
+ 
+-extern int errno;
+-
+ #ifdef VMS
+ #include <rms.h>
+ #include <ttdef.h>
+@@ -2134,6 +2132,7 @@ unrequest_sigio ()
   *
   */
  
@@ -10,7 +19,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #ifndef HAVE_TEXT_START
  char *
  start_of_text ()
-@@ -2151,6 +2152,7 @@
+@@ -2151,6 +2150,7 @@ start_of_text ()
  #endif /* TEXT_START */
  }
  #endif /* not HAVE_TEXT_START */
diff --git a/editors/emacs20/patches/patch-aj b/editors/emacs20/patches/patch-aj
index 467048d02ff..51970f4438a 100644
--- a/editors/emacs20/patches/patch-aj
+++ b/editors/emacs20/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/04 17:00:32 joerg Exp $
 
---- src/process.c.orig	Wed May 24 04:10:16 2000
-+++ src/process.c	Mon Sep  4 14:15:19 2000
+--- src/process.c.orig	2000-05-23 19:10:16.000000000 +0000
++++ src/process.c
 @@ -1,7 +1,18 @@
 +/*
 + * Locally hacked process.c to add ipv6 support. -wsr
@@ -21,7 +21,15 @@ $NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  This file is part of GNU Emacs.
  
  GNU Emacs is free software; you can redistribute it and/or modify
-@@ -1810,15 +1821,21 @@
+@@ -147,7 +158,6 @@ Lisp_Object Qlast_nonmenu_event;
+ 
+ #include "syswait.h"
+ 
+-extern int errno;
+ extern char *strerror ();
+ #ifdef VMS
+ extern char *sys_errlist[];
+@@ -1810,15 +1820,21 @@ Fourth arg SERVICE is name of the servic
  {
    Lisp_Object proc;
    register int i;
@@ -46,7 +54,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
    int retry = 0;
    int count = specpdl_ptr - specpdl;
-@@ -1831,6 +1848,22 @@
+@@ -1831,6 +1847,22 @@ Fourth arg SERVICE is name of the servic
    GCPRO4 (name, buffer, host, service);
    CHECK_STRING (name, 0);
    CHECK_STRING (host, 0);
@@ -69,7 +77,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    if (INTEGERP (service))
      port = htons ((unsigned short) XINT (service));
    else
-@@ -1841,6 +1874,7 @@
+@@ -1841,6 +1873,7 @@ Fourth arg SERVICE is name of the servic
  	error ("Unknown service \"%s\"", XSTRING (service)->data);
        port = svc_info->s_port;
      }
@@ -77,7 +85,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  
    /* Slow down polling to every ten seconds.
       Some kernels have a bug which causes retrying connect to fail
-@@ -1850,6 +1884,75 @@
+@@ -1850,6 +1883,75 @@ Fourth arg SERVICE is name of the servic
  #endif
  
  #ifndef TERM
@@ -153,7 +161,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    while (1)
      {
  #ifdef TRY_AGAIN
-@@ -1940,6 +2043,7 @@
+@@ -1940,6 +2042,7 @@ Fourth arg SERVICE is name of the servic
        report_file_error ("connection failed",
  			 Fcons (host, Fcons (name, Qnil)));
      }
diff --git a/editors/emacs20/patches/patch-an b/editors/emacs20/patches/patch-an
index 144c355caa7..807fafd1363 100644
--- a/editors/emacs20/patches/patch-an
+++ b/editors/emacs20/patches/patch-an
@@ -1,11 +1,12 @@
-$NetBSD: patch-an,v 1.1 2004/01/13 21:58:51 kristerw Exp $
+$NetBSD: patch-an,v 1.2 2006/01/04 17:00:32 joerg Exp $
 
---- src/emacs.c.orig	Tue Jan 13 22:28:51 2004
-+++ src/emacs.c	Tue Jan 13 22:30:08 2004
-@@ -602,7 +602,6 @@
+--- src/emacs.c.orig	2000-05-24 13:58:54.000000000 +0000
++++ src/emacs.c
+@@ -601,8 +601,6 @@ main (argc, argv, envp)
+ {
    char stack_bottom_variable;
    int skip_args = 0;
-   extern int errno;
+-  extern int errno;
 -  extern int sys_nerr;
  #ifdef HAVE_SETRLIMIT
    struct rlimit rlim;
diff --git a/editors/emacs20/patches/patch-ao b/editors/emacs20/patches/patch-ao
new file mode 100644
index 00000000000..a7577552c6c
--- /dev/null
+++ b/editors/emacs20/patches/patch-ao
@@ -0,0 +1,107 @@
+$NetBSD: patch-ao,v 1.1 2006/01/04 17:00:32 joerg Exp $
+
+--- /dev/null	2006-01-04 16:01:24.000000000 +0000
++++ src/s/dragonfly.h
+@@ -0,0 +1,102 @@
++/* System description header for FreeBSD systems.
++   This file describes the parameters that system description files
++   should define or not.
++   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++   Free Software Foundation, Inc.
++
++This file is part of GNU Emacs.
++
++GNU Emacs is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2, or (at your option)
++any later version.
++
++GNU Emacs is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GNU Emacs; see the file COPYING.  If not, write to
++the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA.  */
++
++/* Get most of the stuff from bsd4.3 */
++#include "bsd4-3.h"
++
++/* For mem-limits.h. */
++#define BSD4_2
++
++/* These aren't needed, since we have getloadavg.  */
++#undef KERNEL_FILE
++#undef LDAV_SYMBOL
++
++#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE)
++
++#define LIBS_DEBUG
++#define LIBS_SYSTEM -lutil
++#define SYSV_SYSTEM_DIR
++
++/* freebsd has POSIX-style pgrp behavior. */
++#undef BSD_PGRPS
++#define GETPGRP_NO_ARG
++
++#define LD_SWITCH_SYSTEM_1
++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
++#define UNEXEC unexelf.o
++#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
++#undef LIB_GCC
++#define LIB_GCC
++
++#define HAVE_WAIT_HEADER
++#define HAVE_GETLOADAVG 1
++#define HAVE_TERMIOS
++#define NO_TERMIO
++#define NO_MATHERR
++#define DECLARE_GETPWUID_WITH_UID_T
++
++/* freebsd uses OXTABS instead of the expected TAB3. */
++#define TABDLY OXTABS
++#define TAB3 OXTABS
++
++/* this silences a few compilation warnings */
++#undef BSD_SYSTEM
++#define BSD_SYSTEM 199506
++
++#define WAITTYPE int
++/* get this since it won't be included if WAITTYPE is defined */
++#ifdef emacs
++#include <sys/wait.h>
++#endif
++#define WRETCODE(w) (_W_INT(w) >> 8)
++
++/* Needed to avoid hanging when child process writes an error message
++   and exits -- enami tsugutomo <enami@ba2.so-net.or.jp>.  */
++#define vfork fork
++
++/* Don't close pty in process.c to make it as controlling terminal.
++   It is already a controlling terminal of subprocess, because we did
++   ioctl TIOCSCTTY.  */
++#define DONT_REOPEN_PTY
++
++/* CLASH_DETECTION is defined in bsd4-3.h.
++   In FreeBSD 2.1.5 (and other 2.1.x), this results useless symbolic links
++   remaining in /tmp or other directories with +t bit.
++   To avoid this problem, you could #undef it to use no file lock. */
++/* #undef CLASH_DETECTION */
++
++/* Circumvent a bug in FreeBSD.  In the following sequence of
++   writes/reads on a PTY, read(2) returns bogus data:
++
++   write(2)  1022 bytes
++   write(2)   954 bytes, get EAGAIN
++   read(2)   1024 bytes in process_read_output
++   read(2)     11 bytes in process_read_output
++
++   That is, read(2) returns more bytes than have ever been written
++   successfully.  The 1033 bytes read are the 1022 bytes written
++   successfully after processing (for example with CRs added if the
++   terminal is set up that way which it is here).  The same bytes will
++   be seen again in a later read(2), without the CRs.  */
++
++#define BROKEN_PTY_READ_AFTER_EAGAIN 1
diff --git a/editors/emacs20/patches/patch-ap b/editors/emacs20/patches/patch-ap
new file mode 100644
index 00000000000..ccdef8786aa
--- /dev/null
+++ b/editors/emacs20/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2006/01/04 17:00:32 joerg Exp $
+
+--- lib-src/emacsclient.c.orig	2006-01-04 15:27:43.000000000 +0000
++++ lib-src/emacsclient.c
+@@ -185,7 +185,6 @@ main (argc, argv)
+ #include <errno.h>
+ 
+ extern char *strerror ();
+-extern int errno;
+ 
+ int
+ main (argc, argv)
diff --git a/editors/emacs20/patches/patch-aq b/editors/emacs20/patches/patch-aq
new file mode 100644
index 00000000000..7139b947990
--- /dev/null
+++ b/editors/emacs20/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.1 2006/01/04 17:00:32 joerg Exp $
+
+--- src/dispnew.c.orig	2006-01-04 15:31:05.000000000 +0000
++++ src/dispnew.c
+@@ -2067,7 +2067,6 @@ window_change_signal (signalnum) /* If w
+      int signalnum;		/* some compilers complain in signal calls. */
+ {
+   int width, height;
+-  extern int errno;
+   int old_errno = errno;
+ 
+   get_frame_size (&width, &height);
diff --git a/editors/emacs20/patches/patch-ar b/editors/emacs20/patches/patch-ar
new file mode 100644
index 00000000000..2c41a65a01e
--- /dev/null
+++ b/editors/emacs20/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.1 2006/01/04 17:00:32 joerg Exp $
+
+--- src/keyboard.c.orig	2006-01-04 15:37:56.000000000 +0000
++++ src/keyboard.c
+@@ -67,10 +67,9 @@ Boston, MA 02111-1307, USA.  */
+ /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
+ #include "systime.h"
+ 
+-extern int errno;
+-
+ /* Variables for blockinput.h: */
+ 
++
+ /* Non-zero if interrupt input is blocked right now.  */
+ int interrupt_input_blocked;
+ 
diff --git a/editors/emacs20/patches/patch-as b/editors/emacs20/patches/patch-as
new file mode 100644
index 00000000000..2c2ee83a7d4
--- /dev/null
+++ b/editors/emacs20/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2006/01/04 17:00:32 joerg Exp $
+
+--- src/buffer.c.orig	2006-01-04 15:45:31.000000000 +0000
++++ src/buffer.c
+@@ -25,8 +25,6 @@ Boston, MA 02111-1307, USA.  */
+ #include <sys/param.h>
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ #ifndef MAXPATHLEN
+ /* in 4.1, param.h fails to define this. */
+ #define MAXPATHLEN 1024
diff --git a/editors/emacs20/patches/patch-at b/editors/emacs20/patches/patch-at
new file mode 100644
index 00000000000..375862b590a
--- /dev/null
+++ b/editors/emacs20/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2006/01/04 17:00:32 joerg Exp $
+
+--- src/lread.c.orig	2006-01-04 16:10:20.000000000 +0000
++++ src/lread.c
+@@ -73,8 +73,6 @@ Boston, MA 02111-1307, USA.  */
+ #define O_RDONLY 0
+ #endif
+ 
+-extern int errno;
+-
+ Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list;
+ Lisp_Object Qvariable_documentation, Vvalues, Vstandard_input, Vafter_load_alist;
+ Lisp_Object Qascii_character, Qload, Qload_file_name;
diff --git a/editors/emacs20/patches/patch-au b/editors/emacs20/patches/patch-au
new file mode 100644
index 00000000000..b0bdcbd6993
--- /dev/null
+++ b/editors/emacs20/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2006/01/04 17:00:32 joerg Exp $
+
+--- src/floatfns.c.orig	2006-01-04 15:59:18.000000000 +0000
++++ src/floatfns.c
+@@ -109,8 +109,6 @@ extern double logb ();
+ 
+ #ifdef FLOAT_CHECK_ERRNO
+ # include <errno.h>
+-
+-extern int errno;
+ #endif
+ 
+ /* Avoid traps on VMS from sinh and cosh.
diff --git a/editors/emacs20/patches/patch-bq b/editors/emacs20/patches/patch-bq
index c44d0947296..3306776d16c 100644
--- a/editors/emacs20/patches/patch-bq
+++ b/editors/emacs20/patches/patch-bq
@@ -1,8 +1,8 @@
-$NetBSD: patch-bq,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-bq,v 1.2 2006/01/04 17:00:32 joerg 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 @@
+--- src/callproc.c.orig	2006-01-04 16:05:18.000000000 +0000
++++ src/callproc.c
+@@ -24,8 +24,10 @@ Boston, MA 02111-1307, USA.  */
  
  #include <config.h>
  #include <stdio.h>
@@ -10,5 +10,7 @@ $NetBSD: patch-bq,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
 +#include <unistd.h>
 +#endif
  
- extern int errno;
+-extern int errno;
  extern char *strerror ();
+ 
+ /* Define SIGCHLD as an alias for SIGCLD.  */
diff --git a/editors/emacs20/patches/patch-bz b/editors/emacs20/patches/patch-bz
index e605cfcc9ee..49cb855483b 100644
--- a/editors/emacs20/patches/patch-bz
+++ b/editors/emacs20/patches/patch-bz
@@ -1,8 +1,8 @@
-$NetBSD: patch-bz,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+$NetBSD: patch-bz,v 1.2 2006/01/04 17:00:32 joerg Exp $
 
---- lib-src/emacsserver.c.orig	2004-03-25 22:57:10.000000000 +0100
-+++ lib-src/emacsserver.c	2004-03-25 22:57:32.000000000 +0100
-@@ -26,6 +26,7 @@
+--- lib-src/emacsserver.c.orig	1999-02-22 20:44:14.000000000 +0000
++++ lib-src/emacsserver.c
+@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
     up to the Emacs which then executes them.  */
  
  #define NO_SHORTNAMES
@@ -10,3 +10,12 @@ $NetBSD: patch-bz,v 1.1 2004/03/25 22:13:34 kristerw Exp $
  #include <signal.h>
  #include <../src/config.h>
  #undef read
+@@ -65,8 +66,6 @@ void fatal_error ();
+ #include <unistd.h>
+ #endif
+ 
+-extern int errno;
+-
+ /* Copied from src/process.c */
+ #ifdef FD_SET
+ /* We could get this from param.h, but better not to depend on finding that.