CVS commit: pkgsrc/graphics/netpbm

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Sep 28 12:52:51 UTC 2021

Modified Files:
        pkgsrc/graphics/netpbm: Makefile

Log Message:
netpbm: Support GCC >= 10.


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/graphics/netpbm/Makefile

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.230 pkgsrc/graphics/netpbm/Makefile:1.231
--- pkgsrc/graphics/netpbm/Makefile:1.230       Mon May 24 19:52:23 2021
+++ pkgsrc/graphics/netpbm/Makefile     Tue Sep 28 12:52:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2021/05/24 19:52:23 wiz Exp $
+# $NetBSD: Makefile,v 1.231 2021/09/28 12:52:51 jperkin Exp $
 
 DISTNAME=      netpbm-10.79.04
 PKGREVISION=   8
@@ -71,9 +71,8 @@ MAKE_FLAGS+=  NETWORKLD="-lsocket -lresol
 .include "../../mk/compiler.mk"
 
 # Ridiculous but they hardcode it in every file so we have no choice.
-.if ${OPSYS} == "SunOS" && \
-    (!empty(CC_VERSION:Mgcc-[6-9]*) || !empty(PKGSRC_COMPILER:Mclang))
-SUBST_CLASSES+=                xopen
+.if !empty(CC_VERSION:Mgcc-[6-9]*) || !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-1[0-9].*)
+SUBST_CLASSES.SunOS+=  xopen
 SUBST_STAGE.xopen=     pre-configure
 SUBST_FILES.xopen=     */*.c */*/*.c */*/*/*.c */*/*/*/*.c */*/*/*/*/*.c
 SUBST_FILES.xopen+=    lib/util/lexheader