Make this compile on DragonFly in the hope that also means that it is

as usable as Emacs can be.
Fix errno. Use ${LOWER_OPSYS} instead of hard-coded OS name and pass
the pass to canna lib to configure. The first fixes !NetBSD, the latter
triggers addition of rpath entries for libcanna.

23 files changed, 365 insertions, 45 deletions

diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index d7df9052229..ba422cdb652 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/12/01 18:13:24 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/01/04 20:35:08 joerg Exp $
 
 DISTNAME=	mule-2.3
 PKGREVISION=	2
@@ -22,8 +22,10 @@ USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid
-CONFIGURE_ARGS+=	--terminal-face --mcpath
+CFLAGS+=-g
+
+CONFIGURE_ARGS+=	${MACHINE_ARCH}--${LOWER_OPSYS} --with-x --with-x-toolkit=lucid
+CONFIGURE_ARGS+=	--terminal-face --mcpath --canna-libraries=${PREFIX}/lib
 .if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64"
 CONFIGURE_ARGS+=	--valbits=26
 .endif
diff --git a/editors/mule/PLIST b/editors/mule/PLIST
index 697e468b050..daae5421149 100644
--- a/editors/mule/PLIST
+++ b/editors/mule/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/12/01 18:12:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/01/04 20:35:08 joerg Exp $
 bin/any2ps
 bin/b2m
 bin/coco
@@ -104,22 +104,22 @@ lib/mule/19.28/etc/tom.xbm
 lib/mule/19.28/etc/ulimit.hack
 lib/mule/19.28/etc/vipcard.tex
 lib/mule/19.28/etc/yow.lines
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/cvtmail
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/digest-doc
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/emacsserver
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/fakemail
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/hexl
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/make-docfile
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/make-path
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/movemail
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/profile
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/rcs2log
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/sorted-doc
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/test-distrib
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/timer
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/vcdiff
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/wakeup
-lib/mule/19.28/${MACHINE_ARCH}--netbsd/yow
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/cvtmail
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/digest-doc
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/emacsserver
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/fakemail
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/hexl
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/make-docfile
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/make-path
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/movemail
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/profile
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/rcs2log
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/sorted-doc
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/test-distrib
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/timer
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/vcdiff
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/wakeup
+lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}/yow
 lib/mule/19.28/lisp/COPYING
 lib/mule/19.28/lisp/ChangeLog
 lib/mule/19.28/lisp/ChangeLog.1
@@ -922,6 +922,6 @@ lib/mule/19.28/lisp/yow.elc
 @dirrm lib/mule/19.28/lisp/term
 @dirrm lib/mule/19.28/lisp
 @dirrm lib/mule/19.28/etc
-@dirrm lib/mule/19.28/${MACHINE_ARCH}--netbsd
+@dirrm lib/mule/19.28/${MACHINE_ARCH}--${LOWER_OPSYS}
 @dirrm lib/mule/19.28
 @dirrm lib/mule
diff --git a/editors/mule/distinfo b/editors/mule/distinfo
index 83f9a4bf05a..824f027a641 100644
--- a/editors/mule/distinfo
+++ b/editors/mule/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: distinfo,v 1.7 2006/01/04 20:35:08 joerg Exp $
 
 SHA1 (mule-2.3.tar.gz) = 52737767955caf2fde34b994f367a89c5d8a045f
 RMD160 (mule-2.3.tar.gz) = 52b93e746a7a796549a44104ab1898954df044bf
@@ -6,15 +6,15 @@ Size (mule-2.3.tar.gz) = 10240256 bytes
 SHA1 (patch-aa) = 927ec514204ef97101fb3f4ab77eec1c71af23f1
 SHA1 (patch-ab) = ffb7afcac57932cfe477b87daa5579b54aea3672
 SHA1 (patch-ac) = 170fa4f6c17c805dd32a90e8bfb3e38c48a9fc20
-SHA1 (patch-ad) = cd36f675094eaa704e6143e4d1881deae55a9dbf
+SHA1 (patch-ad) = 668aea174d80616ce1fd93d9dd4134d5027d9df8
 SHA1 (patch-ae) = 1f020aaeb75cd7dd2b827ab34382e472add09719
 SHA1 (patch-af) = 2672b9c724cfed135218a76e857fd26ebe3676ac
 SHA1 (patch-ag) = 590fe919b44722f7ba1e390cf7fecbc20eeeba06
