5 files changed, 211 insertions, 200 deletions
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index af82d8114..99fa46d8e 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -143,18 +143,18 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.2.4
+./usr/X11R6/lib/libdrm.so.2.5
 ./usr/X11R6/lib/libdrm_intel.a
-./usr/X11R6/lib/libdrm_intel.so.1.1
+./usr/X11R6/lib/libdrm_intel.so.1.2
 ./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
-./usr/X11R6/lib/libfontconfig.so.6.0
+./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.0
+./usr/X11R6/lib/libfreetype.so.17.1
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
-./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpixman-1.so.16.6
 ./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
@@ -379,14 +379,14 @@
 ./usr/X11R6/share/xcb/xtest.xml
 ./usr/X11R6/share/xcb/xv.xml
 ./usr/X11R6/share/xcb/xvmc.xml
-./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/f22309b238134d3cca63435f528976cd-x86-64.cache-2
+./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/mi b/distrib/sets/lists/xbase/mi
index b6e92d5de..ba901013d 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -423,6 +423,8 @@
 ./usr/X11R6/bin/fc-cat
 ./usr/X11R6/bin/fc-list
 ./usr/X11R6/bin/fc-match
+./usr/X11R6/bin/fc-query
+./usr/X11R6/bin/fc-scan
 ./usr/X11R6/bin/fontname.sh
 ./usr/X11R6/bin/fontprop.sh
 ./usr/X11R6/bin/fonttosfnt
diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi
index 7ff838bfd..262274c62 100644
--- a/distrib/sets/lists/xetc/mi
+++ b/distrib/sets/lists/xetc/mi
@@ -9,6 +9,7 @@
 ./etc/X11/app-defaults/SshAskpass
 ./etc/X11/app-defaults/UXTerm
 ./etc/X11/app-defaults/Viewres
+./etc/X11/app-defaults/Viewres-color
 ./etc/X11/app-defaults/XCalc
 ./etc/X11/app-defaults/XCalc-color
 ./etc/X11/app-defaults/XClipboard
@@ -28,6 +29,7 @@
 ./etc/X11/app-defaults/Xedit-color
 ./etc/X11/app-defaults/Xfd
 ./etc/X11/app-defaults/Xgc
+./etc/X11/app-defaults/Xgc-color
 ./etc/X11/app-defaults/Xmag
 ./etc/X11/app-defaults/Xman
 ./etc/X11/app-defaults/Xmessage
diff --git a/distrib/sets/lists/xfont/md.x11r7 b/distrib/sets/lists/xfont/md.x11r7
index 9892051fb..c821ea556 100644
--- a/distrib/sets/lists/xfont/md.x11r7
+++ b/distrib/sets/lists/xfont/md.x11r7
@@ -3843,16 +3843,6 @@
 ./usr/X11R6/lib/X11/fonts/TTF/DejaVuSerifCondensed-Italic.ttf
 ./usr/X11R6/lib/X11/fonts/TTF/DejaVuSerifCondensed.ttf
 ./usr/X11R6/lib/X11/fonts/TTF/GohaTibebZemen.ttf
-./usr/X11R6/lib/X11/fonts/TTF/Vera.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraBI.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraBd.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraIt.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraMoBI.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraMoBd.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraMoIt.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraMono.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraSe.ttf
-./usr/X11R6/lib/X11/fonts/TTF/VeraSeBd.ttf
 ./usr/X11R6/lib/X11/fonts/TTF/fonts.dir
 ./usr/X11R6/lib/X11/fonts/TTF/fonts.scale
 ./usr/X11R6/lib/X11/fonts/TTF/luximb.ttf
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index a305d8dc8..beaa8a758 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -631,6 +631,7 @@
 ./usr/X11R6/include/freetype2/freetype/internal/ftgloadr.h
 ./usr/X11R6/include/freetype2/freetype/internal/ftmemory.h
 ./usr/X11R6/include/freetype2/freetype/internal/ftobjs.h
+./usr/X11R6/include/freetype2/freetype/internal/ftpic.h
 ./usr/X11R6/include/freetype2/freetype/internal/ftrfork.h
 ./usr/X11R6/include/freetype2/freetype/internal/ftserv.h
 ./usr/X11R6/include/freetype2/freetype/internal/ftstream.h
@@ -873,6 +874,7 @@
 ./usr/X11R6/lib/pkgconfig/xkbui.pc
 ./usr/X11R6/lib/pkgconfig/xmu.pc
 ./usr/X11R6/lib/pkgconfig/xmuu.pc
+./usr/X11R6/lib/pkgconfig/xorg-macros.pc
 ./usr/X11R6/lib/pkgconfig/xp.pc
 ./usr/X11R6/lib/pkgconfig/xpm.pc
 ./usr/X11R6/lib/pkgconfig/xprintapputil.pc
@@ -938,6 +940,8 @@
 ./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-query.1
+./usr/X11R6/man/man1/fc-scan.1
 ./usr/X11R6/man/man1/fonttosfnt.1
 ./usr/X11R6/man/man1/fslsfonts.1
 ./usr/X11R6/man/man1/fstobdf.1
