Create separate configuration for DragonFly. Fix errno.

Based on patch from Richard Nyberg on DragonFly's user list.

15 files changed, 306 insertions, 4 deletions

diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index dba65697d17..9f965c2bbe9 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,14 +1,27 @@
-$NetBSD: distinfo,v 1.23 2005/10/06 11:08:39 markd Exp $
+$NetBSD: distinfo,v 1.24 2005/12/29 13:56:51 joerg Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
 Size (emacs-21.4a.tar.gz) = 20403483 bytes
 SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
-SHA1 (patch-ab) = 0d95f189804241e9416de7ced65aa90fccab4287
+SHA1 (patch-ab) = af169f255e8b9568cdf92d6efa54a8d4c691a1bf
 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
+SHA1 (patch-ai) = ee6cdc06b101805c79e73bc3aaa04f5d79e48872
+SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7
 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
+SHA1 (patch-al) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91
+SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76
+SHA1 (patch-ao) = 6e57a5a12742a09c2365933f580717ded232cf51
+SHA1 (patch-ap) = a2f0108a6aa7e0389cd629ade74ca00c31cb1034
+SHA1 (patch-aq) = 5d040fa79de68ec4a673db93caf3a9434c22a029
+SHA1 (patch-ar) = d681a5e6daef094da957f198ab1607dca95a306a
+SHA1 (patch-as) = 15ab1dcc2d6a445b119b7f2bb8a8331b4aa1fbd0
+SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c
+SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb
+SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263
 SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
 SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942
diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab
index fc0c422045f..1018cdf8667 100644
--- a/editors/emacs/patches/patch-ab
+++ b/editors/emacs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.20 2005/10/06 11:08:39 markd Exp $
+$NetBSD: patch-ab,v 1.21 2005/12/29 13:56:51 joerg Exp $
 
 --- configure.orig	2003-03-19 02:19:12.000000000 +1200
 +++ configure
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.20 2005/10/06 11:08:39 markd Exp $
        *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )	        opsys=386bsd ;;
        *-freebsd* )	        opsys=freebsd ;;