-SHA1 (patch-ah) = 9d8d65d8f18057038618466a969f93c074b5937f
-SHA1 (patch-ai) = 584a0b5bdcd15a096761637755173ecf6d360d73
+SHA1 (patch-ah) = b264a5504f24929a413241f935338ef6d7ab9763
+SHA1 (patch-ai) = b3504a83bc51b3712e016f5b3efe9155fcaffa4b
 SHA1 (patch-aj) = c240cbff3da3ca33663fc2e1d04a3c60c84b4d70
-SHA1 (patch-ak) = e032f40e0c0c1456b5db9cb2631a4dbc25b1568d
-SHA1 (patch-al) = d285889a4ba7989c0c0d30a5bc4e259c27914823
+SHA1 (patch-ak) = 9304c40c5beabbfde048cd02b299359660a0271e
+SHA1 (patch-al) = c5e2542651c795a57864811c7019a65f4d991247
 SHA1 (patch-am) = 4ce76f12b3f8e2744bfd4cf683c4abc82ad60af0
 SHA1 (patch-an) = 9221c9747c7cf600e9915f8428178d33a55d180b
 SHA1 (patch-ao) = d878149708394d86bd8e98b771282e17cf95607b
@@ -34,7 +34,7 @@ SHA1 (patch-bb) = 09c53a3ab6169ee33c4afdbd3e108874627117e2
 SHA1 (patch-bc) = 50439819ced9e116e558ac61451442911dff9fd3
 SHA1 (patch-bd) = 413995887f8898faac75e93d0bfc6c2fb87a1b43
 SHA1 (patch-be) = 85658caaf28202b2dc07172c671d18441ce1e494
-SHA1 (patch-bf) = 589fc4ab741448626467a62f0624b8c6ce406ecd
+SHA1 (patch-bf) = 70ef9e03b13d23da7b6e9ad8b9b5ba1c08285ee8
 SHA1 (patch-bg) = 4fb1d27e69961bbe5a90efe8e73bf0de6f5c491d
 SHA1 (patch-bh) = 31963f9b430e56e7b0ee30f3d5479c22df4cf18c
 SHA1 (patch-bi) = 899f8d66add66c54ebc59f3127524d7fae0c7724
@@ -50,3 +50,17 @@ SHA1 (patch-br) = 52fa52b4e475fe2083a72d8f0264ff99cdfa60e5
 SHA1 (patch-bs) = 1fd5b02129bb356ab422e83812b83c7ff656af8c
 SHA1 (patch-bt) = b0f3c38e61ae211f35695d2522f1f7440a944302
 SHA1 (patch-bu) = a8ccd87510615e5353bb9525cd0fcfafdf56ea07
+SHA1 (patch-bv) = b92611d27a1fc4fc0d4bbe171683e057e6dcaf60
+SHA1 (patch-bw) = b31cb18bb72ad22e569ac927517946c6d1b81295
+SHA1 (patch-bx) = 65ad4fcff8f71b9e1ad4915f8a9cdeff05da243d
+SHA1 (patch-by) = 4bff739ab49291737f3d20fa89bb243b3651db6a
+SHA1 (patch-bz) = e48f13d6194976f8f4174257a06c300a959c9ac7
+SHA1 (patch-ca) = a98c0d794427e858c6232283f50598d0c55c3f16
+SHA1 (patch-cb) = aa0d1252d655c1f9d9f39fab2a145f521e01979f
+SHA1 (patch-cc) = b85f9888f51d3cdab13a80b20e083e2cfaac85d2
+SHA1 (patch-cd) = cc9a52fca9e48e404f890f0ecc7ae16204d2d9cf
+SHA1 (patch-ce) = 2190c8be66f0fb2e4479a7c151d51f88858e83be
+SHA1 (patch-cf) = a13990995698dc16f91a825cbb4430a41a4c65dd
+SHA1 (patch-cg) = 2fbe0de8a502a2fe083379a39aaf126148d0ded3
+SHA1 (patch-ch) = f5314755074b7301ee36825c82d15763b1d3f062
+SHA1 (patch-ci) = b172fe40cccba2aa622a5522fffa421cbcd299a5
diff --git a/editors/mule/patches/patch-ad b/editors/mule/patches/patch-ad
index 751f4c7b935..4b968a44d39 100644
--- a/editors/mule/patches/patch-ad
+++ b/editors/mule/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2006/01/04 20:35:08 joerg Exp $
 
