Use the new tradcpp's -debuglog feature to generate a trace from

processing the imake templates; leave the trace in
${WRKSRC}/.imake.cpplog.

These traces are a bit on the large side (a bit over 1M) but they will
make it a lot easier to diagnose imake problems.

If you don't like your favorite package taking more disk space to
build, teach it to not use imake :-)

Depend on tradcpp>=0.5.2; PKGREVISION -> 2.

3 files changed, 29 insertions, 16 deletions

diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index 5d5e360532b..a4d9df5b6fb 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2016/09/04 18:44:06 dholland Exp $
+# $NetBSD: Makefile,v 1.23 2016/09/04 21:33:53 dholland Exp $
 
 DISTNAME=		imake-1.0.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +13,7 @@ COMMENT=		Imake and other utilities from modular X.org
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config makedepend:run
 
-DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+DEPENDS+=		tradcpp>=0.5.2:../../devel/tradcpp
 DEPENDS+=		xorg-cf-files>=1.0.3:../../x11/xorg-cf-files
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
index a7ac08db41d..ad5a520d392 100644
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2016/09/04 18:44:06 dholland Exp $
+$NetBSD: distinfo,v 1.14 2016/09/04 21:33:53 dholland Exp $
 
 SHA1 (imake-1.0.7.tar.bz2) = 52e236776133f217d438622034b8603d201a6ec5
 RMD160 (imake-1.0.7.tar.bz2) = 7a8d7b830463c1c429a8ad8349324e607ea255fb
 SHA512 (imake-1.0.7.tar.bz2) = b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
 Size (imake-1.0.7.tar.bz2) = 156543 bytes
-SHA1 (patch-imake.c) = 7f8511f147d90cede0b5dfcb8dda3d7542891ae0
+SHA1 (patch-imake.c) = b5a2b60288de82aab7db0ef6ab218c42490bc10f
 SHA1 (patch-imakemdep.h) = a8aa1adff501da7eb22d695ff93f0517ce146269
diff --git a/devel/imake/patches/patch-imake.c b/devel/imake/patches/patch-imake.c
index 3bdb4f88222..ba9a4e23012 100644
--- a/devel/imake/patches/patch-imake.c
+++ b/devel/imake/patches/patch-imake.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-imake.c,v 1.6 2016/09/04 18:44:06 dholland Exp $
+$NetBSD: patch-imake.c,v 1.7 2016/09/04 21:33:53 dholland Exp $
 
 Beat some sense in.
 
@@ -6,20 +6,22 @@ Beat some sense in.
      (hunks 1-2)
 
    - Do not delete any of the temporary files, to allow analysis after
-     build failure. (hunks 3-4, first part of 8)
+     build failure. (hunks 3-4, first part of 9)
 
-   - Log the command lines executed. (hunk 5)
+   - Log the command lines executed. (hunk 6)
 
    - Warn if scrubbing the Imakefile to alert the user to check if that
-     broke it (second part of hunk 8)
+     broke it (second part of hunk 9)
 
 Also,
 
-   - Force use of just "gcc" for pkgsrc, so as to not bypass the
-     wrappers (hunk 7)
+   - Use tradcpp's -debuglog feature to trace what happens in the
+     templates (hunk 5)
 
-   - Force ELF for freebsd versions >= 6 (hunk 6)
+   - Force ELF for freebsd versions >= 6 (hunk 7)
 
+   - Force use of just "gcc" for pkgsrc, so as to not bypass the
+     wrappers (hunk 8)
 
 --- imake.c.orig	2013-08-17 10:11:50.000000000 +0000
 +++ imake.c
@@ -69,7 +71,18 @@ Also,
  }
  
  #ifdef SIGNALRETURNSINT
-@@ -773,6 +776,13 @@ doit(FILE *outfd, const char *cmd, const
+@@ -488,6 +491,10 @@ init(void)
+ 	while (cpp_argv[ cpp_argindex ] != NULL)
+ 		cpp_argindex++;
+ 
++	/* pkgsrc: generate a debug trace of reading the templates */
++	AddCppArg("-debuglog");
++	AddCppArg(".imake.cpplog");
++
+ #if defined CROSSCOMPILE
+ 	if (sys == netBSD)
+ 	  if (CrossCompiling) {
+@@ -773,6 +780,13 @@ doit(FILE *outfd, const char *cmd, const
  {
  	int		pid;
  	waitType	status;
@@ -83,7 +96,7 @@ Also,
  
  	/*
  	 * Fork and exec the command.
-@@ -1158,7 +1168,9 @@ get_binary_format(FILE *inFile)
+@@ -1158,7 +1172,9 @@ get_binary_format(FILE *inFile)
    } else
        strcpy (cmd, "objformat");
  
@@ -94,7 +107,7 @@ Also,
        (objprog = popen(cmd, "r")) != NULL &&
        fgets(buf, sizeof(buf), objprog) != NULL &&
        strncmp(buf, "elf", 3) == 0)
-@@ -1337,54 +1349,8 @@ get_gcc_version(FILE *inFile, char *name
+@@ -1337,54 +1353,8 @@ get_gcc_version(FILE *inFile, char *name
  static boolean
  get_gcc(char *cmd)
  {
@@ -151,7 +164,7 @@ Also,
  }
  
  #ifdef CROSSCOMPILE
-@@ -1795,12 +1761,15 @@ CleanCppInput(const char *imakefile)
+@@ -1795,12 +1765,15 @@ CleanCppInput(const char *imakefile)
  			    outFile = fdopen(fd, "w");
  			if (outFile == NULL) {
  			    if (fd != -1) {