 @@ -1,123 +1,123 @@
-$NetBSD: patch-imake.c,v 1.7 2016/09/04 21:33:53 dholland Exp $
+$NetBSD: patch-imake.c,v 1.8 2022/10/21 08:51:19 wiz Exp $
 Beat some sense in.
    - Generate all files into the current (build) directory, not /tmp.
      (hunks 1-2)
    - Do not delete any of the temporary files, to allow analysis after
      build failure. (hunks 3-4, first part of 9)
    - 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 9)
 Also,
    - Use tradcpp's -debuglog feature to trace what happens in the
      templates (hunk 5)
    - 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.orig	2022-10-19 17:33:50.000000000 +0000
 +++ imake.c
 @@ -303,9 +303,9 @@ void KludgeOutputLine(char **), KludgeRe
  const char *cpp = NULL;
  const char	*tmpMakefile;
 -const char	*tmpMakefileTemplate = "/tmp/Imf.XXXXXX";
 +const char	*tmpMakefileTemplate = ".imake.Makefile.XXXXXX";
  const char	*tmpImakefile;
 -const char	*tmpImakefileTemplate = "/tmp/IIf.XXXXXX";
 +const char	*tmpImakefileTemplate = ".imake.Imakefile.XXXXXX";
  const char	*make_argv[ ARGUMENTS ] = {
  #ifdef WIN32
      "nmake"
 @@ -319,7 +319,7 @@ int	cpp_argindex;
  const char	*Imakefile = NULL;
  const char	*Makefile = "Makefile";
  const char	*Template = "Imake.tmpl";
 -const char	*ImakefileC = "Imakefile.c";
 +const char	*ImakefileC = ".imake.start.c";
  boolean haveImakefileC = FALSE;
  const char	*cleanedImakefile = NULL;
  const char	*program;
-@@ -412,7 +412,8 @@ main(int argc, char *argv[])
+@@ -407,7 +407,8 @@ main(int argc, char *argv[])
  		fd = mkstemp(tmpMakefileName);
  		if (fd == -1 || (tmpfd = fdopen(fd, "w+")) == NULL) {
  		   if (fd != -1) {
 -		      unlink(tmpMakefileName); close(fd);
 +		      /*unlink(tmpMakefileName);*/
 +		      close(fd);
+ 		   }
  		   LogFatal("Cannot create temporary file %s.", tmpMakefileName);
+ 		}
-@@ -454,12 +455,14 @@ showit(FILE *fd)
+@@ -449,12 +450,14 @@ showit(FILE *fd)
  void
  wrapup(void)
+ {
 +#if 0
  	if (tmpMakefile != Makefile)
  		unlink(tmpMakefile);
  	if (cleanedImakefile && cleanedImakefile != Imakefile)
  		unlink(cleanedImakefile);
  	if (haveImakefileC)
  		unlink(ImakefileC);
 +#endif
+ }
- #ifdef SIGNALRETURNSINT
+ void
-@@ -488,6 +491,10 @@ init(void)
+@@ -479,6 +482,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
+@@ -764,6 +771,13 @@ doit(FILE *outfd, const char *cmd, const
+ {
  	int		pid;
  	waitType	status;
 +	unsigned i;
++
 +	fprintf(stderr, "imake: executing:");
 +	for (i=0; argv[i]; i++) {
 +	   fprintf(stderr, " %s", argv[i]);
 +	}
 +	fprintf(stderr, "\n");
  	/*
  	 * Fork and exec the command.
-@@ -1158,7 +1172,9 @@ get_binary_format(FILE *inFile)
+@@ -1149,7 +1163,9 @@ get_binary_format(FILE *inFile)
    } else
        strcpy (cmd, "objformat");
 -  if (osrel >= 300004 &&
 +  if (osrel >= 600000)
 +    iself = 1;
 +  else if (osrel >= 300004 &&
        (objprog = popen(cmd, "r")) != NULL &&
        fgets(buf, sizeof(buf), objprog) != NULL &&
        strncmp(buf, "elf", 3) == 0)
-@@ -1337,54 +1353,8 @@ get_gcc_version(FILE *inFile, char *name
+@@ -1328,54 +1344,8 @@ get_gcc_version(FILE *inFile, char *name
  static boolean
  get_gcc(char *cmd)
+ {
 -  struct stat sb;
 -    static const char* gcc_path[] = {
 -#if defined(linux) || \
 -     defined(__NetBSD__) || \
 -     defined(__OpenBSD__) || \
 -     defined(__FreeBSD__) || \
 -     defined(__DragonFly__) || \
 -     defined(__APPLE__) || \
 -     defined(__CYGWIN__) || \
 -     defined(__MINGW32__) || \
 @@ -127,54 +127,54 @@ Also,
 -#endif
 -	"/usr/local/bin/gcc",
 -	"/opt/gnu/bin/gcc",
 -	"/usr/pkg/bin/gcc"
 -    };
+-
 -#ifdef CROSSCOMPILE
 -    static const char* cross_cc_name[] = {
 -	"cc",
 -	"gcc"
 -    };
+-
 -    if (CrossCompiling) {
--	int i;
+-	unsigned int i;
 -	for (i = 0; i < sizeof (cross_cc_name) / sizeof cross_cc_name[0]; i++){
 -	    strcpy (cmd, CrossCompileDir);
 -	    strcat (cmd, "/");
 -	    strcat (cmd, cross_cc_name[i]);
 -	    if (lstat (cmd, &sb) == 0) {
 -		return TRUE;
 -		break;
 -	    }
 -	}
 -    } else
 -#endif
 -      {
--	int i;
+-	unsigned int i;
 -	for (i = 0; i < sizeof (gcc_path) / sizeof gcc_path[0]; i++) {
 -	    if (lstat (gcc_path[i], &sb) == 0) {
 -		strcpy (cmd, gcc_path[i]);
 -		return TRUE;
 -	    }
 -	}
 -      }
 -    return FALSE;
-+	strcpy(cmd, "gcc");
++    strcpy(cmd, "gcc");
-+	return TRUE;
++    return TRUE;
+ }
  #ifdef CROSSCOMPILE
-@@ -1795,12 +1765,15 @@ CleanCppInput(const char *imakefile)
+@@ -1786,12 +1756,15 @@ CleanCppInput(const char *imakefile)
  			    outFile = fdopen(fd, "w");
  			if (outFile == NULL) {
  			    if (fd != -1) {
 -			       unlink(tmpImakefileName); close(fd);
 +			       /*unlink(tmpImakefileName);*/
 +			       close(fd);
+ 			    }
  			    LogFatal("Cannot open %s for write.",
  				tmpImakefileName);
+ 			}
  #endif
 +			fprintf(stderr, "%s: Warning: cleaning Imakefile\n",
 +				program);

 @@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.28 2020/04/25 17:21:38 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2022/10/21 08:51:19 wiz Exp $
-DISTNAME=		imake-1.0.8
+DISTNAME=		imake-1.0.9
-CATEGORIES=		x11 devel
+CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tar.xz
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		https://xorg.freedesktop.org/
-COMMENT=		Imake and other utilities from modular X.org
+COMMENT=		Obsolete build tool for X software
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config makedepend:run
 DEPENDS+=		tradcpp>=0.5.2:../../devel/tradcpp
 DEPENDS+=		xorg-cf-files>=1.0.3:../../x11/xorg-cf-files
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 CONFIGURE_ENV+=		HAS_PERL=no
 CONFIGURE_ENV+=		RAWCPP=${PREFIX}/bin/tradcpp
 CPPFLAGS+=		-DRAWCPP=\"${PREFIX}/bin/tradcpp\"
 REPLACE_SH+=		mkhtmlindex.sh

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 10:15:05 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/10/21 08:51:19 wiz Exp $
-BLAKE2s (imake-1.0.8.tar.bz2) = cff8f90f36dcee25a93fab3a43a85d1b0ba16f340a828113d8a3b17ddfafd714
+BLAKE2s (imake-1.0.9.tar.xz) = 72525a0d45881d9113978c2099dbfa3d561a4c5963e43043052c199291e9ee30
-SHA512 (imake-1.0.8.tar.bz2) = 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
+SHA512 (imake-1.0.9.tar.xz) = e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
-Size (imake-1.0.8.tar.bz2) = 159398 bytes
+Size (imake-1.0.9.tar.xz) = 153332 bytes
-SHA1 (patch-imake.c) = b5a2b60288de82aab7db0ef6ab218c42490bc10f
+SHA1 (patch-imake.c) = d184f054ef71e37135e5dfdd990332ce996bcd0a
 SHA1 (patch-imakemdep.h) = 12b05670954812197d18008c0209112e77d79826