---- configure.orig	1995-06-05 03:11:38.000000000 +0200
+--- configure.orig	1995-06-05 01:11:38.000000000 +0000
 +++ configure
 @@ -581,12 +581,14 @@ case "${canonical}" in
    *-*-netbsd* )
@@ -17,3 +17,11 @@ $NetBSD: patch-ad,v 1.3 2005/12/01 18:13:24 wiz Exp $
        sparc-*-netbsd*)	machine=sparc ;;
      esac
    ;;
+@@ -1177,6 +1179,7 @@ case "${canonical}" in
+       *-bsd386* | *-bsdi* )	opsys=bsd386 ;;
+       *-386bsd* )	        opsys=386bsd ;;
+       *-freebsd* )	        opsys=freebsd ;;
++      *-dragonfly* )		opsys=dragonfly ;;
+       *-nextstep* )             opsys=mach2 ;;
+       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
+     esac
diff --git a/editors/mule/patches/patch-ah b/editors/mule/patches/patch-ah
index bb723ec6098..bc054b6e6f4 100644
--- a/editors/mule/patches/patch-ah
+++ b/editors/mule/patches/patch-ah
@@ -1,8 +1,19 @@
-$NetBSD: patch-ah,v 1.2 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2006/01/04 20:35:08 joerg Exp $
 
---- src/fileio.c.orig	1995-06-23 12:25:18.000000000 +0200
+--- src/fileio.c.orig	1995-06-23 10:25:18.000000000 +0000
 +++ src/fileio.c
-@@ -2604,8 +2604,6 @@ The value is an integer.")
+@@ -117,10 +117,6 @@ the Free Software Foundation, 675 Mass A
+ 
+ #include <errno.h>
+ 
+-#ifndef vax11c
+-extern int errno;
+-#endif
+-
+ extern char *strerror ();
+ 
+ #ifdef APOLLO
+@@ -2604,8 +2600,6 @@ The value is an integer.")
    return value;
  }
  
@@ -11,7 +22,7 @@ $NetBSD: patch-ah,v 1.2 2005/12/01 18:13:24 wiz Exp $
  DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
    "Tell Unix to finish all pending disk updates.")
    ()
-@@ -2614,8 +2612,6 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sy
+@@ -2614,8 +2608,6 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sy
    return Qnil;
  }
  
