19 files changed, 65 insertions, 198 deletions
diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 399572a5f..db84baa30 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -216,14 +216,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le64.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le64.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le64.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le64.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le64.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le64.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le64.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le64.cache-3
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 3e4e57dd1..6323538b4 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -265,14 +265,14 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le64.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le64.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le64.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le64.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le64.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le64.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le64.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le64.cache-3
+./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-4
+./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-4
+./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-4
+./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le64.cache-4
+./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le64.cache-4
+./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le64.cache-4
+./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le64.cache-4
+./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le64.cache-4
+./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le64.cache-4
+./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le64.cache-4
+./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le64.cache-4
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 9a9194814..e3a2d6387 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -253,14 +253,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 9a9194814..e3a2d6387 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -253,14 +253,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.aviion b/distrib/sets/lists/xbase/md.aviion
index ef1657191..db84baa30 100644
--- a/distrib/sets/lists/xbase/md.aviion
+++ b/distrib/sets/lists/xbase/md.aviion
@@ -216,14 +216,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index d87564639..fff17b16c 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -161,15 +161,15 @@
 ./usr/X11R6/man/man1/glxinfo.1
 ./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-4
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-4
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-4
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-4
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-4
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-4
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-4
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-4
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-4
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-4
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-4
 ./var/db/xkb
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index f113b7867..30fa88c23 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -265,14 +265,14 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-3
+./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-4
+./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-4
+./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-4
+./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-4
+./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-4
+./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-4
+./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-4
+./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-4
+./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-4
+./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-4
+./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-4
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 4a4a73a88..d0505462d 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -216,14 +216,3 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 1b5bd3edd..17744dd66 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -254,14 +254,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le64.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le64.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le64.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le64.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le64.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le64.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le64.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le64.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le64.cache-3
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index ef1657191..db84baa30 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -216,14 +216,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 2b23f8e6b..54c1fdef4 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -255,14 +255,14 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-4
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-4
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-4
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-4
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-4
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-4
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-4
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-4
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-4
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-4
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-4
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index 747142ce5..3e78d8016 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -146,14 +146,3 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be64.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be64.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be64.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be64.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be64.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be64.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be64.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be64.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be64.cache-3
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index da8cb3ae8..da54fe9b8 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -254,14 +254,14 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be64.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be64.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be64.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be64.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be64.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be64.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be64.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be64.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be64.cache-3
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-4
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-4
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be64.cache-4
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be64.cache-4
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be64.cache-4
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be64.cache-4
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be64.cache-4
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be64.cache-4
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be64.cache-4
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be64.cache-4
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be64.cache-4
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index dda82de53..e3a2d6387 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -253,14 +253,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index dda82de53..e3a2d6387 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -253,14 +253,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 68e0bdcdf..f6f663fcc 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -255,14 +255,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be64.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be64.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be64.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be64.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be64.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be64.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be64.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be64.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be64.cache-3
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index 24e15ca50..cfcbb1d8f 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -56,15 +56,4 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-3
 ./var/log
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 9a9194814..e3a2d6387 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -253,14 +253,3 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/share/doc/dri2proto/dri2proto.txt
-./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-3
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-3
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-3
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-3
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-3
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-3
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-3
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-3
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-3
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-3
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-3
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 66d55c5e4..58d8822e0 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -1033,11 +1033,13 @@
 ./usr/X11R6/man/man3/FcConfigGetFontDirs.3
 ./usr/X11R6/man/man3/FcConfigGetFonts.3
 ./usr/X11R6/man/man3/FcConfigGetRescanInterval.3
+./usr/X11R6/man/man3/FcConfigGetSysRoot.3
 ./usr/X11R6/man/man3/FcConfigHome.3
 ./usr/X11R6/man/man3/FcConfigParseAndLoad.3
 ./usr/X11R6/man/man3/FcConfigReference.3
 ./usr/X11R6/man/man3/FcConfigSetCurrent.3
 ./usr/X11R6/man/man3/FcConfigSetRescanInterval.3
+./usr/X11R6/man/man3/FcConfigSetSysRoot.3
 ./usr/X11R6/man/man3/FcConfigSubstitute.3
 ./usr/X11R6/man/man3/FcConfigSubstituteWithPat.3
 ./usr/X11R6/man/man3/FcConfigUptoDate.3
@@ -1046,6 +1048,7 @@
 ./usr/X11R6/man/man3/FcDirCacheLoad.3
 ./usr/X11R6/man/man3/FcDirCacheLoadFile.3
 ./usr/X11R6/man/man3/FcDirCacheRead.3
+./usr/X11R6/man/man3/FcDirCacheRescan.3
 ./usr/X11R6/man/man3/FcDirCacheUnlink.3
 ./usr/X11R6/man/man3/FcDirCacheUnload.3
 ./usr/X11R6/man/man3/FcDirCacheValid.3
@@ -1091,6 +1094,7 @@
 ./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
@@ -1143,6 +1147,7 @@
 ./usr/X11R6/man/man3/FcStrFree.3
 ./usr/X11R6/man/man3/FcStrListCreate.3
 ./usr/X11R6/man/man3/FcStrListDone.3
+./usr/X11R6/man/man3/FcStrListFirst.3
 ./usr/X11R6/man/man3/FcStrListNext.3
 ./usr/X11R6/man/man3/FcStrPlus.3
 ./usr/X11R6/man/man3/FcStrSetAdd.3
@@ -3627,11 +3632,13 @@
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetsysroot.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfighome.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigreference.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigsetsysroot.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
@@ -3640,6 +3647,7 @@
 ./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
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
@@ -3685,6 +3693,7 @@
 ./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
@@ -3737,6 +3746,7 @@
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrfree.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrlistfirst.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrplus.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html