-+      *-dragonfly* )	        opsys=freebsd ;;
++      *-dragonfly* )	        opsys=dragonfly ;;
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
diff --git a/editors/emacs/patches/patch-ai b/editors/emacs/patches/patch-ai
new file mode 100644
index 00000000000..a526db236ca
--- /dev/null
+++ b/editors/emacs/patches/patch-ai
@@ -0,0 +1,131 @@
+$NetBSD: patch-ai,v 1.5 2005/12/29 13:56:51 joerg Exp $
+
+--- src/s/dragonfly.h.orig	2005-12-29 13:13:02.000000000 +0000
++++ src/s/dragonfly.h
+@@ -0,0 +1,126 @@
++/* 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 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
++
++/* 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 */
++
++/* If the system's imake configuration file defines `NeedWidePrototypes'
++   as `NO', we must define NARROWPROTO manually.  Such a define is
++   generated in the Makefile generated by `xmkmf'.  If we don't 
++   define NARROWPROTO, we will see the wrong function prototypes
++   for X functions taking float or double parameters.  */
++
++#define NARROWPROTO 1
++
++#define C_SWITCH_SYSTEM
++#define LD_SWITCH_SYSTEM
++
++/* 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
++
++/* Tell that garbage collector that setjmp is known to save all
++   registers relevant for conservative garbage collection in the
++   jmp_buf.  */
++
++#define GC_SETJMP_WORKS 1
++
++/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
++   stack.  */
++
++#define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
++
++/* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate
++   buffer text.  This overrides REL_ALLOC.  */
++
++#define USE_MMAP_FOR_BUFFERS	1
++
++/* Use sigprocmask(2) and friends instead of sigblock(2); the man page
++   of sigblock says it is obsolete.  */
++
++#define POSIX_SIGNALS		1
diff --git a/editors/emacs/patches/patch-aj b/editors/emacs/patches/patch-aj
new file mode 100644
index 00000000000..0425b5fa93f
--- /dev/null
+++ b/editors/emacs/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.10 2005/12/29 13:56:51 joerg Exp $
+
+--- lib-src/emacsclient.c.orig	2005-12-29 13:22:18.000000000 +0000
++++ lib-src/emacsclient.c
+@@ -226,7 +226,6 @@ main (argc, argv)
+ #include <errno.h>
+ 
+ extern char *strerror ();
+-extern int errno;
+ 
+ /* Three possibilities:
+    2 - can't be `stat'ed		(sets errno)
diff --git a/editors/emacs/patches/patch-al b/editors/emacs/patches/patch-al
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/editors/emacs/patches/patch-al
diff --git a/editors/emacs/patches/patch-am b/editors/emacs/patches/patch-am
new file mode 100644
index 00000000000..eaa19908f6c
--- /dev/null
+++ b/editors/emacs/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.5 2005/12/29 13:56:51 joerg Exp $
+
+--- src/xterm.c.orig	2005-12-29 13:24:55.000000000 +0000
++++ src/xterm.c
+@@ -370,8 +370,6 @@ extern Lisp_Object Vx_no_window_manager;
+ 
+ extern Lisp_Object Qface, Qmouse_face;
+ 
+-extern int errno;
+-
+ /* A mask of extra modifier bits to put into every keyboard char.  */
+ 
+ extern int extra_keyboard_modifiers;
diff --git a/editors/emacs/patches/patch-an b/editors/emacs/patches/patch-an
new file mode 100644
index 00000000000..d69a6610e99
--- /dev/null
+++ b/editors/emacs/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/emacs.c.orig	2005-12-29 13:27:49.000000000 +0000
++++ src/emacs.c
+@@ -712,9 +712,6 @@ main (argc, argv, envp)
+   char stack_bottom_variable;
+   int do_initial_setlocale;
+   int skip_args = 0;
+-#ifndef USE_CRT_DLL
+-  extern int errno;
+-#endif
+ #ifdef HAVE_SETRLIMIT
+   struct rlimit rlim;
+ #endif
diff --git a/editors/emacs/patches/patch-ao b/editors/emacs/patches/patch-ao
new file mode 100644
index 00000000000..61d4eee6c41
--- /dev/null
+++ b/editors/emacs/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/keyboard.c.orig	2005-12-29 13:28:32.000000000 +0000
++++ src/keyboard.c
+@@ -77,10 +77,6 @@ Boston, MA 02111-1307, USA.  */
+ /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
+ #include "systime.h"
+ 
+-#ifndef USE_CRT_DLL
+-extern int errno;
+-#endif
+-
+ /* Variables for blockinput.h: */
+ 
+ /* Non-zero if interrupt input is blocked right now.  */
diff --git a/editors/emacs/patches/patch-ap b/editors/emacs/patches/patch-ap
new file mode 100644
index 00000000000..c44b69bf69c
--- /dev/null
+++ b/editors/emacs/patches/patch-ap
@@ -0,0 +1,15 @@
+$NetBSD: patch-ap,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/buffer.c.orig	2005-12-29 13:29:35.000000000 +0000
++++ src/buffer.c
+@@ -27,10 +27,6 @@ Boston, MA 02111-1307, USA.  */
+ #include <errno.h>
+ #include <stdio.h>
+ 
+-#ifndef USE_CRT_DLL
+-extern int errno;
+-#endif
+-
+ #ifndef MAXPATHLEN
+ /* in 4.1, param.h fails to define this. */
+ #define MAXPATHLEN 1024
diff --git a/editors/emacs/patches/patch-aq b/editors/emacs/patches/patch-aq
new file mode 100644
index 00000000000..596729bb3b3
--- /dev/null
+++ b/editors/emacs/patches/patch-aq
@@ -0,0 +1,17 @@
+$NetBSD: patch-aq,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/fileio.c.orig	2005-12-29 13:30:15.000000000 +0000
++++ src/fileio.c
+@@ -64,12 +64,6 @@ Boston, MA 02111-1307, USA.  */
+ 
+ #include <errno.h>
+ 
+-#ifndef vax11c
+-#ifndef USE_CRT_DLL
+-extern int errno;
+-#endif
+-#endif
+-
+ #ifdef APOLLO
+ #include <sys/time.h>
+ #endif
diff --git a/editors/emacs/patches/patch-ar b/editors/emacs/patches/patch-ar
new file mode 100644
index 00000000000..971374bb6ac
--- /dev/null
+++ b/editors/emacs/patches/patch-ar
@@ -0,0 +1,14 @@
+$NetBSD: patch-ar,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/floatfns.c.orig	2005-12-29 13:31:17.000000000 +0000
++++ src/floatfns.c
+@@ -107,9 +107,6 @@ extern double logb ();
+ #ifdef FLOAT_CHECK_ERRNO
+ # include <errno.h>
+ 
+-#ifndef USE_CRT_DLL
+-extern int errno;
+-#endif
+ #endif
+ 
+ /* Avoid traps on VMS from sinh and cosh.
diff --git a/editors/emacs/patches/patch-as b/editors/emacs/patches/patch-as
new file mode 100644
index 00000000000..341ce790139
--- /dev/null
+++ b/editors/emacs/patches/patch-as
@@ -0,0 +1,15 @@
+$NetBSD: patch-as,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/lread.c.orig	2005-12-29 13:32:39.000000000 +0000
++++ src/lread.c
+@@ -72,10 +72,6 @@ Boston, MA 02111-1307, USA.  */
+ #define file_tell ftell
+ #endif
+ 
+-#ifndef USE_CRT_DLL
+-extern int errno;
+-#endif
+-
+ 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/emacs/patches/patch-at b/editors/emacs/patches/patch-at
new file mode 100644
index 00000000000..45ef92ac548
--- /dev/null
+++ b/editors/emacs/patches/patch-at
@@ -0,0 +1,14 @@
+$NetBSD: patch-at,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/process.c.orig	2005-12-29 13:33:52.000000000 +0000
++++ src/process.c
+@@ -147,9 +147,6 @@ Lisp_Object Qlast_nonmenu_event;
+ 
+ extern void set_waiting_for_input P_ ((EMACS_TIME *));
+ 
+-#ifndef USE_CRT_DLL
+-extern int errno;
+-#endif
+ #ifdef VMS
+ extern char *sys_errlist[];
+ #endif
diff --git a/editors/emacs/patches/patch-au b/editors/emacs/patches/patch-au
new file mode 100644
index 00000000000..e498ca97b3c
--- /dev/null
+++ b/editors/emacs/patches/patch-au
@@ -0,0 +1,15 @@
+$NetBSD: patch-au,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/callproc.c.orig	2005-12-29 13:34:29.000000000 +0000
++++ src/callproc.c
+@@ -25,10 +25,6 @@ Boston, MA 02111-1307, USA.  */
+ #include <errno.h>
+ #include <stdio.h>
+ 
+-#ifndef USE_CRT_DLL
+-extern int errno;
+-#endif
+-
+ /* Define SIGCHLD as an alias for SIGCLD.  */
+ 
+ #if !defined (SIGCHLD) && defined (SIGCLD)
diff --git a/editors/emacs/patches/patch-av b/editors/emacs/patches/patch-av
new file mode 100644
index 00000000000..f83d82efaf2
--- /dev/null
+++ b/editors/emacs/patches/patch-av
@@ -0,0 +1,14 @@
+$NetBSD: patch-av,v 1.3 2005/12/29 13:56:51 joerg Exp $
+
+--- src/dispnew.c.orig	2005-12-29 13:38:38.000000000 +0000
++++ src/dispnew.c
+@@ -5820,9 +5820,6 @@ window_change_signal (signalnum) /* If w
+      int signalnum;		/* some compilers complain in signal calls.  */
+ {
+   int width, height;
+-#ifndef USE_CRT_DLL
+-  extern int errno;
+-#endif
+   int old_errno = errno;
+ 
+   get_frame_size (&width, &height);