@@ -1115,6 +1119,7 @@
 ./usr/X11R6/man/man3/FcCharSetIntersect.3
 ./usr/X11R6/man/man3/FcCharSetIntersectCount.3
 ./usr/X11R6/man/man3/FcCharSetIsSubset.3
+./usr/X11R6/man/man3/FcCharSetMerge.3
 ./usr/X11R6/man/man3/FcCharSetNew.3
 ./usr/X11R6/man/man3/FcCharSetNextPage.3
 ./usr/X11R6/man/man3/FcCharSetSubtract.3
@@ -1139,6 +1144,7 @@
 ./usr/X11R6/man/man3/FcConfigGetRescanInterval.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/FcConfigSubstitute.3
@@ -1190,6 +1196,7 @@
 ./usr/X11R6/man/man3/FcLangSetCreate.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/FcMatrixCopy.3
@@ -1222,6 +1229,8 @@
 ./usr/X11R6/man/man3/FcPatternDuplicate.3
 ./usr/X11R6/man/man3/FcPatternEqual.3
 ./usr/X11R6/man/man3/FcPatternEqualSubset.3
+./usr/X11R6/man/man3/FcPatternFilter.3
+./usr/X11R6/man/man3/FcPatternFormat.3
 ./usr/X11R6/man/man3/FcPatternGet-Type.3
 ./usr/X11R6/man/man3/FcPatternGet.3
 ./usr/X11R6/man/man3/FcPatternHash.3
@@ -2848,180 +2857,186 @@
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel.pdf
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel.txt
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/index.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1034.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1056.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r108.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1099.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1127.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1148.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1171.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1192.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1237.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1260.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1283.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r129.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1309.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1336.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1367.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1389.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1412.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1434.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1460.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1482.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r150.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1505.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1529.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1552.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1577.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1602.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1627.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1652.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1677.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1699.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r171.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1724.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1749.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1774.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1801.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1829.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1858.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1883.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1905.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r192.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1927.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1950.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r1976.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2002.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2032.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2057.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2081.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2110.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r213.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2131.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2155.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2178.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2201.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2227.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2256.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2286.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2316.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r234.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2349.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2370.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2391.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2413.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2434.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2456.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2478.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2501.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2522.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2544.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2566.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r258.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2588.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2609.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2631.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2655.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2676.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2698.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2721.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2744.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2767.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2788.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r279.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2817.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2842.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2873.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2911.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2942.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2969.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r2993.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r301.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3021.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3045.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3069.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3094.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3118.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3142.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3164.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3192.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3213.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r323.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3234.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3257.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3283.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3305.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3327.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3349.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3371.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3393.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3414.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3435.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r344.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3460.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3496.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3518.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3553.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3581.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3607.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3629.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3656.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3683.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r369.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3708.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3733.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3755.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3778.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3805.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3827.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3852.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3873.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3898.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3923.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3948.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r397.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3973.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r3999.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4021.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4043.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4065.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4090.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4119.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4144.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4176.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r418.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4209.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4245.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4267.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4289.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4311.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4334.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4356.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4380.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4405.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4430.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4457.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r446.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4484.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4509.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4530.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r4552.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r475.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r570.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r600.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r707.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r759.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r782.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r807.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r828.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r856.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r878.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r902.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r923.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r944.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r967.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/r999.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomiclock.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicnewfile.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicorigfile.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicreplaceorig.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicunlock.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcblanksadd.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcblankscreate.html
+./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/fccachedir.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachenumfont.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccachesubdir.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetaddchar.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html
+./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/fccharsetdestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetequal.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetnew.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fccharsetunion.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigdestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigenablehome.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfigfilename.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetblanks.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html
+./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/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/fcconfigsubstitute.html
+./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/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/fcdircacheunlink.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdirsave.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcdirscan.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfileisdir.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfilescan.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfini.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontlist.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontmatch.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontrenderprepare.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetadd.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetcreate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetdestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetlist.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetmatch.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetprint.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetsort.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsetsortdestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfontsort.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html
+./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/fcgetlangs.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcgetversion.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcinit.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html
+./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/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/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/fcmatrixcopy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixmultiply.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixrotate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixscale.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcmatrixshear.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnameconstant.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnameparse.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnameunparse.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcobjectsetdestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternadd-type.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternadd.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternaddweak.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternbuild.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatterncreate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatterndel.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatterndestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternequal.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternformat.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternget.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternhash.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrcopy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrcopyfilename.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrdirname.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrdowncase.html
+./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/fcstrlistnext.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrplus.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetaddfilename.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetcreate.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetdel.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetdestroy.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetequal.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrsetmember.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrstr.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrstrignorecase.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fctolower.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcucs4toutf8.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcutf16len.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcutf16toucs4.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcutf8len.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcutf8toucs4.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html
+./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
@@ -3042,6 +3057,8 @@
 ./usr/X11R6/share/mk/bsd.xconf.mk
 ./usr/X11R6/share/mk/bsd.xorg.mk
 ./usr/X11R6/share/pci.ids
+./usr/X11R6/share/util-macros
+./usr/X11R6/share/util-macros/INSTALL
 ./usr/local
 ./usr/local/lib
 ./usr/local/lib/X11