[pkgsrc/trunk]: pkgsrc/editors/mule Make this compile on DragonFly in the hop...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2eb7010cf5cb
branches:  trunk
changeset: 505560:2eb7010cf5cb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 04 20:35:08 2006 +0000

description:
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.

diffstat:

 editors/mule/Makefile         |   8 ++-
 editors/mule/PLIST            |  36 ++++++++++----------
 editors/mule/distinfo         |  28 ++++++++++++----
 editors/mule/patches/patch-ad |  12 +++++-
 editors/mule/patches/patch-ah |  21 +++++++++--
 editors/mule/patches/patch-ai |  13 ++++++-
 editors/mule/patches/patch-ak |  13 ++++++-
 editors/mule/patches/patch-al |   8 +++-
 editors/mule/patches/patch-bf |   9 ++--
 editors/mule/patches/patch-bv |  13 +++++++
 editors/mule/patches/patch-bw |  28 ++++++++++++++++
 editors/mule/patches/patch-bx |  13 +++++++
 editors/mule/patches/patch-by |  12 +++++++
 editors/mule/patches/patch-bz |  12 +++++++
 editors/mule/patches/patch-ca |  72 +++++++++++++++++++++++++++++++++++++++++++
 editors/mule/patches/patch-cb |  12 +++++++
 editors/mule/patches/patch-cc |  24 ++++++++++++++
 editors/mule/patches/patch-cd |  13 +++++++
 editors/mule/patches/patch-ce |  13 +++++++
 editors/mule/patches/patch-cf |  13 +++++++
 editors/mule/patches/patch-cg |  12 +++++++
 editors/mule/patches/patch-ch |  12 +++++++
 editors/mule/patches/patch-ci |  13 +++++++
 23 files changed, 365 insertions(+), 45 deletions(-)

diffs (truncated from 614 to 300 lines):

diff -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/Makefile
--- a/editors/mule/Makefile     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/Makefile     Wed Jan 04 20:35:08 2006 +0000
@@ -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 @@
 
 .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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/PLIST
--- a/editors/mule/PLIST        Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/PLIST        Wed Jan 04 20:35:08 2006 +0000
@@ -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/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 @@
 @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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/distinfo
--- a/editors/mule/distinfo     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/distinfo     Wed Jan 04 20:35:08 2006 +0000
@@ -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 @@
 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-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-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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/patches/patch-ad
--- a/editors/mule/patches/patch-ad     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/patches/patch-ad     Wed Jan 04 20:35:08 2006 +0000
@@ -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 @@
        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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/patches/patch-ah
--- a/editors/mule/patches/patch-ah     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/patches/patch-ah     Wed Jan 04 20:35:08 2006 +0000
@@ -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 @@
  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 @@
  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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/patches/patch-ai
--- a/editors/mule/patches/patch-ai     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/patches/patch-ai     Wed Jan 04 20:35:08 2006 +0000
@@ -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 @@
  
  #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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/patches/patch-ak
--- a/editors/mule/patches/patch-ak     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/patches/patch-ak     Wed Jan 04 20:35:08 2006 +0000
@@ -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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/patches/patch-al
--- a/editors/mule/patches/patch-al     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/patches/patch-al     Wed Jan 04 20:35:08 2006 +0000
@@ -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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/patches/patch-bf
--- a/editors/mule/patches/patch-bf     Wed Jan 04 20:30:53 2006 +0000
+++ b/editors/mule/patches/patch-bf     Wed Jan 04 20:35:08 2006 +0000
@@ -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 @@
  /* 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 -r 6d51a8faa2be -r 2eb7010cf5cb editors/mule/patches/patch-bv
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/mule/patches/patch-bv     Wed Jan 04 20:35:08 2006 +0000
@@ -0,0 +1,13 @@