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

6 files changed, 52 insertions, 37 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 4e8f4f691fd..818c117f0a6 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/05/31 12:40:58 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2013/10/27 20:41:49 joerg Exp $
 
 DISTNAME=	emacs-20.7
 PKGNAME=	${DISTNAME:S/emacs/emacs20/}
@@ -76,6 +76,14 @@ MAKE_ENV+=	INSTALL_STRIP=${_STRIPFLAG_INSTALL:Q}
 CFLAGS+=	-fno-zero-initialized-in-bss
 .endif
 
+.if !empty(PKGSRC_COMPILER:Mclang)
+TOOL_DEPENDS+=	tradcpp-[0-9]*:../../devel/tradcpp
+MAKEFILECPP=	${PREFIX}/bin/tradcpp
+.else
+MAKEFILECPP=	${CPP} -traditional-cpp
+.endif
+ALL_ENV+=	MAKEFILECPP=${MAKEFILECPP:Q}
+
 INFO_FILES=	yes
 
 INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index 901948958aa..14a4e9a6d12 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2013/07/07 06:29:48 dholland Exp $
+$NetBSD: distinfo,v 1.31 2013/10/27 20:41:49 joerg 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) = afce3627e25f360ca111abf1afcf5702167c2157
+SHA1 (patch-ab) = cf63cb6481eb5862855f066a358821cf57bb6aa1
 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 cd770642068..f52b24bcdc0 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.10 2013/07/07 06:29:48 dholland Exp $
+$NetBSD: patch-ab,v 1.11 2013/10/27 20:41:49 joerg Exp $
 
 Caution: the changes for using a different cpp for munging the
 makefiles (search for MAKEFILECPP) are *not* reflected in the pkgsrc
@@ -60,7 +60,7 @@ with autoconf without thinking.
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -1981,6 +1995,24 @@ else
+@@ -1981,6 +1995,14 @@ else
  fi
  echo "$ac_t""$CPP" 1>&6
  
@@ -70,22 +70,12 @@ with autoconf without thinking.
 +# (note the now-dead version 1.4 of patch-ab for some things to check)
 +# but for pkgsrc purposes the following is currently sufficient.
 +
-+
-+
-+
-+
-+
-+
-+
-+MAKEFILECPP="$CPP -traditional-cpp"
-+
-+
 +echo "$ac_t""$MAKEFILECPP" 1>&6
 +
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
  # incompatible versions:
-@@ -3823,6 +3855,53 @@ else
+@@ -3823,6 +3845,53 @@ else
    echo "$ac_t""no" 1>&6
  fi
  
@@ -139,7 +129,7 @@ with autoconf without thinking.
    LIBS="$OLDLIBS"
  fi
  
-@@ -4906,6 +4985,64 @@ EOF
+@@ -4906,6 +4975,64 @@ EOF
  
  fi
  
@@ -204,7 +194,7 @@ with autoconf without thinking.
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  
-@@ -5211,6 +5350,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+@@ -5211,6 +5338,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g
@@ -212,7 +202,7 @@ with autoconf without thinking.
  s%@ALLOCA@%$ALLOCA%g
  s%@version@%$version%g
  s%@configuration@%$configuration%g
-@@ -5445,6 +5585,7 @@ fi; done
+@@ -5445,6 +5573,7 @@ fi; done
  EOF
  cat >> $CONFIG_STATUS <<EOF
  CPP="$CPP" CPPFLAGS="$CPPFLAGS"
@@ -220,7 +210,7 @@ with autoconf without thinking.
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  
-@@ -5480,7 +5621,7 @@ echo creating lib-src/Makefile
+@@ -5480,7 +5609,7 @@ echo creating lib-src/Makefile
    sed -e '1,/start of cpp stuff/d'\
        -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
        < Makefile.c > junk.c
@@ -229,7 +219,7 @@ with autoconf without thinking.
        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 +5637,7 @@ echo creating src/Makefile
+@@ -5496,7 +5625,7 @@ echo creating src/Makefile
    sed -e '1,/start of cpp stuff/d'\
        -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
        < Makefile.c > junk.c
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