[pkgsrc/trunk]: pkgsrc/editors/emacs20 Add DragonFly support. Fix errno. Remo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7066a031c204
branches:  trunk
changeset: 505542:7066a031c204
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 04 17:00:32 2006 +0000

description:
Add DragonFly support. Fix errno. Remove patch-ac, it gets
overriden by the GNU_CONFIGURE magic anyway.

diffstat:

 editors/emacs20/Makefile         |     7 +-
 editors/emacs20/distinfo         |    24 +-
 editors/emacs20/patches/patch-ab |  1451 +-------------------------------------
 editors/emacs20/patches/patch-ac |    21 -
 editors/emacs20/patches/patch-ah |    19 +-
 editors/emacs20/patches/patch-ai |    19 +-
 editors/emacs20/patches/patch-aj |    24 +-
 editors/emacs20/patches/patch-an |    11 +-
 editors/emacs20/patches/patch-ao |   107 ++
 editors/emacs20/patches/patch-ap |    12 +
 editors/emacs20/patches/patch-aq |    12 +
 editors/emacs20/patches/patch-ar |    16 +
 editors/emacs20/patches/patch-as |    13 +
 editors/emacs20/patches/patch-at |    13 +
 editors/emacs20/patches/patch-au |    13 +
 editors/emacs20/patches/patch-bq |    12 +-
 editors/emacs20/patches/patch-bz |    17 +-
 17 files changed, 293 insertions(+), 1498 deletions(-)

diffs (truncated from 2018 to 300 lines):

diff -r 1a9159dd29e4 -r 7066a031c204 editors/emacs20/Makefile
--- a/editors/emacs20/Makefile  Wed Jan 04 16:58:58 2006 +0000
+++ b/editors/emacs20/Makefile  Wed Jan 04 17:00:32 2006 +0000
@@ -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 @@
 .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 -r 1a9159dd29e4 -r 7066a031c204 editors/emacs20/distinfo
--- a/editors/emacs20/distinfo  Wed Jan 04 16:58:58 2006 +0000
+++ b/editors/emacs20/distinfo  Wed Jan 04 17:00:32 2006 +0000
@@ -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 @@
 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-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-bw) = 5de9f12d129b2f13a1d9c1702c7a889cd6b922f4
 SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
 SHA1 (patch-by) = a383206a32e902c448a1b529cf1eefc485f5beab
-SHA1 (patch-bz) = ef28314afc69c37da92ec208252e477bbb522458
+SHA1 (patch-bz) = c395a2acb2aa1e2c1582f6bb46a32bcfa4661b85
 SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
diff -r 1a9159dd29e4 -r 7066a031c204 editors/emacs20/patches/patch-ab
--- a/editors/emacs20/patches/patch-ab  Wed Jan 04 16:58:58 2006 +0000
+++ b/editors/emacs20/patches/patch-ab  Wed Jan 04 17:00:32 2006 +0000
@@ -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 @@
    --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 @@
  
  #### 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 @@
      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 @@
- 
-