sync with OpenBSD -current

lib/fontconfig/conf.d/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2023/07/03 13:18:53 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.18 2025/01/04 15:22:55 matthieu Exp $
 
 FONTCONFIG =	${.CURDIR}/../../../dist/fontconfig
 CONFIGDIR =	/etc/fonts/conf.d
@@ -39,9 +39,9 @@ AVAIL_FILES =				\
 	10-hinting-none.conf		\
 	10-hinting-slight.conf		\
 	10-no-antialias.conf		\
-	10-no-sub-pixel.conf		\
 	10-scale-bitmap-fonts.conf	\
 	10-sub-pixel-bgr.conf		\
+	10-sub-pixel-none.conf		\
 	10-sub-pixel-rgb.conf		\
 	10-sub-pixel-vbgr.conf		\
 	10-sub-pixel-vrgb.conf		\
@@ -50,6 +50,7 @@ AVAIL_FILES =				\
 	11-lcdfilter-default.conf	\
 	11-lcdfilter-legacy.conf	\
 	11-lcdfilter-light.conf		\
+	11-lcdfilter-none.conf		\
 	20-unhint-small-vera.conf	\
 	25-unhint-nonlatin.conf		\
 	30-lucida-aliases.conf		\

lib/fontconfig/doc/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2021/11/11 08:46:46 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.7 2025/01/04 15:22:55 matthieu Exp $
 
 FONTCONFIG =	${.CURDIR}/../../../dist/fontconfig
 
@@ -132,6 +132,7 @@ MAN = FcAtomicCreate.3 \
 	FcMatrixShear.3 \
 	FcNameConstant.3 \
 	FcNameGetConstant.3 \
+	FcNameGetConstantFor.3 \
 	FcNameGetObjectType.3 \
 	FcNameParse.3 \
 	FcNameRegisterConstants.3 \
@@ -336,6 +337,7 @@ HTML_DEVEL_FILES = \
 	fcmatrixshear.html \
 	fcnameconstant.html \
 	fcnamegetconstant.html \
+	fcnamegetconstantfor.html \
 	fcnamegetobjecttype.html \
 	fcnameparse.html \
 	fcnameregisterconstants.html \

lib/fontconfig/pc/Makefile

@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.7 2023/07/03 13:18:53 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.8 2025/01/04 15:22:55 matthieu Exp $
 
 FONTCONFIG =	${.CURDIR}/../../../dist/fontconfig
 
 PKGCONFIG = fontconfig.pc
 
-PACKAGE_VERSION = 2.14.1
+PACKAGE_VERSION = 2.15.0
 PACKAGE = fontconfig
 VERSION = $(PACKAGE_VERSION)
 

lib/fontconfig/src/shlib_version

@@ -1,2 +1,2 @@
 major=13
-minor=1
+minor=2