CVS commit: pkgsrc/audio/xmms

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 23 13:11:30 UTC 2026

Modified Files:
        pkgsrc/audio/xmms: distinfo
Added Files:
        pkgsrc/audio/xmms/patches: patch-Output_solaris_Sun.h
            patch-libxmms_xmmsctrl.c patch-wmxmms_getopt.c patch-xmms_getopt.c

Log Message:
xmms: Fix building with recent GCC


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/xmms/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/xmms/patches/patch-Output_solaris_Sun.h \
    pkgsrc/audio/xmms/patches/patch-libxmms_xmmsctrl.c \
    pkgsrc/audio/xmms/patches/patch-wmxmms_getopt.c \
    pkgsrc/audio/xmms/patches/patch-xmms_getopt.c

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

Modified files:

Index: pkgsrc/audio/xmms/distinfo
diff -u pkgsrc/audio/xmms/distinfo:1.39 pkgsrc/audio/xmms/distinfo:1.40
--- pkgsrc/audio/xmms/distinfo:1.39     Tue Oct 26 09:59:37 2021
+++ pkgsrc/audio/xmms/distinfo  Mon Mar 23 13:11:30 2026
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 09:59:37 nia Exp $
+$NetBSD: distinfo,v 1.40 2026/03/23 13:11:30 nia Exp $
 
 BLAKE2s (xmms-1.2.11.tar.bz2) = 5cbc0d28ee4f9c8c7c77b5870d2e6ae193992814088a1567a27b61a8d68b1c29
 SHA512 (xmms-1.2.11.tar.bz2) = cc813f5e060b890aabc9d73f427daa94c474e2858390d336eba1d48bd082aeb295ce508d08d01067fe6341d0888af0dc6de185c54d0d2ee8519c915d7b849b94
 Size (xmms-1.2.11.tar.bz2) = 2581032 bytes
+SHA1 (patch-Output_solaris_Sun.h) = 53f48f24b8842156c4c372ed02f86a832881b438
 SHA1 (patch-aa) = 91b17156a2d0a48d8610552993357bf522aacbd0
 SHA1 (patch-ab) = 806b1e8e974fe1100be90eca1ce582b9d80f3ab2
 SHA1 (patch-ac) = 3f09b5522d37e682cac13735b12f625a2c1e71c8
@@ -16,3 +17,6 @@ SHA1 (patch-aq) = 2a16fbd747e03df4ef0fbb
 SHA1 (patch-ar) = b9cf22e3ab585ef255a533e56a3430f49f2fba4f
 SHA1 (patch-aw) = eed1a2b95f8d92bb75c118f64a4e33b97b9b4ee5
 SHA1 (patch-ax) = 252a76fe3d0c96b850cd6cec5a8a7d02f80912ee
+SHA1 (patch-libxmms_xmmsctrl.c) = 5ce53132af08eb454373d760a7ab5411aeb99759
+SHA1 (patch-wmxmms_getopt.c) = 66f1d787bef53cce9021f698f59b77b3acc3deff
+SHA1 (patch-xmms_getopt.c) = aa8cb2f75296697098b81da70c3510c6430f06a7

Added files:

