Now revert version 1.4 of patch-ab, which introduced extra configure

tests to work around problems with gcc 4.5's cpp when used on
makefiles.

2 files changed, 6 insertions, 70 deletions

diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index 2183135e127..ab5dc022d5e 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2013/07/07 05:27:45 dholland Exp $
+$NetBSD: distinfo,v 1.29 2013/07/07 05:30:13 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) = ef808bd29242e1a2471103d9b66cbec56a0368b9
+SHA1 (patch-ab) = a43192a506df129784153008f8bd08b4c0559fa1
 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 e9ecf6208dd..8a51a17b118 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,10 +1,4 @@
-$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
-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.
+$NetBSD: patch-ab,v 1.9 2013/07/07 05:30:13 dholland Exp $
 
 --- configure.orig	2000-06-12 20:05:56.000000000 +0000
 +++ configure
@@ -61,65 +55,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,21 @@ 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 1921 "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:1927: \"$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
-@@ -1938,10 +1958,14 @@ 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:1944: \"$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
-@@ -1955,10 +1979,14 @@ 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:1961: \"$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
-@@ -3823,6 +3851,53 @@ else
+@@ -3823,6 +3837,53 @@ else
    echo "$ac_t""no" 1>&6
  fi
  
@@ -173,7 +109,7 @@ started doing regrettable things with backslash-escaped newlines.
    LIBS="$OLDLIBS"
  fi
  
-@@ -4906,6 +4981,64 @@ EOF
+@@ -4906,6 +4967,64 @@ EOF
  
  fi
  
@@ -238,7 +174,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 +5344,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+@@ -5211,6 +5330,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g