Assert MAINTAINER privilege to revert version 1.6 of patch-ab (and

version 1.7, which is its associated patch comment) on the grounds
that it's wrong.

2 files changed, 15 insertions, 40 deletions

diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index 998ee734a8a..2183135e127 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2013/07/05 13:47:02 ryoon Exp $
+$NetBSD: distinfo,v 1.28 2013/07/07 05:27:45 dholland Exp $
 
 SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
 RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
@@ -16,7 +16,7 @@ SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
 Size (emacs20-xim-20000713.diff) = 21296 bytes
 SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
-SHA1 (patch-ab) = 64ab9316db91b429234ec651e8574aedd2f92ca9
+SHA1 (patch-ab) = ef808bd29242e1a2471103d9b66cbec56a0368b9
 SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
diff --git a/editors/emacs20/patches/patch-ab b/editors/emacs20/patches/patch-ab
index d62c06aef9d..e9ecf6208dd 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2013/07/05 13:47:02 ryoon Exp $
+$NetBSD: patch-ab,v 1.8 2013/07/07 05:27:45 dholland Exp $
 
 Caution: the extra cpp checking (the three hunks containing "Should be
 one line") is manually hacked and not reflected in configure.in; do
@@ -6,9 +6,6 @@ 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	2000-06-12 20:05:56.000000000 +0000
 +++ configure
 @@ -20,6 +20,8 @@ ac_help="$ac_help
@@ -64,7 +61,7 @@ started doing regrettable things with backslash-escaped newlines.
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -1916,15 +1930,20 @@ else
+@@ -1916,15 +1930,21 @@ else
    CPP="${CC-cc} -E"
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
@@ -75,7 +72,8 @@ started doing regrettable things with backslash-escaped newlines.
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
-+Should be one line.
++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"
@@ -87,18 +85,12 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -1932,16 +1951,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 1938 "configure"
+@@ -1938,10 +1958,14 @@ else
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
-+Should be one line.
++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"
@@ -110,11 +102,12 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -1955,10 +1977,13 @@ else
+@@ -1955,10 +1979,14 @@ else
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
-+Should be one line.
++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"
@@ -126,7 +119,7 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -3823,6 +3848,53 @@ else
+@@ -3823,6 +3851,53 @@ else
    echo "$ac_t""no" 1>&6
  fi
  
@@ -180,7 +173,7 @@ started doing regrettable things with backslash-escaped newlines.
    LIBS="$OLDLIBS"
  fi
  
-@@ -4906,6 +4978,64 @@ EOF
+@@ -4906,6 +4981,64 @@ EOF
  
  fi
  
@@ -245,7 +238,7 @@ started doing regrettable things with backslash-escaped newlines.
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  
-@@ -5211,6 +5345,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+@@ -5211,6 +5344,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g
@@ -253,21 +246,3 @@ started doing regrettable things with backslash-escaped newlines.
  s%@ALLOCA@%$ALLOCA%g
  s%@version@%$version%g
  s%@configuration@%$configuration%g
-@@ -5480,7 +5615,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 | \
-+  $CPP -traditional-cpp $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
-@@ -5496,7 +5631,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 | \
-+  $CPP -traditional-cpp $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