CVS commit: pkgsrc/print/mupdf

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct  2 15:22:42 UTC 2025

Modified Files:
        pkgsrc/print/mupdf: Makefile options.mk

Log Message:
mupdf: Various build fixes

Fixes the build with pre-cxx20 compilers (including the one
in netbsd-9), on macOS, on FreeBSD, and on OpenBSD.

Issues uncovered with drecklypkg ci.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/mupdf/options.mk

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

Modified files:

Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.132 pkgsrc/print/mupdf/Makefile:1.133
--- pkgsrc/print/mupdf/Makefile:1.132   Sun Sep 14 10:57:54 2025
+++ pkgsrc/print/mupdf/Makefile Thu Oct  2 15:22:42 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2025/09/14 10:57:54 leot Exp $
+# $NetBSD: Makefile,v 1.133 2025/10/02 15:22:42 nia Exp $
 
 DISTNAME=      mupdf-1.26.8-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -25,6 +25,14 @@ MAKE_FLAGS+=         XLIBS=${LIBS:Q}
 MAKE_FLAGS+=           build=release
 MAKE_FLAGS+=           USE_SYSTEM_LIBS=yes
 MAKE_FLAGS+=           USE_SYSTEM_MUJS=yes
+MAKE_FLAGS+=           USE_ARGUMENT_FILE=no
+
+.include "../../mk/compiler.mk"
+
+# This single feature requires a C++20 compiler.
+.if ${CC_VERSION:Mgcc-[2-7].*}
+MAKE_FLAGS+=           barcode=no
+.endif
 
 INSTALL_MAKE_FLAGS+=   prefix=${PREFIX}
 INSTALL_MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}

Index: pkgsrc/print/mupdf/options.mk
diff -u pkgsrc/print/mupdf/options.mk:1.14 pkgsrc/print/mupdf/options.mk:1.15
--- pkgsrc/print/mupdf/options.mk:1.14  Wed Aug 14 05:55:32 2024
+++ pkgsrc/print/mupdf/options.mk       Thu Oct  2 15:22:42 2025
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.14 2024/08/14 05:55:32 adam Exp $
+# $NetBSD: options.mk,v 1.15 2025/10/02 15:22:42 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mupdf
 PKG_SUPPORTED_OPTIONS= curl opengl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${OPSYS} != "Darwin"
+.if ${OPSYS} != "Darwin" && ${OPSYS} != "OpenBSD"
 PKG_SUGGESTED_OPTIONS= opengl
 .endif