CVS commit: pkgsrc/audio/timidity

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jul 31 20:41:15 UTC 2024

Modified Files:
        pkgsrc/audio/timidity: distinfo
Added Files:
        pkgsrc/audio/timidity/patches: patch-configure

Log Message:
timidity: gcc14 fixes for configure


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/audio/timidity/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/timidity/patches/patch-configure

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

Modified files:

Index: pkgsrc/audio/timidity/distinfo
diff -u pkgsrc/audio/timidity/distinfo:1.22 pkgsrc/audio/timidity/distinfo:1.23
--- pkgsrc/audio/timidity/distinfo:1.22 Tue Oct 26 09:59:33 2021
+++ pkgsrc/audio/timidity/distinfo      Wed Jul 31 20:41:15 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2021/10/26 09:59:33 nia Exp $
+$NetBSD: distinfo,v 1.23 2024/07/31 20:41:15 markd Exp $
 
 BLAKE2s (TiMidity++-2.15.0.tar.xz) = 65ff32e8fd12ff0c768901afeb5e85476502c79759a484e32689b186e7c40186
 SHA512 (TiMidity++-2.15.0.tar.xz) = 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
 Size (TiMidity++-2.15.0.tar.xz) = 1363040 bytes
+SHA1 (patch-configure) = c5d0144604563e0bd5dd2a394779b977879b46dc
 SHA1 (patch-timidity_sun__a.c) = f9bb6c92a9eca27bdaa262395fe358efc5e9b600

Added files:

Index: pkgsrc/audio/timidity/patches/patch-configure
diff -u /dev/null pkgsrc/audio/timidity/patches/patch-configure:1.1
--- /dev/null   Wed Jul 31 20:41:15 2024
+++ pkgsrc/audio/timidity/patches/patch-configure       Wed Jul 31 20:41:15 2024
@@ -0,0 +1,196 @@
+$NetBSD: patch-configure,v 1.1 2024/07/31 20:41:15 markd Exp $
+
+gcc14 fixes
+
+--- configure.orig     2018-08-28 23:33:39.000000000 +0000
++++ configure
+@@ -6893,8 +6893,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+       || toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -7750,8 +7750,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+       || toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -9029,6 +9029,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <stdlib>
+ int
+ main ()
+ {
+@@ -10556,7 +10557,7 @@ main ()
+   /* Some versions of memcmp are not 8-bit clean.  */
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
+-    exit (1);
++    return 1;
+ 
+   /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
+      or more and with at least one buffer not starting on a 4-byte boundary.
+@@ -10572,9 +10573,9 @@ main ()
+       strcpy (a, "--------01111111");
+       strcpy (b, "--------10000000");
+       if (memcmp (a, b, 16) >= 0)
+-        exit (1);
++        return 1;
+       }
+-    exit (0);
++    return 0;
+   }
+ 
+   ;
+@@ -12020,7 +12021,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+       va_start (args1, i);
+       va_copy (args2, args1);
+       if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+-        exit (1);
++        return 1;
+       va_end (args1); va_end (args2);
+       }
+       int main() {
+@@ -12081,7 +12082,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+       va_start (args1, i);
+       __va_copy (args2, args1);
+       if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+-        exit (1);
++        return 1;
+       va_end (args1); va_end (args2);
+       }
+       int main() {
+@@ -12157,7 +12158,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+       va_start (args1, i);
+       args2 = args1;
+       if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+-        exit (1);
++        return 1;
+       va_end (args1); va_end (args2);
+       }
+       int main() {
+@@ -13028,14 +13029,14 @@ main ()
+ #endif
+ 
+ #  if(SND_LIB_MAJOR > $alsa_min_major_version)
+-  exit(0);
++  return 0;
+ #  else
+ #    if(SND_LIB_MAJOR < $alsa_min_major_version)
+ #       error not present
+ #    endif
+ 
+ #   if(SND_LIB_MINOR > $alsa_min_minor_version)
+-  exit(0);
++  return 0;
+ #   else
+ #     if(SND_LIB_MINOR < $alsa_min_minor_version)
+ #          error not present
+@@ -13046,7 +13047,7 @@ main ()
+ #      endif
+ #    endif
+ #  endif
+-exit(0);
++return 0;
+ 
+   ;
+   return 0;
+@@ -13105,14 +13106,14 @@ main ()
+ #endif
+ 
+ #  if(SND_LIB_MAJOR > $alsa_min_major_version)
+-  exit(0);
++  return 0;
+ #  else
+ #    if(SND_LIB_MAJOR < $alsa_min_major_version)
+ #       error not present
+ #    endif
+ 
+ #   if(SND_LIB_MINOR > $alsa_min_minor_version)
+-  exit(0);
++  return 0;
+ #   else
+ #     if(SND_LIB_MINOR < $alsa_min_minor_version)
+ #          error not present
+@@ -13123,7 +13124,7 @@ main ()
+ #      endif
+ #    endif
+ #  endif
+-exit(0);
++return 0;
+ 
+   ;
+   return 0;
+@@ -16618,6 +16619,7 @@ EOM
+ 
+ cat > fred.c <<EOM
+ #include <stdio.h>
++#include <stdlib.h>
+ #$i_dlfcn I_DLFCN
+ #ifdef I_DLFCN
+ #include <dlfcn.h>      /* the dynamic linker include file for Sunos/Solaris */
+@@ -19594,14 +19596,14 @@ main ()
+ #endif
+ 
+ #  if(SND_LIB_MAJOR > $alsa_min_major_version)
+-  exit(0);
++  return 0;
+ #  else
+ #    if(SND_LIB_MAJOR < $alsa_min_major_version)
+ #       error not present
+ #    endif
+ 
+ #   if(SND_LIB_MINOR > $alsa_min_minor_version)
+-  exit(0);
++  return 0;
+ #   else
+ #     if(SND_LIB_MINOR < $alsa_min_minor_version)
+ #          error not present
+@@ -19612,7 +19614,7 @@ main ()
+ #      endif
+ #    endif
+ #  endif
+-exit(0);
++return 0;
+ 
+   ;
+   return 0;
+@@ -19671,14 +19673,14 @@ main ()
+ #endif
+ 
+ #  if(SND_LIB_MAJOR > $alsa_min_major_version)
+-  exit(0);
++  return 0;
+ #  else
+ #    if(SND_LIB_MAJOR < $alsa_min_major_version)
+ #       error not present
+ #    endif
+ 
+ #   if(SND_LIB_MINOR > $alsa_min_minor_version)
+-  exit(0);
++  return 0;
+ #   else
+ #     if(SND_LIB_MINOR < $alsa_min_minor_version)
+ #          error not present
+@@ -19689,7 +19691,7 @@ main ()
+ #      endif
+ #    endif
+ #  endif
+-exit(0);
++return 0;
+ 
+   ;
+   return 0;