CVS commit: pkgsrc/graphics/netpbm

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu May  1 16:50:44 UTC 2025

Modified Files:
        pkgsrc/graphics/netpbm: Makefile distinfo
Added Files:
        pkgsrc/graphics/netpbm/patches: patch-lib_util_nstring.c

Log Message:
netpbm: mend feature test macro brain damage on Darwin same way as SunOS

(does this still need to be conditional on platform?)


To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 pkgsrc/graphics/netpbm/Makefile
cvs rdiff -u -r1.113 -r1.114 pkgsrc/graphics/netpbm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/netpbm/patches/patch-lib_util_nstring.c

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

Modified files:

Index: pkgsrc/graphics/netpbm/Makefile
diff -u pkgsrc/graphics/netpbm/Makefile:1.254 pkgsrc/graphics/netpbm/Makefile:1.255
--- pkgsrc/graphics/netpbm/Makefile:1.254       Mon Apr 28 18:19:26 2025
+++ pkgsrc/graphics/netpbm/Makefile     Thu May  1 16:50:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.254 2025/04/28 18:19:26 tnn Exp $
+# $NetBSD: Makefile,v 1.255 2025/05/01 16:50:44 tnn Exp $
 
 DISTNAME=      netpbm-11.02.09
 PKGREVISION=   6
@@ -74,6 +74,7 @@ MAKE_FLAGS+=  NETWORKLD="-lsocket -lresol
 
 # Ridiculous but they hardcode it in every file so we have no choice.
 .if !empty(CC_VERSION:Mgcc-[6-9]*) || !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-1[0-9].*)
+SUBST_CLASSES.Darwin+= xopen
 SUBST_CLASSES.SunOS+=  xopen
 SUBST_STAGE.xopen=     pre-configure
 SUBST_FILES.xopen=     */*.c */*/*.c */*/*/*.c */*/*/*/*.c */*/*/*/*/*.c

Index: pkgsrc/graphics/netpbm/distinfo
diff -u pkgsrc/graphics/netpbm/distinfo:1.113 pkgsrc/graphics/netpbm/distinfo:1.114
--- pkgsrc/graphics/netpbm/distinfo:1.113       Mon Apr 28 18:19:26 2025
+++ pkgsrc/graphics/netpbm/distinfo     Thu May  1 16:50:44 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2025/04/28 18:19:26 tnn Exp $
+$NetBSD: distinfo,v 1.114 2025/05/01 16:50:44 tnn Exp $
 
 BLAKE2s (netpbm-11.02.09.tar.gz) = de06ee95562612ba6ddcf098e344451c8b0597e12b52d54fdbe06dcfcf9ee6c3
 SHA512 (netpbm-11.02.09.tar.gz) = c3378d895a6cbaf32f3c4d4bb5d90d876ea33997879bb4fb40baf93591cea113ea3c603bd8a9b0e0cd7a64c48607d3f780805a3d791dde5816a46039f79ae4f4
@@ -9,4 +9,5 @@ Size (netpbm-docs-r4908.tar.gz) = 529814
 SHA1 (patch-buildtools_libopt.c) = 0e361618eba1bf23c324d047461885471e8f3645
 SHA1 (patch-common.mk) = f37a95014c04ad50fab09da61608590a63a06386
 SHA1 (patch-lib_Makefile) = dc9d14d911773b282d1f0169f665baccb5247337
+SHA1 (patch-lib_util_nstring.c) = 9b18383f498d2c78a577553cfbbe97f18ce7ec1e
 SHA1 (patch-pm__config.in.h) = dfe51691507a2c7be2946013b1f1b6bdd9b39f49

Added files:

Index: pkgsrc/graphics/netpbm/patches/patch-lib_util_nstring.c
diff -u /dev/null pkgsrc/graphics/netpbm/patches/patch-lib_util_nstring.c:1.1
--- /dev/null   Thu May  1 16:50:44 2025
+++ pkgsrc/graphics/netpbm/patches/patch-lib_util_nstring.c     Thu May  1 16:50:44 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_util_nstring.c,v 1.1 2025/05/01 16:50:44 tnn Exp $
+
+define _DARWIN_C_SOURCE for vasprintf
+
+--- lib/util/nstring.c.orig    2025-05-01 16:46:16.713149476 +0000
++++ lib/util/nstring.c
+@@ -26,6 +26,7 @@
+ #define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */
+ #define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
+ #define _BSD_SOURCE  /* Make sure strdup() is in string.h */
++#define _DARWIN_C_SOURCE  /* Make sure vasprintf(3) is in stdio.h */
+ #define _GNU_SOURCE
+    /* Because of conditional compilation, this is GNU source only if the C
+       library is GNU.