@@ -20,7 +31,7 @@ $NetBSD: patch-ah,v 1.2 2005/12/01 18:13:24 wiz Exp $
  DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0,
    "Return t if file FILE1 is newer than file FILE2.\n\
  If FILE1 does not exist, the answer is nil;\n\
-@@ -4507,7 +4503,5 @@ This applies only to the operation `inhi
+@@ -4507,7 +4499,5 @@ This applies only to the operation `inhi
    defsubr (&Sread_file_name_internal);
    defsubr (&Sread_file_name);
  
diff --git a/editors/mule/patches/patch-ai b/editors/mule/patches/patch-ai
index 2b26cd85e83..9efdbfce61a 100644
--- a/editors/mule/patches/patch-ai
+++ b/editors/mule/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2006/01/04 20:35:08 joerg Exp $
 
---- src/floatfns.c.orig	1995-02-17 08:47:39.000000000 +0100
+--- src/floatfns.c.orig	1995-02-17 07:47:39.000000000 +0000
 +++ src/floatfns.c
 @@ -49,7 +49,7 @@ the Free Software Foundation, 675 Mass A
  #include "lisp.h"
@@ -11,3 +11,12 @@ $NetBSD: patch-ai,v 1.2 2005/12/01 18:13:24 wiz Exp $
  
  #ifdef LISP_FLOAT_TYPE
  
+@@ -103,8 +103,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/mule/patches/patch-ak b/editors/mule/patches/patch-ak
index 5fd4cd535f9..eac0b4bc858 100644
--- a/editors/mule/patches/patch-ak
+++ b/editors/mule/patches/patch-ak
@@ -1,8 +1,17 @@
-$NetBSD: patch-ak,v 1.2 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: patch-ak,v 1.3 2006/01/04 20:35:08 joerg Exp $
 
 --- src/keyboard.c.orig	1995-02-03 02:21:28.000000000 +0100
 +++ src/keyboard.c
-@@ -301,7 +301,7 @@ Lisp_Object Vlast_event_frame;
+@@ -100,8 +100,6 @@ the Free Software Foundation, 675 Mass A
+ /* 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.  */
+@@ -301,7 +299,7 @@ Lisp_Object Vlast_event_frame;
  
  /* The timestamp of the last input event we received from the X server.
     X Windows wants this for selection ownership.  */
diff --git a/editors/mule/patches/patch-al b/editors/mule/patches/patch-al
index aca7192eeca..872d1192c10 100644
--- a/editors/mule/patches/patch-al
+++ b/editors/mule/patches/patch-al
@@ -1,9 +1,13 @@
-$NetBSD: patch-al,v 1.2 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: patch-al,v 1.3 2006/01/04 20:35:08 joerg Exp $
 
 --- src/lread.c.orig	1995-02-17 08:57:05.000000000 +0100
 +++ src/lread.c
-@@ -86,9 +86,9 @@ extern int errno;
+@@ -82,13 +82,11 @@ the Free Software Foundation, 675 Mass A
+ #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;
diff --git a/editors/mule/patches/patch-bf b/editors/mule/patches/patch-bf
index 7b7bfc46389..1c0e86dccd3 100644
--- a/editors/mule/patches/patch-bf
+++ b/editors/mule/patches/patch-bf
@@ -1,6 +1,6 @@
-$NetBSD: patch-bf,v 1.2 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: patch-bf,v 1.3 2006/01/04 20:35:08 joerg Exp $
 
---- src/emacs.c.orig	1995-06-08 07:58:13.000000000 +0200
+--- src/emacs.c.orig	1995-06-08 05:58:13.000000000 +0000
 +++ src/emacs.c
 @@ -410,6 +410,8 @@ __main ()
  NXZone *emacszone;
@@ -11,10 +11,11 @@ $NetBSD: patch-bf,v 1.2 2005/12/01 18:13:24 wiz Exp $
  /* ARGSUSED */
  main (argc, argv, envp)
       int argc;
-@@ -419,7 +421,9 @@ main (argc, argv, envp)
+@@ -418,8 +420,9 @@ main (argc, argv, envp)
+ {
    char stack_bottom_variable;
    int skip_args = 0;
-   extern int errno;
+-  extern int errno;
 +#if !(defined(BSD) && BSD >= 199306)
    extern sys_nerr;
 +#endif
diff --git a/editors/mule/patches/patch-bv b/editors/mule/patches/patch-bv
new file mode 100644
index 00000000000..1abad3c1cfe
--- /dev/null
+++ b/editors/mule/patches/patch-bv
@@ -0,0 +1,13 @@
+$NetBSD: patch-bv,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- lib-src/make-path.c.orig	2006-01-04 17:42:18.000000000 +0000
++++ lib-src/make-path.c
+@@ -28,8 +28,6 @@ the Free Software Foundation, 675 Mass A
+ #include <stdio.h>
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ char *prog_name;
+ 
+ int touchy_mkdir (path)
diff --git a/editors/mule/patches/patch-bw b/editors/mule/patches/patch-bw
new file mode 100644
index 00000000000..22861fcacde
--- /dev/null
+++ b/editors/mule/patches/patch-bw
@@ -0,0 +1,28 @@
+$NetBSD: patch-bw,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- lib-src/movemail.c.orig	2006-01-04 17:43:12.000000000 +0000
++++ lib-src/movemail.c
+@@ -370,7 +370,6 @@ error (s1, s2, s3)
+ pfatal_with_name (name)
+      char *name;
+ {
+-  extern int errno;
+   extern char *strerror ();
+   char *s;
+ 
+@@ -381,7 +380,6 @@ pfatal_with_name (name)
+ pfatal_and_delete (name)
+      char *name;
+ {
+-  extern int errno;
+   extern char *strerror ();
+   char *s;
+ 
+@@ -747,7 +745,6 @@ multiline (buf, n, f)
+ char *
+ get_errmsg ()
+ {
+-  extern int errno;
+   extern char *strerror ();
+   return strerror (errno);
+ }
diff --git a/editors/mule/patches/patch-bx b/editors/mule/patches/patch-bx
new file mode 100644
index 00000000000..7dc2502fa3a
--- /dev/null
+++ b/editors/mule/patches/patch-bx
@@ -0,0 +1,13 @@
+$NetBSD: patch-bx,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- lib-src/emacsserver.c.orig	2006-01-04 17:43:55.000000000 +0000
++++ lib-src/emacsserver.c
+@@ -56,8 +56,6 @@ main ()
+ #include <stdio.h>
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ main ()
+ {
+   char system_name[32];
diff --git a/editors/mule/patches/patch-by b/editors/mule/patches/patch-by
new file mode 100644
index 00000000000..4053e20c1f5
--- /dev/null
+++ b/editors/mule/patches/patch-by
@@ -0,0 +1,12 @@
+$NetBSD: patch-by,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- lib-src/timer.c.orig	2006-01-04 17:44:22.000000000 +0000
++++ lib-src/timer.c
+@@ -33,7 +33,6 @@
+ #endif
+ 
+ 
+-extern int errno;
+ extern char *strerror ();
+ #ifndef OSF1
+ extern char *malloc ();
diff --git a/editors/mule/patches/patch-bz b/editors/mule/patches/patch-bz
new file mode 100644
index 00000000000..b86534324b9
--- /dev/null
+++ b/editors/mule/patches/patch-bz
@@ -0,0 +1,12 @@
+$NetBSD: patch-bz,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- lib-src/emacsclient.c.orig	2006-01-04 17:44:54.000000000 +0000
++++ lib-src/emacsclient.c
+@@ -53,7 +53,6 @@ main (argc, argv)
+ #include <errno.h>
+ 
+ extern char *strerror ();
+-extern int errno;
+ 
+ main (argc, argv)
+      int argc;
diff --git a/editors/mule/patches/patch-ca b/editors/mule/patches/patch-ca
new file mode 100644
index 00000000000..d7f226e9208
--- /dev/null
+++ b/editors/mule/patches/patch-ca
@@ -0,0 +1,72 @@
+$NetBSD: patch-ca,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- /dev/null	2006-01-04 20:13:24.000000000 +0000
++++ src/s/dragonfly.h
+@@ -0,0 +1,67 @@
++/* Get most of the stuff from bsd4.3 */
++#include "bsd4-3.h"
++
++/* For mem-limits.h. */
++#define BSD4_2
++
++/* thses 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 -lcrypt
++#define LIBS_TERMCAP -ltermcap
++#define LIB_GCC -lgcc
++
++/* Reread the time zone on startup. */
++#define LOCALTIME_CACHE
++
++#define SYSV_SYSTEM_DIR
++
++/* freebsd has POSIX-style pgrp behavior. */
++#undef BSD_PGRPS
++
++#define LD_SWITCH_SYSTEM -e _start
++#define HAVE_TEXT_START		/* No need to define `start_of_text'. */
++#define UNEXEC unexelf.o
++
++#ifndef N_TRELOFF
++#define N_PAGSIZ(x) __LDPGSZ
++#define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data))
++#define N_TRELOFF(x) N_RELOFF(x)
++#endif
++
++#define HAVE_WAIT_HEADER
++#define HAVE_GETLOADAVG
++#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
++#if __FreeBSD__ == 1
++#define BSD 199103
++#elif __FreeBSD__ == 2
++#define BSD 199306
++#endif
++
++#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)
++#define CURRENT_USER
++#define NO_MATHERR
++
++#define ORDINARY_LINK
++
++#if defined(__i386__)
++#define DATA_SEG_BITS 0x08000000
++#endif /* __i386__ */
diff --git a/editors/mule/patches/patch-cb b/editors/mule/patches/patch-cb
new file mode 100644
index 00000000000..2e14675dcd4
--- /dev/null
+++ b/editors/mule/patches/patch-cb
@@ -0,0 +1,12 @@
+$NetBSD: patch-cb,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/dispnew.c.orig	2006-01-04 18:00:54.000000000 +0000
++++ src/dispnew.c
+@@ -2047,7 +2047,6 @@ SIGTYPE
+ window_change_signal ()
+ {
+   int width, height;
+-  extern int errno;
+   int old_errno = errno;
+ 
+   get_frame_size (&width, &height);
diff --git a/editors/mule/patches/patch-cc b/editors/mule/patches/patch-cc
new file mode 100644
index 00000000000..8568ab4a8f9
--- /dev/null
+++ b/editors/mule/patches/patch-cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-cc,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/mcpath.h.orig	2006-01-04 18:01:24.000000000 +0000
++++ src/mcpath.h
+@@ -36,6 +36,7 @@ the Free Software Foundation, 675 Mass A
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <limits.h>
+ 
+ #ifdef VMS
+ #include <string.h>
+@@ -93,7 +94,11 @@ struct mcpath_direntry
+ #ifndef MSDOS
+   int d_ino;
+ #endif /* not MSDOS */
++#ifdef NAME_MAX
++  unsigned char d_name [MCPATH_BUFSIZ (NAME_MAX) + 1];
++#else
+   unsigned char d_name [MCPATH_BUFSIZ (MAXNAMLEN) + 1];
++#endif
+ };
+ 
+ extern DIR *mc_opendir ();
diff --git a/editors/mule/patches/patch-cd b/editors/mule/patches/patch-cd
new file mode 100644
index 00000000000..24808ce2c70
--- /dev/null
+++ b/editors/mule/patches/patch-cd
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/xterm.c.orig	2006-01-04 18:04:35.000000000 +0000
++++ src/xterm.c
+@@ -358,8 +358,6 @@ static int x_noop_count;
+ 
+ static WINDOWINFO_TYPE windowinfo;
+ 
+-extern int errno;
+-
+ /* A mask of extra modifier bits to put into every keyboard char.  */
+ extern int extra_keyboard_modifiers;
+ 
diff --git a/editors/mule/patches/patch-ce b/editors/mule/patches/patch-ce
new file mode 100644
index 00000000000..9166ba81301
--- /dev/null
+++ b/editors/mule/patches/patch-ce
@@ -0,0 +1,13 @@
+$NetBSD: patch-ce,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/sysdep.c.orig	2006-01-04 18:25:48.000000000 +0000
++++ src/sysdep.c
+@@ -75,8 +75,6 @@ extern int h_errno;
+ #include <sys/param.h>
+ #endif
+ 
+-extern int errno;
+-
+ #ifdef VMS
+ #include <rms.h>
+ #include <ttdef.h>
diff --git a/editors/mule/patches/patch-cf b/editors/mule/patches/patch-cf
new file mode 100644
index 00000000000..f534d64f7f2
--- /dev/null
+++ b/editors/mule/patches/patch-cf
@@ -0,0 +1,13 @@
+$NetBSD: patch-cf,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/filelock.c.orig	2006-01-04 18:27:02.000000000 +0000
++++ src/filelock.c
+@@ -56,8 +56,6 @@ extern DIR *opendir ();
+ #endif /* not SYSV_SYSTEM_DIR */
+ #endif /* not MCPATH */
+ 
+-extern int errno;
+-
+ extern char *egetenv ();
+ extern char *strcpy ();
+ 
diff --git a/editors/mule/patches/patch-cg b/editors/mule/patches/patch-cg
new file mode 100644
index 00000000000..38431db1500
--- /dev/null
+++ b/editors/mule/patches/patch-cg
@@ -0,0 +1,12 @@
+$NetBSD: patch-cg,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/process.c.orig	1996-08-15 03:39:14.000000000 +0000
++++ src/process.c
+@@ -191,7 +191,6 @@ static Lisp_Object stream_process;
+ 
+ #include "syswait.h"
+ 
+-extern int errno;
+ extern char *strerror ();
+ #ifdef VMS
+ extern char *sys_errlist[];
diff --git a/editors/mule/patches/patch-ch b/editors/mule/patches/patch-ch
new file mode 100644
index 00000000000..9d2623e405c
--- /dev/null
+++ b/editors/mule/patches/patch-ch
@@ -0,0 +1,12 @@
+$NetBSD: patch-ch,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/callproc.c.orig	2006-01-04 18:33:30.000000000 +0000
++++ src/callproc.c
+@@ -57,7 +57,6 @@ the Free Software Foundation, 675 Mass A
+ #include <config.h>
+ #include <stdio.h>
+ 
+-extern int errno;
+ extern char *strerror ();
+ 
+ /* Define SIGCHLD as an alias for SIGCLD.  */
diff --git a/editors/mule/patches/patch-ci b/editors/mule/patches/patch-ci
new file mode 100644
index 00000000000..9eae6ea813d
--- /dev/null
+++ b/editors/mule/patches/patch-ci
@@ -0,0 +1,13 @@
+$NetBSD: patch-ci,v 1.1 2006/01/04 20:35:08 joerg Exp $
+
+--- src/xrdb.c.orig	2006-01-04 18:51:03.000000000 +0000
++++ src/xrdb.c
+@@ -665,8 +665,6 @@ fatal (msg, prog, x1, x2, x3, x4, x5)
+     char *msg, *prog;
+     int x1, x2, x3, x4, x5;
+ {
+-    extern int errno;
+-
+     if (errno)
+       perror (prog);
+