CVS commit: [pkgsrc-2025Q3] pkgsrc/fonts/fontconfig

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Oct 18 12:38:43 UTC 2025

Modified Files:
        pkgsrc/fonts/fontconfig [pkgsrc-2025Q3]: Makefile

Log Message:
Pullup ticket #7010 - requested by maya
fonts/fontconfig: build fix

Revisions pulled up:
- fonts/fontconfig/Makefile                                     1.137

---
   Module Name: pkgsrc
   Committed By:        maya
   Date:                Thu Oct 16 02:43:56 UTC 2025

   Modified Files:
        pkgsrc/fonts/fontconfig: Makefile

   Log Message:
   fontconfig: find X11_TYPE=native fonts too

   fixes firefox segfault at startup for me.
   PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.136.2.1 pkgsrc/fonts/fontconfig/Makefile

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

Modified files:

Index: pkgsrc/fonts/fontconfig/Makefile
diff -u pkgsrc/fonts/fontconfig/Makefile:1.136 pkgsrc/fonts/fontconfig/Makefile:1.136.2.1
--- pkgsrc/fonts/fontconfig/Makefile:1.136      Wed Aug 27 10:35:30 2025
+++ pkgsrc/fonts/fontconfig/Makefile    Sat Oct 18 12:38:43 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2025/08/27 10:35:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.136.2.1 2025/10/18 12:38:43 bsiegert Exp $
 
 DISTNAME=      fontconfig-2.17.1
+PKGREVISION=   1
 CATEGORIES=    fonts
 MASTER_SITES=  https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -48,6 +49,11 @@ ADDFONTS:=   ${X11BASE}/lib/X11/fonts,${AD
 ADDFONTS:=     ${LOCALBASE}/share/fonts/X11,${ADDFONTS}
 .endif
 
+.if ${OPSYS} == "Darwin"
+ADDFONTS:=     ~/Library/Fonts,/Library/Fonts,/System/Library/Fonts,${ADDFONTS}
+.endif
+MESON_ARGS+=   -Dadditional-fonts-dirs=${ADDFONTS}
+
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    pre-configure
 SUBST_FILES.prefix=    meson.build