Index: pkgsrc/audio/xmms/patches/patch-Output_solaris_Sun.h
diff -u /dev/null pkgsrc/audio/xmms/patches/patch-Output_solaris_Sun.h:1.1
--- /dev/null   Mon Mar 23 13:11:30 2026
+++ pkgsrc/audio/xmms/patches/patch-Output_solaris_Sun.h        Mon Mar 23 13:11:30 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-Output_solaris_Sun.h,v 1.1 2026/03/23 13:11:30 nia Exp $
+
+Fix implicit declaration of memset(3).
+
+--- Output/solaris/Sun.h.orig  2026-03-23 12:23:58.230974725 +0000
++++ Output/solaris/Sun.h
+@@ -32,6 +32,7 @@
+ #include <stropts.h>
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <stdio.h>
+ 
+ #include "xmms/plugin.h"
Index: pkgsrc/audio/xmms/patches/patch-libxmms_xmmsctrl.c
diff -u /dev/null pkgsrc/audio/xmms/patches/patch-libxmms_xmmsctrl.c:1.1
--- /dev/null   Mon Mar 23 13:11:30 2026
+++ pkgsrc/audio/xmms/patches/patch-libxmms_xmmsctrl.c  Mon Mar 23 13:11:30 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-libxmms_xmmsctrl.c,v 1.1 2026/03/23 13:11:30 nia Exp $
+
+Fix implicit declaration of memcpy(3), strcpy(3).
+
+--- libxmms/xmmsctrl.c.orig    2026-03-23 12:08:59.075524353 +0000
++++ libxmms/xmmsctrl.c
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <math.h>
+ #include "xmmsctrl.h"
+ #include "../xmms/controlsocket.h"
Index: pkgsrc/audio/xmms/patches/patch-wmxmms_getopt.c
diff -u /dev/null pkgsrc/audio/xmms/patches/patch-wmxmms_getopt.c:1.1
--- /dev/null   Mon Mar 23 13:11:30 2026
+++ pkgsrc/audio/xmms/patches/patch-wmxmms_getopt.c     Mon Mar 23 13:11:30 2026
@@ -0,0 +1,58 @@
+$NetBSD: patch-wmxmms_getopt.c,v 1.1 2026/03/23 13:11:30 nia Exp $
+
+Fix implicit declaration of string functions. With modern GCC this
+is worse than potentially having "special magic macros that don't work
+in GCC" (unlikely to exist in any unix made after the 20th century).
+
+--- wmxmms/getopt.c.orig       1999-07-29 21:03:12.000000000 +0000
++++ wmxmms/getopt.c
+@@ -198,48 +198,15 @@ ordering;
+ /* Value of POSIXLY_CORRECT environment variable.  */
+ static char *posixly_correct;
+ 
+-#ifdef        __GNU_LIBRARY__
+-/* We want to avoid inclusion of string.h with non-GNU libraries
+-   because there are many ways it can cause trouble.
+-   On some systems, it contains special magic macros that don't work
+-   in GCC.  */
++
+ #include <string.h>
+ #define       my_index        strchr
+-#else
+ 
+ /* Avoid depending on library functions or files
+    whose names are inconsistent.  */
+ 
+ char *getenv();
+ 
+-static char *
+-     my_index(str, chr)
+-     const char *str;
+-     int chr;
+-{
+-      while (*str)
+-      {
+-              if (*str == chr)
+-                      return (char *) str;
+-              str++;
+-      }
+-      return 0;
+-}
+-
+-/* If using GCC, we can safely declare strlen this way.
+-   If not using GCC, it is ok not to declare it.  */
+-#ifdef __GNUC__
+-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+-   That was relevant to code that was here before.  */
+-#if !defined (__STDC__) || !__STDC__
+-/* gcc with -traditional declares the built-in strlen to return int,
+-   and has done so at least since version 2.4.5. -- rms.  */
+-extern int strlen(const char *);
+-
+-#endif /* not __STDC__ */
+-#endif /* __GNUC__ */
+-
+-#endif /* not __GNU_LIBRARY__ */
+ 
+ /* Handle permutation of arguments.  */
+ 
Index: pkgsrc/audio/xmms/patches/patch-xmms_getopt.c
diff -u /dev/null pkgsrc/audio/xmms/patches/patch-xmms_getopt.c:1.1
--- /dev/null   Mon Mar 23 13:11:30 2026
+++ pkgsrc/audio/xmms/patches/patch-xmms_getopt.c       Mon Mar 23 13:11:30 2026
@@ -0,0 +1,58 @@
+$NetBSD: patch-xmms_getopt.c,v 1.1 2026/03/23 13:11:30 nia Exp $
+
+Fix implicit declaration of string functions. With modern GCC this
+is worse than potentially having "special magic macros that don't work
+in GCC" (unlikely to exist in any unix made after the 20th century).
+
+--- xmms/getopt.c.orig 1999-07-29 21:03:12.000000000 +0000
++++ xmms/getopt.c
+@@ -198,48 +198,15 @@ ordering;
+ /* Value of POSIXLY_CORRECT environment variable.  */
+ static char *posixly_correct;
+ 
+-#ifdef        __GNU_LIBRARY__
+-/* We want to avoid inclusion of string.h with non-GNU libraries
+-   because there are many ways it can cause trouble.
+-   On some systems, it contains special magic macros that don't work
+-   in GCC.  */
++
+ #include <string.h>
+ #define       my_index        strchr
+-#else
+ 
+ /* Avoid depending on library functions or files
+    whose names are inconsistent.  */
+ 
+ char *getenv();
+ 
+-static char *
+-     my_index(str, chr)
+-     const char *str;
+-     int chr;
+-{
+-      while (*str)
+-      {
+-              if (*str == chr)
+-                      return (char *) str;
+-              str++;
+-      }
+-      return 0;
+-}
+-
+-/* If using GCC, we can safely declare strlen this way.
+-   If not using GCC, it is ok not to declare it.  */
+-#ifdef __GNUC__
+-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+-   That was relevant to code that was here before.  */
+-#if !defined (__STDC__) || !__STDC__
+-/* gcc with -traditional declares the built-in strlen to return int,
+-   and has done so at least since version 2.4.5. -- rms.  */
+-extern int strlen(const char *);
+-
+-#endif /* not __STDC__ */
+-#endif /* __GNUC__ */
+-
+-#endif /* not __GNU_LIBRARY__ */
+ 
+ /* Handle permutation of arguments.  */
+