CVS commit: pkgsrc/graphics/netpbm

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Apr 28 18:19:27 UTC 2025

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

Log Message:
netpbm: don't redefine bool


To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 pkgsrc/graphics/netpbm/Makefile
cvs rdiff -u -r1.112 -r1.113 pkgsrc/graphics/netpbm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/netpbm/patches/patch-buildtools_libopt.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.253 pkgsrc/graphics/netpbm/Makefile:1.254
--- pkgsrc/graphics/netpbm/Makefile:1.253       Thu Apr 24 14:14:32 2025
+++ pkgsrc/graphics/netpbm/Makefile     Mon Apr 28 18:19:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.253 2025/04/24 14:14:32 wiz Exp $
+# $NetBSD: Makefile,v 1.254 2025/04/28 18:19:26 tnn Exp $
 
 DISTNAME=      netpbm-11.02.09
 PKGREVISION=   6
@@ -24,10 +24,6 @@ LICENSE=     gnu-gpl-v2
 USE_TOOLS+=    gmake gdate flex pax perl
 USE_FEATURES=  snprintf
 
-# error: 'bool' cannot be defined via 'typedef'
-# note: 'bool' is a keyword with '-std=c23' onwards
-FORCE_C_STD=   gnu99
-
 INSTALL_TARGET=        install-dev install-run
 MAKE_ENV+=     INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
                pkgdir=${STAGEDIR} MACHINE=${MACHINE:Q}

Index: pkgsrc/graphics/netpbm/distinfo
diff -u pkgsrc/graphics/netpbm/distinfo:1.112 pkgsrc/graphics/netpbm/distinfo:1.113
--- pkgsrc/graphics/netpbm/distinfo:1.112       Sun Apr 21 12:54:24 2024
+++ pkgsrc/graphics/netpbm/distinfo     Mon Apr 28 18:19:26 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.112 2024/04/21 12:54:24 ryoon Exp $
+$NetBSD: distinfo,v 1.113 2025/04/28 18:19:26 tnn Exp $
 
 BLAKE2s (netpbm-11.02.09.tar.gz) = de06ee95562612ba6ddcf098e344451c8b0597e12b52d54fdbe06dcfcf9ee6c3
 SHA512 (netpbm-11.02.09.tar.gz) = c3378d895a6cbaf32f3c4d4bb5d90d876ea33997879bb4fb40baf93591cea113ea3c603bd8a9b0e0cd7a64c48607d3f780805a3d791dde5816a46039f79ae4f4
@@ -6,6 +6,7 @@ Size (netpbm-11.02.09.tar.gz) = 2991886 
 BLAKE2s (netpbm-docs-r4908.tar.gz) = 009879ddcc45a0217e8ee46b78184b6583470872f3b6d9c41ada00e5ecbdc046
 SHA512 (netpbm-docs-r4908.tar.gz) = 2361be1917c0ff27dd0faefcff7780d0808be67bf09d13a094b3f22942bb3c5155cb260ce4b749d3214fa0bce7f2d15806e4d2b88c95d9d59886299de3895bd0
 Size (netpbm-docs-r4908.tar.gz) = 529814 bytes
+SHA1 (patch-buildtools_libopt.c) = 0e361618eba1bf23c324d047461885471e8f3645
 SHA1 (patch-common.mk) = f37a95014c04ad50fab09da61608590a63a06386
 SHA1 (patch-lib_Makefile) = dc9d14d911773b282d1f0169f665baccb5247337
 SHA1 (patch-pm__config.in.h) = dfe51691507a2c7be2946013b1f1b6bdd9b39f49

Added files:

Index: pkgsrc/graphics/netpbm/patches/patch-buildtools_libopt.c
diff -u /dev/null pkgsrc/graphics/netpbm/patches/patch-buildtools_libopt.c:1.1
--- /dev/null   Mon Apr 28 18:19:27 2025
+++ pkgsrc/graphics/netpbm/patches/patch-buildtools_libopt.c    Mon Apr 28 18:19:27 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-buildtools_libopt.c,v 1.1 2025/04/28 18:19:27 tnn Exp $
+
+Don't redefine bool.
+
+--- buildtools/libopt.c.orig   2025-04-28 18:14:43.639955093 +0000
++++ buildtools/libopt.c
+@@ -88,8 +88,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-
+-typedef unsigned char bool;
++#include <stdbool.h>
+ #ifndef TRUE
+ #define TRUE (1)
+ #endif