Use tradcpp for clang build, fallback to cpp -traditional otherwise.

3 files changed, 33 insertions, 16 deletions

diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common
index ceabc770b57..7032806985d 100644
--- a/editors/emacs21/Makefile.common
+++ b/editors/emacs21/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2013/04/06 20:27:20 rodent Exp $
+# $NetBSD: Makefile.common,v 1.14 2013/10/27 20:41:49 joerg Exp $
 #
 # used by editors/emacs21/Makefile
 # used by editors/emacs21-nox11/Makefile
@@ -82,6 +82,14 @@ LDFLAGS+=	-Z
 CFLAGS+=	-fno-zero-initialized-in-bss
 .endif
 
+.if !empty(PKGSRC_COMPILER:Mclang)
+TOOL_DEPENDS+=	tradcpp-[0-9]*:../../devel/tradcpp
+TRADCPP=	${PREFIX}/bin/tradcpp
+.else
+TRADCPP=	${CPP} -traditional-cpp
+.endif
+ALL_ENV+=	TRADCPP=${TRADCPP:Q}
+
 INFO_FILES=	yes
 REPLACE_PERL=	lib-src/grep-changelog
 
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index abc8fbc0873..da3304a4680 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2013/07/05 13:43:44 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2013/10/27 20:41:49 joerg 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) = 0c3396736776fc2d267ab5fe24c3a1be05d64849
+SHA1 (patch-ab) = 1e76b438549932fd0c83e11cc3f0e8d15f3b821e
 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
diff --git a/editors/emacs21/patches/patch-ab b/editors/emacs21/patches/patch-ab
index f34fef8e333..cf2cb70a434 100644
--- a/editors/emacs21/patches/patch-ab
+++ b/editors/emacs21/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2013/07/05 13:43:44 ryoon Exp $
+$NetBSD: patch-ab,v 1.5 2013/10/27 20:41:49 joerg Exp $
 
 Caution: the extra cpp checking (the three hunks containing "Should be
 one line") is manually hacked and not reflected in configure.in; do
@@ -11,7 +11,7 @@ started doing regrettable things with backslash-escaped newlines.
 
 --- configure.orig	2003-03-18 14:19:12.000000000 +0000
 +++ configure
-@@ -822,9 +822,17 @@ case "${canonical}" in
+@@ -822,9 +824,17 @@ case "${canonical}" in
        sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
        arm-*-netbsd*)	machine=arm ;;
@@ -29,7 +29,7 @@ started doing regrettable things with backslash-escaped newlines.
    ## OpenBSD ports
    *-*-openbsd* )
      opsys=openbsd
-@@ -909,6 +917,10 @@ case "${canonical}" in
+@@ -909,6 +919,10 @@ case "${canonical}" in
      machine=macppc opsys=gnu-linux
    ;;
  
@@ -40,7 +40,7 @@ started doing regrettable things with backslash-escaped newlines.
    ## Altos 3068
    m68*-altos-sysv* )
      machine=altos opsys=usg5-2
-@@ -1659,6 +1671,7 @@ case "${canonical}" in
+@@ -1659,6 +1673,7 @@ case "${canonical}" in
        *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )	        opsys=386bsd ;;
        *-freebsd* )	        opsys=freebsd ;;
@@ -48,7 +48,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
-@@ -2052,15 +2065,20 @@ else
+@@ -2052,15 +2067,20 @@ else
    CPP="${CC-cc} -E"
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
@@ -71,7 +71,7 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -2068,16 +2086,19 @@ else
+@@ -2068,16 +2088,19 @@ else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -94,7 +94,7 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -2091,10 +2112,13 @@ else
+@@ -2091,10 +2114,13 @@ else
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
@@ -110,7 +110,16 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -5583,24 +5607,24 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2416,7 +2442,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
    echo "$ac_t""yes" 1>&6
    # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
  # Earlier versions can crash Emacs.
@@ -141,7 +150,7 @@ started doing regrettable things with backslash-escaped newlines.
  ; 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 +9148,22 @@ EOF
+@@ -9124,6 +9160,22 @@ EOF
  fi
  
  
@@ -164,21 +173,21 @@ started doing regrettable things with backslash-escaped newlines.
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  CPPFLAGS="$REAL_CPPFLAGS"
-@@ -9735,7 +9777,7 @@ echo creating lib-src/Makefile
+@@ -9735,7 +9793,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 | \
++  $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 +9793,7 @@ echo creating src/Makefile
+@@ -9751,7 +9809,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 | \
++  $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