diff options
| -rw-r--r-- | distrib/sets/lists/xbase/md.alpha | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.amd64 | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.armish | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.hp300 | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.hppa | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.i386 | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.landisk | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.loongson | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.luna88k | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.macppc | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.mvme68k | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.sgi | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.socppc | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.sparc | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.sparc64 | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/md.zaurus | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/mi | 6 | ||||
| -rw-r--r-- | distrib/sets/lists/xetc/mi | 7 | ||||
| -rw-r--r-- | distrib/sets/lists/xshare/mi | 22 | ||||
| -rw-r--r-- | lib/fontconfig/Makefile | 24 | ||||
| -rw-r--r-- | lib/fontconfig/conf.d/Makefile | 23 | ||||
| -rw-r--r-- | lib/fontconfig/doc/Makefile | 7 |
22 files changed, 101 insertions, 52 deletions
diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha index 9583dcbec..fc82da3f1 100644 --- a/distrib/sets/lists/xbase/md.alpha +++ b/distrib/sets/lists/xbase/md.alpha @@ -52,7 +52,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -66,7 +66,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64 index 1abcb2c3c..6bd786cc9 100644 --- a/distrib/sets/lists/xbase/md.amd64 +++ b/distrib/sets/lists/xbase/md.amd64 @@ -98,7 +98,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -114,7 +114,7 @@ ./usr/X11R6/lib/libdrm.so.3.1 ./usr/X11R6/lib/libdrm_intel.a ./usr/X11R6/lib/libdrm_intel.so.2.0 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish index cb16b580b..18b29f148 100644 --- a/distrib/sets/lists/xbase/md.armish +++ b/distrib/sets/lists/xbase/md.armish @@ -90,7 +90,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -104,7 +104,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300 index a8cc8bd19..d67e8940c 100644 --- a/distrib/sets/lists/xbase/md.hp300 +++ b/distrib/sets/lists/xbase/md.hp300 @@ -80,7 +80,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -94,7 +94,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa index abe3154ba..22483ed9c 100644 --- a/distrib/sets/lists/xbase/md.hppa +++ b/distrib/sets/lists/xbase/md.hppa @@ -53,7 +53,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -67,7 +67,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386 index 771fa7fb4..2b376a79e 100644 --- a/distrib/sets/lists/xbase/md.i386 +++ b/distrib/sets/lists/xbase/md.i386 @@ -98,7 +98,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -114,7 +114,7 @@ ./usr/X11R6/lib/libdrm.so.3.1 ./usr/X11R6/lib/libdrm_intel.a ./usr/X11R6/lib/libdrm_intel.so.2.0 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk index b37e246d7..51e830e11 100644 --- a/distrib/sets/lists/xbase/md.landisk +++ b/distrib/sets/lists/xbase/md.landisk @@ -53,7 +53,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -67,7 +67,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson index 47f226bef..0f692e3d1 100644 --- a/distrib/sets/lists/xbase/md.loongson +++ b/distrib/sets/lists/xbase/md.loongson @@ -91,7 +91,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -105,7 +105,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k index 89846166d..d482f6456 100644 --- a/distrib/sets/lists/xbase/md.luna88k +++ b/distrib/sets/lists/xbase/md.luna88k @@ -52,7 +52,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -66,7 +66,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc index 2a1f80afe..51717c99f 100644 --- a/distrib/sets/lists/xbase/md.macppc +++ b/distrib/sets/lists/xbase/md.macppc @@ -91,7 +91,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -105,7 +105,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k index e951fde89..a84bd3f1c 100644 --- a/distrib/sets/lists/xbase/md.mvme68k +++ b/distrib/sets/lists/xbase/md.mvme68k @@ -54,7 +54,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -68,7 +68,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi index 10d16e147..8d10e1f94 100644 --- a/distrib/sets/lists/xbase/md.sgi +++ b/distrib/sets/lists/xbase/md.sgi @@ -91,7 +91,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -105,7 +105,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc index d136987e2..b24f912fd 100644 --- a/distrib/sets/lists/xbase/md.socppc +++ b/distrib/sets/lists/xbase/md.socppc @@ -90,7 +90,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -104,7 +104,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc index d136987e2..b24f912fd 100644 --- a/distrib/sets/lists/xbase/md.sparc +++ b/distrib/sets/lists/xbase/md.sparc @@ -90,7 +90,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -104,7 +104,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64 index ef9bedcf7..19b2887d7 100644 --- a/distrib/sets/lists/xbase/md.sparc64 +++ b/distrib/sets/lists/xbase/md.sparc64 @@ -91,7 +91,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -105,7 +105,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus index cb16b580b..18b29f148 100644 --- a/distrib/sets/lists/xbase/md.zaurus +++ b/distrib/sets/lists/xbase/md.zaurus @@ -90,7 +90,7 @@ ./usr/X11R6/lib/libXmu.so.10.0 ./usr/X11R6/lib/libXmuu.so.5.0 ./usr/X11R6/lib/libXpm.so.8.0 -./usr/X11R6/lib/libXrandr.so.6.1 +./usr/X11R6/lib/libXrandr.so.6.2 ./usr/X11R6/lib/libXrender.so.5.0 ./usr/X11R6/lib/libXss.so.5.0 ./usr/X11R6/lib/libXt.so.10.1 @@ -104,7 +104,7 @@ ./usr/X11R6/lib/libdmx.so.1.0 ./usr/X11R6/lib/libdrm.a ./usr/X11R6/lib/libdrm.so.3.1 -./usr/X11R6/lib/libfontconfig.so.7.0 +./usr/X11R6/lib/libfontconfig.so.8.0 ./usr/X11R6/lib/libfontenc.so.3.0 ./usr/X11R6/lib/libfreetype.so.19.0 ./usr/X11R6/lib/libpciaccess.so.1.1 diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi index 959e9a670..f6f21401e 100644 --- a/distrib/sets/lists/xbase/mi +++ b/distrib/sets/lists/xbase/mi @@ -27,11 +27,16 @@ ./usr/X11R6/bin/dga ./usr/X11R6/bin/editres ./usr/X11R6/bin/fc-cache +./usr/X11R6/bin/fc-case ./usr/X11R6/bin/fc-cat +./usr/X11R6/bin/fc-glyphname +./usr/X11R6/bin/fc-lang ./usr/X11R6/bin/fc-list ./usr/X11R6/bin/fc-match +./usr/X11R6/bin/fc-pattern ./usr/X11R6/bin/fc-query ./usr/X11R6/bin/fc-scan +./usr/X11R6/bin/fc-validate ./usr/X11R6/bin/fontname.sh ./usr/X11R6/bin/fontprop.sh ./usr/X11R6/bin/fonttosfnt @@ -325,3 +330,4 @@ ./var ./var/cache ./var/cache/fontconfig +./var/cache/fontconfig/CACHEDIR.TAG diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi index fc0dab65a..fdc7d206c 100644 --- a/distrib/sets/lists/xetc/mi +++ b/distrib/sets/lists/xetc/mi @@ -53,12 +53,15 @@ ./etc/fonts/conf.avail ./etc/fonts/conf.avail/10-autohint.conf ./etc/fonts/conf.avail/10-no-sub-pixel.conf +./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf ./etc/fonts/conf.avail/10-sub-pixel-bgr.conf ./etc/fonts/conf.avail/10-sub-pixel-rgb.conf ./etc/fonts/conf.avail/10-sub-pixel-vbgr.conf ./etc/fonts/conf.avail/10-sub-pixel-vrgb.conf ./etc/fonts/conf.avail/10-unhinted.conf -./etc/fonts/conf.avail/20-fix-globaladvance.conf +./etc/fonts/conf.avail/11-lcdfilter-default.conf +./etc/fonts/conf.avail/11-lcdfilter-legacy.conf +./etc/fonts/conf.avail/11-lcdfilter-light.conf ./etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf ./etc/fonts/conf.avail/20-unhint-small-dejavu-sans.conf ./etc/fonts/conf.avail/20-unhint-small-dejavu-serif.conf @@ -84,7 +87,7 @@ ./etc/fonts/conf.avail/80-delicious.conf ./etc/fonts/conf.avail/90-synthetic.conf ./etc/fonts/conf.d/10-autohint.conf -./etc/fonts/conf.d/20-fix-globaladvance.conf +./etc/fonts/conf.d/10-scale-bitmap-fonts.conf ./etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf ./etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf ./etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi index 64f50113f..b67429729 100644 --- a/distrib/sets/lists/xshare/mi +++ b/distrib/sets/lists/xshare/mi @@ -852,8 +852,10 @@ ./usr/X11R6/man/man1/fc-cat.1 ./usr/X11R6/man/man1/fc-list.1 ./usr/X11R6/man/man1/fc-match.1 +./usr/X11R6/man/man1/fc-pattern.1 ./usr/X11R6/man/man1/fc-query.1 ./usr/X11R6/man/man1/fc-scan.1 +./usr/X11R6/man/man1/fc-validate.1 ./usr/X11R6/man/man1/fonttosfnt.1 ./usr/X11R6/man/man1/fslsfonts.1 ./usr/X11R6/man/man1/fstobdf.1 @@ -1019,6 +1021,7 @@ ./usr/X11R6/man/man3/FcBlanksDestroy.3 ./usr/X11R6/man/man3/FcBlanksIsMember.3 ./usr/X11R6/man/man3/FcCacheCopySet.3 +./usr/X11R6/man/man3/FcCacheCreateTagFile.3 ./usr/X11R6/man/man3/FcCacheDir.3 ./usr/X11R6/man/man3/FcCacheNumFont.3 ./usr/X11R6/man/man3/FcCacheNumSubdir.3 @@ -1028,6 +1031,7 @@ ./usr/X11R6/man/man3/FcCharSetCount.3 ./usr/X11R6/man/man3/FcCharSetCoverage.3 ./usr/X11R6/man/man3/FcCharSetCreate.3 +./usr/X11R6/man/man3/FcCharSetDelChar.3 ./usr/X11R6/man/man3/FcCharSetDestroy.3 ./usr/X11R6/man/man3/FcCharSetEqual.3 ./usr/X11R6/man/man3/FcCharSetFirstPage.3 @@ -1067,6 +1071,7 @@ ./usr/X11R6/man/man3/FcConfigSubstituteWithPat.3 ./usr/X11R6/man/man3/FcConfigUptoDate.3 ./usr/X11R6/man/man3/FcDefaultSubstitute.3 +./usr/X11R6/man/man3/FcDirCacheClean.3 ./usr/X11R6/man/man3/FcDirCacheLoad.3 ./usr/X11R6/man/man3/FcDirCacheLoadFile.3 ./usr/X11R6/man/man3/FcDirCacheRead.3 @@ -1095,6 +1100,7 @@ ./usr/X11R6/man/man3/FcFreeTypeCharSetAndSpacing.3 ./usr/X11R6/man/man3/FcFreeTypeQuery.3 ./usr/X11R6/man/man3/FcFreeTypeQueryFace.3 +./usr/X11R6/man/man3/FcGetDefaultLangs.3 ./usr/X11R6/man/man3/FcGetLangs.3 ./usr/X11R6/man/man3/FcGetVersion.3 ./usr/X11R6/man/man3/FcInit.3 @@ -1105,16 +1111,19 @@ ./usr/X11R6/man/man3/FcIsLower.3 ./usr/X11R6/man/man3/FcIsUpper.3 ./usr/X11R6/man/man3/FcLangGetCharSet.3 +./usr/X11R6/man/man3/FcLangNormalize.3 ./usr/X11R6/man/man3/FcLangSetAdd.3 ./usr/X11R6/man/man3/FcLangSetCompare.3 ./usr/X11R6/man/man3/FcLangSetContains.3 ./usr/X11R6/man/man3/FcLangSetCopy.3 ./usr/X11R6/man/man3/FcLangSetCreate.3 +./usr/X11R6/man/man3/FcLangSetDel.3 ./usr/X11R6/man/man3/FcLangSetDestroy.3 ./usr/X11R6/man/man3/FcLangSetEqual.3 -./usr/X11R6/man/man3/FcLangSetGetLangs.3 ./usr/X11R6/man/man3/FcLangSetHasLang.3 ./usr/X11R6/man/man3/FcLangSetHash.3 +./usr/X11R6/man/man3/FcLangSetSubtract.3 +./usr/X11R6/man/man3/FcLangSetUnion.3 ./usr/X11R6/man/man3/FcMatrixCopy.3 ./usr/X11R6/man/man3/FcMatrixEqual.3 ./usr/X11R6/man/man3/FcMatrixInit.3 @@ -3596,6 +3605,7 @@ ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcblanksismember.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachecopyset.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachedir.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachenumfont.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html @@ -3605,6 +3615,7 @@ ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetcount.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetequal.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html @@ -3644,6 +3655,7 @@ ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacheload.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacheread.html @@ -3672,6 +3684,7 @@ ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcgetlangs.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcgetversion.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcinit.html @@ -3682,16 +3695,19 @@ ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcislower.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcisupper.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangnormalize.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetadd.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetdel.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetequal.html -./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsethash.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html +./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fclangsetunion.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html @@ -3761,8 +3777,6 @@ ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcvalueequal.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcvalueprint.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcvaluesave.html -./usr/X11R6/share/doc/fontconfig/fontconfig-devel/ln12.html -./usr/X11R6/share/doc/fontconfig/fontconfig-devel/t1.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/x102.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/x19.html ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/x31.html diff --git a/lib/fontconfig/Makefile b/lib/fontconfig/Makefile index c05c1d61b..c43d96f64 100644 --- a/lib/fontconfig/Makefile +++ b/lib/fontconfig/Makefile @@ -1,4 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:40 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2013/03/16 14:28:35 matthieu Exp $ + +FONTCONFIG = ${.CURDIR}/../../dist/fontconfig +FC_DEFAULT_FONTS = ${X11BASE}/lib/X11/fonts +FC_FONTPATH = "<dir>/usr/local/lib/X11/fonts</dir>" +CONFIGDIR = conf.d +FC_CACHEDIR = /var/cache/fontconfig SUBDIR = fc-case fc-lang fc-glyphname src \ fc-cache fc-cat fc-list fc-match fc-pattern fc-query \ @@ -10,5 +16,21 @@ SUBDIR += fontconfig obj: _xenocara_obj +all: fonts.conf _SUBDIRUSE + +install: _SUBDIRUSE + ${INSTALL_DATA} fonts.conf ${DESTDIR}/etc/fonts + ${INSTALL_DATA} ${FONTCONFIG}/fonts.dtd ${DESTDIR}/etc/fonts + +fonts.conf: ${FONTCONFIG}/fonts.conf.in + @sed -e s,@FC_DEFAULT_FONTS@,${FC_DEFAULT_FONTS}, \ + -e s,@FC_FONTPATH@,${FC_FONTPATH}, \ + -e s,@CONFIGDIR@,${CONFIGDIR}, \ + -e s,@FC_CACHEDIR@,${FC_CACHEDIR}, \ + < ${FONTCONFIG}/fonts.conf.in > $@ + +clean: _SUBDIRUSE + rm -f fonts.conf + .include <bsd.subdir.mk> .include <bsd.xorg.mk> diff --git a/lib/fontconfig/conf.d/Makefile b/lib/fontconfig/conf.d/Makefile index e3facf0ac..b4e87b0da 100644 --- a/lib/fontconfig/conf.d/Makefile +++ b/lib/fontconfig/conf.d/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:41 matthieu Exp $ +# $OpenBSD: Makefile,v 1.6 2013/03/16 15:09:38 matthieu Exp $ FONTCONFIG = ${.CURDIR}/../../../dist/fontconfig CONFIGDIR = /etc/fonts/conf.d @@ -41,8 +41,10 @@ AVAIL_FILES = \ 11-lcdfilter-light.conf \ 20-unhint-small-vera.conf \ 25-unhint-nonlatin.conf \ + 30-lucida-aliases.conf \ 30-urw-aliases.conf \ 30-metric-aliases.conf \ + 31-nonmst.conf \ 40-nonlatin.conf \ 45-latin.conf \ 49-sansserif.conf \ @@ -58,19 +60,20 @@ AVAIL_FILES = \ 80-delicious.conf \ 90-synthetic.conf -all: +all cleandir: install: - @for i in $(AVAIL_FILES); do \ - echo ${INSTALL_DATA} $$i $(DESTDIR)${CONFAVAILDIR}; \ - ${INSTALL_DATA} ${FONTCONFIG}/conf.d/$$i $(DESTDIR)${CONFAVAILDIR}; \ + @for i in ${AVAIL_FILES}; do \ + echo ${INSTALL_DATA} $$i ${DESTDIR}${CONFAVAILDIR}; \ + ${INSTALL_DATA} ${FONTCONFIG}/conf.d/$$i ${DESTDIR}${CONFAVAILDIR}; \ done - @(echo cd $(DESTDIR)$(CONFIGDIR); \ - cd $(DESTDIR)$(CONFIGDIR); \ - for i in $(CONF_LINKS); do \ - echo rm $$i";" ln -s $(CONFAVAILDIR)/$$i .; \ + ${INSTALL_DATA} ${FONTCONFIG}/conf.d/README ${DESTDIR}/${CONFIGDIR} + @(echo cd ${DESTDIR}${CONFIGDIR}; \ + cd ${DESTDIR}${CONFIGDIR}; \ + for i in ${CONF_LINKS}; do \ + echo rm $$i";" ln -s ${CONFAVAILDIR}/$$i .; \ rm -f $$i; \ - ln -s $(CONFAVAILDIR)/$$i .; \ + ln -s ${CONFAVAILDIR}/$$i .; \ done) NOOBJ= diff --git a/lib/fontconfig/doc/Makefile b/lib/fontconfig/doc/Makefile index 321109d6b..ab780912f 100644 --- a/lib/fontconfig/doc/Makefile +++ b/lib/fontconfig/doc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:42 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2013/03/16 14:57:18 matthieu Exp $ FONTCONFIG = ${.CURDIR}/../../../dist/fontconfig @@ -186,7 +186,8 @@ MAN = FcAtomicCreate.3 \ FcValueDestroy.3 \ FcValueEqual.3 \ FcValuePrint.3 \ - FcValueSave.3 + FcValueSave.3 \ + fonts-conf.5 PDF_FILES = fontconfig-devel.pdf fontconfig-user.pdf TXT_FILES = fontconfig-devel.txt fontconfig-user.txt @@ -386,7 +387,7 @@ afterinstall: @for f in ${PDF_FILES} ${TXT_FILES} ${HTML_USER_FILES}; do \ echo "installing $$f" ; \ ${INSTALL_DATA} ${FONTCONFIG}/doc/$$f \ - ${DESDIR}${X11BASE}/share/doc/fontconfig ; \ + ${DESTDIR}${X11BASE}/share/doc/fontconfig ; \ done @for f in ${HTML_DEVEL_FILES}; do \ echo "installing $$f" ; \ |