 @@ -1,135 +1,137 @@
-$NetBSD: patch-ab,v 1.5 2013/10/27 20:41:49 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2015/01/06 17:45:46 wiz Exp $
 Caution: the extra cpp checking (the three hunks containing "Should be
 one line") is manually hacked and not reflected in configure.in; do
 not regenerate configure with autoconf without merging it. This
 checking is required because somewhere between gcc 4.1 and 4.5 cpp
 started doing regrettable things with backslash-escaped newlines.
 * Fix build on NetBSD 6.99.23, gcc -E -traditional-cpp with native X
   results syntax error. Use -traditional-cpp for Makefile generation only.
---- configure.orig	2003-03-18 14:19:12.000000000 +0000
+--- configure.orig	2003-03-18 09:19:12.000000000 -0500
-+++ configure
++++ configure	2015-01-05 04:09:09.000000000 -0500
-@@ -822,9 +824,17 @@ case "${canonical}" in
+@@ -821,10 +821,18 @@ case "${canonical}" in
        powerpc-*-netbsd*) machine=macppc ;;
        sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
-       arm-*-netbsd*)	machine=arm ;;
+-      arm-*-netbsd*)	machine=arm ;;
 +      arm*-*-netbsd*)	machine=arm ;;
 +      x86_64-*-netbsd*)	machine=amd64 ;;
 +      hppa-*-netbsd*)	machine=hp800 ;;
 +      shle-*-netbsd*)	machine=sh3el ;;
      esac
    ;;
 +  ## Darwin / Mac OS X
 +  powerpc-apple-darwin* )
 +    machine=powermac opsys=darwin ;;
 +  i386-apple-darwin* )
 +    machine=intel386 opsys=darwin ;;
    ## OpenBSD ports
    *-*-openbsd* )
      opsys=openbsd
-@@ -909,6 +919,10 @@ case "${canonical}" in
+@@ -909,6 +917,10 @@ case "${canonical}" in
      machine=macppc opsys=gnu-linux
    ;;
 +  x86_64-*-linux* )
 +    machine=amd64 opsys=gnu-linux
 +  ;;
++
    ## Altos 3068
    m68*-altos-sysv* )
      machine=altos opsys=usg5-2
-@@ -1659,6 +1673,7 @@ case "${canonical}" in
+@@ -1659,6 +1671,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
-@@ -2052,15 +2067,20 @@ else
+@@ -2052,15 +2065,20 @@ else
    CPP="${CC-cc} -E"
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
 +  # And, gcc 4.5? and up does not preserve escaped newlines, which is
 +  # fatal for preprocessing makefiles.
    cat > conftest.$ac_ext <<EOF
  #line 2057 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
 +Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
  { (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
 +    grep -L "Should  *be one line" conftest2.out \
 +    `
  if test -z "$ac_err"; then
+   :
  else
-@@ -2068,16 +2088,19 @@ else
+@@ -2068,16 +2086,19 @@ else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
 -  CPP="${CC-cc} -E -traditional-cpp"
 +  CPP="${CC-cc} -E"
    cat > conftest.$ac_ext <<EOF
  #line 2074 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
 +Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
  { (eval echo configure:2080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
 +    grep -L "Should  *be one line" conftest2.out \
 +    `
  if test -z "$ac_err"; then
+   :
  else
-@@ -2091,10 +2114,13 @@ else
+@@ -2091,10 +2112,13 @@ else
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
 +Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
  { (eval echo configure:2097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
 +    grep -L "Should  *be one line" conftest2.out \
 +    `
  if test -z "$ac_err"; then
+   :
  else
-@@ -2416,7 +2442,7 @@ ac_link="$ac_link $ld_switch_machine $ld
+@@ -2416,7 +2440,7 @@ ac_link="$ac_link $ld_switch_machine $ld
  if test x"${OVERRIDE_CPPFLAGS}" != x; then
    CPPFLAGS="${OVERRIDE_CPPFLAGS}"
  else
 -  CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
 +  CPPFLAGS="`echo $c_switch_system $c_switch_machine $CPPFLAGS | sed 's,-L[^ ]*,,g'`"
  fi
-@@ -5583,24 +5619,24 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -5583,24 +5607,24 @@ if eval "test \"`echo '$ac_cv_header_'$a
    echo "$ac_t""yes" 1>&6
    # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
  # Earlier versions can crash Emacs.
 -      echo $ac_n "checking for EGifPutExtensionLast in -lungif""... $ac_c" 1>&6
 -echo "configure:5588: checking for EGifPutExtensionLast in -lungif" >&5
 -ac_lib_var=`echo ungif'_'EGifPutExtensionLast | sed 'y%./+-%__p_%'`
 +      echo $ac_n "checking for EGifPutExtensionTrailer in -lgif""... $ac_c" 1>&6
 +echo "configure:5588: checking for EGifPutExtensionTrailer in -lgif" >&5
 +ac_lib_var=`echo ungif'_'EGifPutExtensionTrailer | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 @@ -140,54 +142,54 @@ started doing regrettable things with ba
  #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
      builtin and then its argument prototype would still apply.  */
 -char EGifPutExtensionLast();
 +char EGifPutExtensionTrailer();
  int main() {
 -EGifPutExtensionLast()
 +EGifPutExtensionTrailer()
  ; return 0; }
  EOF
  if { (eval echo configure:5607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -9124,6 +9160,22 @@ EOF
+@@ -9124,6 +9148,22 @@ EOF
  fi
 +# NETBSD: NetBSD's newer run-time linker fix.
 +if test $opsys = netbsd; then
 +  if test -f /usr/lib/crti.o; then
 +    cat >> confdefs.h <<\EOF
 +#define HAVE_NETBSD_CRTI 1
 +EOF
++
 +  fi
 +  if test -f /usr/lib/crtn.o; then
 +    cat >> confdefs.h <<\EOF
 +#define HAVE_NETBSD_CRTN 1
 +EOF
++
 +  fi
 +fi
++
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  CPPFLAGS="$REAL_CPPFLAGS"
-@@ -9735,7 +9793,7 @@ echo creating lib-src/Makefile
+@@ -9735,7 +9777,7 @@ echo creating lib-src/Makefile
    sed -e '1,/start of cpp stuff/d'\
        -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
        < Makefile.c > junk.c
 -  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 +  $TRADCPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
        sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
    cat junk1.c junk2.c > Makefile.new
    rm -f junk.c junk1.c junk2.c
-@@ -9751,7 +9809,7 @@ echo creating src/Makefile
+@@ -9751,7 +9793,7 @@ echo creating src/Makefile
    sed -e '1,/start of cpp stuff/d'\
        -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
        < Makefile.c > junk.c
 -  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 +  $TRADCPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
        sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
    cat junk1.c junk2.c > Makefile.new
    rm -f junk.c junk1.c junk2.c

 @@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.16 2014/05/23 22:34:41 dholland Exp $
+$NetBSD: distinfo,v 1.17 2015/01/06 17:45:46 wiz 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) = 1e76b438549932fd0c83e11cc3f0e8d15f3b821e
+SHA1 (patch-ab) = 3a435a126d8ef849a9e04f13343207cb8e55c6d7
 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
 SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94
 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
 SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714
 SHA1 (patch-ai) = 20fb931d649a55ae7ee6eb27ec5ba7cc938db0f7
 SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7
 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
 SHA1 (patch-al) = 124356413e49d056d513d905b9e6afda28817be6
 SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91
 SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76
 SHA1 (patch-ao) = 6e57a5a12742a09c2365933f580717ded232cf51