sync

13 files changed, 74 insertions, 14 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 90cd3fe8b..83f323218 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -525,7 +525,7 @@
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
@@ -1117,3 +1117,15 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86-64.cache-2
+./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86-64.cache-2
+./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86-64.cache-2
+./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-x86-64.cache-2
+./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-x86-64.cache-2
+./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-x86-64.cache-2
+./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-x86-64.cache-2
+./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-x86-64.cache-2
+./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-x86-64.cache-2
+./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-x86-64.cache-2
+./var/cache/fontconfig/f0f76015ef54ea3f0895465d59f141ef-x86-64.cache-2
+./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-x86-64.cache-2
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 90cd3fe8b..83f323218 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -525,7 +525,7 @@
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
@@ -1117,3 +1117,15 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86-64.cache-2
+./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86-64.cache-2
+./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86-64.cache-2
+./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-x86-64.cache-2
+./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-x86-64.cache-2
+./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-x86-64.cache-2
+./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-x86-64.cache-2
+./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-x86-64.cache-2
+./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-x86-64.cache-2
+./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-x86-64.cache-2
+./var/cache/fontconfig/f0f76015ef54ea3f0895465d59f141ef-x86-64.cache-2
+./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-x86-64.cache-2
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index d7a3256fa..7fc41b2a2 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -508,7 +508,7 @@
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 802afb827..92f97202a 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -489,7 +489,7 @@
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 90cd3fe8b..8354702b1 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -525,7 +525,7 @@
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
@@ -1117,3 +1117,15 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
+./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
+./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
+./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-x86.cache-2
+./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-x86.cache-2
+./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-x86.cache-2
+./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-x86.cache-2
+./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-x86.cache-2
+./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-x86.cache-2
+./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-x86.cache-2
+./var/cache/fontconfig/f0f76015ef54ea3f0895465d59f141ef-x86.cache-2
+./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-x86.cache-2
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 90cd3fe8b..18ec4e1d7 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -525,7 +525,7 @@
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
@@ -1117,3 +1117,15 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-ppc.cache-2
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-ppc.cache-2
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-ppc.cache-2
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-ppc.cache-2
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-ppc.cache-2
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-ppc.cache-2
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-ppc.cache-2
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-ppc.cache-2
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 903bcaa10..beaa58459 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -489,7 +489,7 @@
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 9d62b8ce6..51e2a4d19 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -468,7 +468,7 @@
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 38c2f2834..68a58dcea 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -490,7 +490,7 @@
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 1229e66ab..45cfa780a 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -525,7 +525,7 @@
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
@@ -1116,3 +1116,15 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc64.cache-2
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc64.cache-2
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc64.cache-2
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-ppc64.cache-2
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-ppc64.cache-2
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-ppc64.cache-2
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-ppc64.cache-2
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-ppc64.cache-2
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-ppc64.cache-2
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-ppc64.cache-2
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-ppc64.cache-2
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-ppc64.cache-2
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index d7a3256fa..7fc41b2a2 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -508,7 +508,7 @@
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.15.0
+./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 829f35236..265c0fdbf 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -270,3 +270,5 @@
 ./usr/X11R6/share
 ./usr/X11R6/share/X11
 ./var
+./var/cache
+./var/cache/fontconfig
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index ef73081ed..f6df13ec2 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -592,7 +592,6 @@
 ./usr/X11R6/include/freetype2
 ./usr/X11R6/include/freetype2/freetype
 ./usr/X11R6/include/freetype2/freetype/config
-./usr/X11R6/include/freetype2/freetype/config/ftconfig.h
 ./usr/X11R6/include/freetype2/freetype/config/ftheader.h
 ./usr/X11R6/include/freetype2/freetype/config/ftmodule.h
 ./usr/X11R6/include/freetype2/freetype/config/ftoption.h
@@ -665,6 +664,7 @@
 ./usr/X11R6/include/freetype2/freetype/tttables.h
 ./usr/X11R6/include/freetype2/freetype/tttags.h
 ./usr/X11R6/include/freetype2/freetype/ttunpat.h
+./usr/X11R6/include/ftconfig.h
 ./usr/X11R6/lib/X11/config
 ./usr/X11R6/lib/X11/config/Amoeba.cf
 ./usr/X11R6/lib/X11/config/DGUX.cf
@@ -2939,5 +2939,3 @@
 ./usr/local/lib
 ./usr/local/lib/X11
 ./usr/local/lib/X11/app-defaults
-./var/cache
-./var/cache/fontconfig