Module Name: src
Committed By: mrg
Date: Mon Jun 3 06:46:54 UTC 2013
Modified Files:
src/external/mit/xorg/lib/fontconfig/etc: fonts.conf
src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile Makefile.fcarch
Log Message:
updates for fontconfig 2.10.2
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.6
--- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5 Sat Feb 12 04:49:19 2011
+++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Mon Jun 3 06:46:53 2013
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $NetBSD: fonts.conf,v 1.5 2011/02/12 04:49:19 jmcneill Exp $ -->
+<!-- $NetBSD: fonts.conf,v 1.6 2013/06/03 06:46:53 mrg Exp $ -->
<!-- /etc/fonts/fonts.conf file to configure system font access -->
<fontconfig>
@@ -26,6 +26,8 @@
<dir>/usr/X11R7/lib/X11/fonts</dir>
<dir>/usr/pkg/lib/X11/fonts</dir>
+ <dir prefix="xdg">fonts</dir>
+ <!-- the following element will be removed in the future -->
<dir>~/.fonts</dir>
<!--
@@ -35,7 +37,7 @@
<test qual="any" name="family">
<string>mono</string>
</test>
- <edit name="family" mode="assign">
+ <edit name="family" mode="assign" binding="same">
<string>monospace</string>
</edit>
</match>
@@ -47,7 +49,7 @@
<test qual="any" name="family">
<string>sans serif</string>
</test>
- <edit name="family" mode="assign">
+ <edit name="family" mode="assign" binding="same">
<string>sans-serif</string>
</edit>
</match>
@@ -59,7 +61,7 @@
<test qual="any" name="family">
<string>sans</string>
</test>
- <edit name="family" mode="assign">
+ <edit name="family" mode="assign" binding="same">
<string>sans-serif</string>
</edit>
</match>
@@ -72,6 +74,8 @@
<!-- Font cache directory list -->
<cachedir>/var/cache/fontconfig</cachedir>
+ <cachedir prefix="xdg">fontconfig</cachedir>
+ <!-- the following element will be removed in the future -->
<cachedir>~/.fontconfig</cachedir>
<config>
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.1 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.2
--- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.1 Mon Sep 7 21:07:04 2009
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Mon Jun 3 06:46:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/09/07 21:07:04 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/03 06:46:54 mrg Exp $
.include <bsd.own.mk>
@@ -11,6 +11,9 @@ CONFIGFILES= \
10-sub-pixel-vbgr.conf \
10-sub-pixel-vrgb.conf \
10-unhinted.conf \
+ 11-lcdfilter-default.conf \
+ 11-lcdfilter-legacy.conf \
+ 11-lcdfilter-light.conf \
20-fix-globaladvance.conf \
20-unhint-small-vera.conf \
25-unhint-nonlatin.conf \
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.1 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.2
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.1 Mon Sep 7 21:07:04 2009
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Mon Jun 3 06:46:54 2013
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/09/07 21:07:04 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/03 06:46:54 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.fontconfig}/conf.d
FONTCONFIG_LINKS= \
- 20-fix-globaladvance.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
30-metric-aliases.conf \
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.9 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.10
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.9 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Mon Jun 3 06:46:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/22 23:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2013/06/03 06:46:54 mrg Exp $
.include <bsd.own.mk>
@@ -24,10 +24,13 @@ SRCS= fcatomic.c \
fcname.c \
fcpat.c \
fcserialize.c \
+ fcstat.c \
fcstr.c \
fcxml.c \
ftglue.c
+SRCS+= fcarch.c
+
.PATH: ${X11SRCDIR.${LIB}}/doc
MAN= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 FcAtomicLock.3 \
FcAtomicNewFile.3 FcAtomicOrigFile.3 FcAtomicReplaceOrig.3 \
@@ -80,7 +83,10 @@ MAN= FcAtomicCreate.3 FcAtomicDeleteNew.
FcStrSetDel.3 FcStrSetDestroy.3 FcStrSetEqual.3 FcStrSetMember.3 \
FcStrStr.3 FcStrStrIgnoreCase.3 FcToLower.3 FcUcs4ToUtf8.3 \
FcUtf16Len.3 FcUtf16ToUcs4.3 FcUtf8Len.3 FcUtf8ToUcs4.3 \
- FcValueDestroy.3 FcValueEqual.3 FcValuePrint.3 FcValueSave.3
+ FcValueDestroy.3 FcValueEqual.3 FcValuePrint.3 FcValueSave.3 \
+ FcCacheCreateTagFile.3 FcCharSetDelChar.3 FcGetDefaultLangs.3 \
+ FcLangSetDel.3 FcLangSetSubtract.3 FcLangSetUnion.3
+
MAN+= fonts-conf.5
LIBDPLIBS=\
@@ -88,6 +94,7 @@ LIBDPLIBS=\
freetype ${.CURDIR}/../../freetype
# XXX FONTCONFIG_PATH was arbitrarily chosen
+CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -DFONTCONFIG_PATH='"/etc/fonts"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}"' \
-DFC_CACHEDIR='"/var/cache/fontconfig"' \
@@ -105,7 +112,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
-I${X11SRCDIR.freetype}/src \
-I${X11SRCDIR.freetype}/include \
-I${X11SRCDIR.${LIB}}/../include \
- -I.
+ -I. \
+ -I${X11SRCDIR.${LIB}}
FCARCH_DEPFILE= fccache.c
.include "Makefile.fcarch"
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.2 src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.3
--- src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.2 Sun Sep 7 14:37:45 2008
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch Mon Jun 3 06:46:54 2013
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile.fcarch,v 1.2 2008/09/07 14:37:45 lukem Exp $
+# $NetBSD: Makefile.fcarch,v 1.3 2013/06/03 06:46:54 mrg Exp $
.ifndef _FONTCONFIG_FCARCH_MK_
_FONTCONFIG_FCARCH_MK_=1
-${FCARCH_DEPFILE}: fcarch.h
-
-fcarch.h: fcarch-netbsd.h
-fcarch-netbsd.h:
- ${_MKTARGET_CREATE}
- @echo '#define FC_ARCHITECTURE "${MACHINE_ARCH}"' > ${.TARGET}
-
-CLEANFILES+= fcarch-netbsd.h
-
+CPPFLAGS+= -DFC_ARCHITECTURE="\"${MACHINE_ARCH}\""
.endif
