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

3 files changed, 19 insertions, 21 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