CVS commit: pkgsrc/devel/imake

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Oct 21 08:51:19 UTC 2022

Modified Files:
        pkgsrc/devel/imake: Makefile distinfo
        pkgsrc/devel/imake/patches: patch-imake.c

Log Message:
imake: update to 1.0.9.

Alan Coopersmith (11):
      Build xz tarballs instead of bzip2
      gitlab CI: add a basic build test
      Fix spelling/wording issues
      Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters
      Fix -Wsign-compare warnings
      Fix -Wshadow warnings
      Make Emalloc() argument a size_t to match malloc()
      Simplify HAVE_MKSTEMP block
      unifdef SIGNALRETURNSINT
      Add .git-blame-ignore-revs to hide whitespace commits from git blame
      imake 1.0.9

Emil Velikov (1):
      autogen.sh: use quoted string variables

Peter Hutterer (1):
      autogen.sh: use exec instead of waiting for configure to finish


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/imake/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/imake/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/imake/patches/patch-imake.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/imake/Makefile
diff -u pkgsrc/devel/imake/Makefile:1.28 pkgsrc/devel/imake/Makefile:1.29
--- pkgsrc/devel/imake/Makefile:1.28    Sat Apr 25 17:21:38 2020
+++ pkgsrc/devel/imake/Makefile Fri Oct 21 08:51:19 2022
@@ -1,13 +1,13 @@
-# $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
-CATEGORIES=            x11 devel
+DISTNAME=              imake-1.0.9
+CATEGORIES=            devel x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=util/}
-EXTRACT_SUFX=          .tar.bz2
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            joerg%NetBSD.org@localhost
 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

Index: pkgsrc/devel/imake/distinfo
diff -u pkgsrc/devel/imake/distinfo:1.18 pkgsrc/devel/imake/distinfo:1.19
--- pkgsrc/devel/imake/distinfo:1.18    Tue Oct 26 10:15:05 2021
+++ pkgsrc/devel/imake/distinfo Fri Oct 21 08:51:19 2022
@@ -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
-SHA512 (imake-1.0.8.tar.bz2) = 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-Size (imake-1.0.8.tar.bz2) = 159398 bytes
-SHA1 (patch-imake.c) = b5a2b60288de82aab7db0ef6ab218c42490bc10f
+BLAKE2s (imake-1.0.9.tar.xz) = 72525a0d45881d9113978c2099dbfa3d561a4c5963e43043052c199291e9ee30
+SHA512 (imake-1.0.9.tar.xz) = e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
+Size (imake-1.0.9.tar.xz) = 153332 bytes
+SHA1 (patch-imake.c) = d184f054ef71e37135e5dfdd990332ce996bcd0a
 SHA1 (patch-imakemdep.h) = 12b05670954812197d18008c0209112e77d79826

Index: pkgsrc/devel/imake/patches/patch-imake.c
diff -u pkgsrc/devel/imake/patches/patch-imake.c:1.7 pkgsrc/devel/imake/patches/patch-imake.c:1.8
--- pkgsrc/devel/imake/patches/patch-imake.c:1.7        Sun Sep  4 21:33:53 2016
+++ pkgsrc/devel/imake/patches/patch-imake.c    Fri Oct 21 08:51:19 2022
@@ -1,4 +1,4 @@
-$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.
 
@@ -23,7 +23,7 @@ Also,
    - 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;
@@ -46,8 +46,8 @@ Also,
  boolean haveImakefileC = FALSE;
  const char    *cleanedImakefile = NULL;
  const char    *program;
-@@ -412,7 +412,8 @@ main(int argc, char *argv[])
-               fd = mkstemp(tmpMakefileName);
+@@ -407,7 +407,8 @@ main(int argc, char *argv[])
+ 
                if (fd == -1 || (tmpfd = fdopen(fd, "w+")) == NULL) {
                   if (fd != -1) {
 -                    unlink(tmpMakefileName); close(fd);
@@ -56,7 +56,7 @@ Also,
                   }
                   LogFatal("Cannot create temporary file %s.", tmpMakefileName);
                }
-@@ -454,12 +455,14 @@ showit(FILE *fd)
+@@ -449,12 +450,14 @@ showit(FILE *fd)
  void
  wrapup(void)
  {
@@ -70,8 +70,8 @@ Also,
 +#endif
  }
  
- #ifdef SIGNALRETURNSINT
-@@ -488,6 +491,10 @@ init(void)
+ void
+@@ -479,6 +482,10 @@ init(void)
        while (cpp_argv[ cpp_argindex ] != NULL)
                cpp_argindex++;
  
@@ -82,7 +82,7 @@ Also,
  #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;
@@ -96,7 +96,7 @@ Also,
  
        /*
         * 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");
  
@@ -107,7 +107,7 @@ Also,
        (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)
  {
@@ -137,7 +137,7 @@ Also,
 -    };
 -
 -    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, "/");
@@ -150,7 +150,7 @@ Also,
 -    } 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]);
@@ -159,12 +159,12 @@ Also,
 -      }
 -      }
 -    return FALSE;
-+      strcpy(cmd, "gcc");
-+      return TRUE;
++    strcpy(cmd, "gcc");
++    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) {