sync

21 files changed, 70 insertions, 71 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index e6262ec93..b93f2d4f1 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 1a590a792..7581af3b8 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -140,7 +140,7 @@
 ./usr/X11R6/lib/libdrm_intel.so.3.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index b3c74160a..329cab7b5 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -130,7 +130,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index b3c74160a..329cab7b5 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -130,7 +130,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.aviion b/distrib/sets/lists/xbase/md.aviion
index a61b3fa1a..530def08d 100644
--- a/distrib/sets/lists/xbase/md.aviion
+++ b/distrib/sets/lists/xbase/md.aviion
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index eb22a0d04..1deedf827 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -120,7 +120,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 82e271ea0..ad432669c 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -93,7 +93,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 22d468f01..cdbf16e6c 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -140,7 +140,7 @@
 ./usr/X11R6/lib/libdrm_intel.so.3.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 91fcb21f6..23461be20 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -93,7 +93,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index c49bd6cd2..34f3991a5 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -131,7 +131,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index a61b3fa1a..530def08d 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 7b3017725..cfd0e7e8d 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -131,7 +131,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 018918e33..356f9bec6 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index a61b3fa1a..530def08d 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index 1d96a5aab..bc95f835a 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -40,7 +40,7 @@
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index d77f45147..a3abaf673 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -131,7 +131,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index f6b31e59c..a05d70782 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -130,7 +130,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index f6b31e59c..a05d70782 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -130,7 +130,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index ba7def8f0..964907d5d 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -131,7 +131,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index b3c74160a..329cab7b5 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -130,7 +130,7 @@
 ./usr/X11R6/lib/libdrm.so.4.1
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.1
+./usr/X11R6/lib/libfreetype.so.22.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index dd2310e6e..61b661573 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -601,57 +601,56 @@
 ./usr/X11R6/include/fontconfig/fcprivate.h
 ./usr/X11R6/include/fontconfig/fontconfig.h
 ./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
-./usr/X11R6/include/freetype2/freetype/config/ftstdlib.h
-./usr/X11R6/include/freetype2/freetype/freetype.h
-./usr/X11R6/include/freetype2/freetype/ftadvanc.h
-./usr/X11R6/include/freetype2/freetype/ftbbox.h
-./usr/X11R6/include/freetype2/freetype/ftbdf.h
-./usr/X11R6/include/freetype2/freetype/ftbitmap.h
-./usr/X11R6/include/freetype2/freetype/ftbzip2.h
-./usr/X11R6/include/freetype2/freetype/ftcache.h
-./usr/X11R6/include/freetype2/freetype/ftcffdrv.h
-./usr/X11R6/include/freetype2/freetype/ftchapters.h
-./usr/X11R6/include/freetype2/freetype/ftcid.h
-./usr/X11R6/include/freetype2/freetype/fterrdef.h
-./usr/X11R6/include/freetype2/freetype/fterrors.h
-./usr/X11R6/include/freetype2/freetype/ftgasp.h
-./usr/X11R6/include/freetype2/freetype/ftglyph.h
-./usr/X11R6/include/freetype2/freetype/ftgxval.h
-./usr/X11R6/include/freetype2/freetype/ftgzip.h
-./usr/X11R6/include/freetype2/freetype/ftimage.h
-./usr/X11R6/include/freetype2/freetype/ftincrem.h
-./usr/X11R6/include/freetype2/freetype/ftlcdfil.h
-./usr/X11R6/include/freetype2/freetype/ftlist.h
-./usr/X11R6/include/freetype2/freetype/ftlzw.h
-./usr/X11R6/include/freetype2/freetype/ftmac.h
-./usr/X11R6/include/freetype2/freetype/ftmm.h
-./usr/X11R6/include/freetype2/freetype/ftmodapi.h
-./usr/X11R6/include/freetype2/freetype/ftmoderr.h
-./usr/X11R6/include/freetype2/freetype/ftotval.h
-./usr/X11R6/include/freetype2/freetype/ftoutln.h
-./usr/X11R6/include/freetype2/freetype/ftpfr.h
-./usr/X11R6/include/freetype2/freetype/ftrender.h
-./usr/X11R6/include/freetype2/freetype/ftsizes.h
-./usr/X11R6/include/freetype2/freetype/ftsnames.h
-./usr/X11R6/include/freetype2/freetype/ftstroke.h
-./usr/X11R6/include/freetype2/freetype/ftsynth.h
-./usr/X11R6/include/freetype2/freetype/ftsystem.h
-./usr/X11R6/include/freetype2/freetype/fttrigon.h
-./usr/X11R6/include/freetype2/freetype/fttypes.h
-./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
-./usr/X11R6/include/freetype2/freetype/ftxf86.h
-./usr/X11R6/include/freetype2/freetype/t1tables.h
-./usr/X11R6/include/freetype2/freetype/ttnameid.h
-./usr/X11R6/include/freetype2/freetype/tttables.h
-./usr/X11R6/include/freetype2/freetype/tttags.h
-./usr/X11R6/include/freetype2/freetype/ttunpat.h
-./usr/X11R6/include/ft2build.h
+./usr/X11R6/include/freetype2/config
+./usr/X11R6/include/freetype2/config/ftconfig.h
+./usr/X11R6/include/freetype2/config/ftheader.h
+./usr/X11R6/include/freetype2/config/ftmodule.h
+./usr/X11R6/include/freetype2/config/ftoption.h
+./usr/X11R6/include/freetype2/config/ftstdlib.h
+./usr/X11R6/include/freetype2/freetype.h
+./usr/X11R6/include/freetype2/ft2build.h
+./usr/X11R6/include/freetype2/ftadvanc.h
+./usr/X11R6/include/freetype2/ftbbox.h
+./usr/X11R6/include/freetype2/ftbdf.h
+./usr/X11R6/include/freetype2/ftbitmap.h
+./usr/X11R6/include/freetype2/ftbzip2.h
+./usr/X11R6/include/freetype2/ftcache.h
+./usr/X11R6/include/freetype2/ftcffdrv.h
+./usr/X11R6/include/freetype2/ftchapters.h
+./usr/X11R6/include/freetype2/ftcid.h
+./usr/X11R6/include/freetype2/fterrdef.h
+./usr/X11R6/include/freetype2/fterrors.h
+./usr/X11R6/include/freetype2/ftgasp.h
+./usr/X11R6/include/freetype2/ftglyph.h
+./usr/X11R6/include/freetype2/ftgxval.h
+./usr/X11R6/include/freetype2/ftgzip.h
+./usr/X11R6/include/freetype2/ftimage.h
+./usr/X11R6/include/freetype2/ftincrem.h
+./usr/X11R6/include/freetype2/ftlcdfil.h
+./usr/X11R6/include/freetype2/ftlist.h
+./usr/X11R6/include/freetype2/ftlzw.h
+./usr/X11R6/include/freetype2/ftmac.h
+./usr/X11R6/include/freetype2/ftmm.h
+./usr/X11R6/include/freetype2/ftmodapi.h
+./usr/X11R6/include/freetype2/ftmoderr.h
+./usr/X11R6/include/freetype2/ftotval.h
+./usr/X11R6/include/freetype2/ftoutln.h
+./usr/X11R6/include/freetype2/ftpfr.h
+./usr/X11R6/include/freetype2/ftrender.h
+./usr/X11R6/include/freetype2/ftsizes.h
+./usr/X11R6/include/freetype2/ftsnames.h
+./usr/X11R6/include/freetype2/ftstroke.h
+./usr/X11R6/include/freetype2/ftsynth.h
+./usr/X11R6/include/freetype2/ftsystem.h
+./usr/X11R6/include/freetype2/fttrigon.h
+./usr/X11R6/include/freetype2/fttypes.h
+./usr/X11R6/include/freetype2/ftwinfnt.h
+./usr/X11R6/include/freetype2/ftxf86.h
+./usr/X11R6/include/freetype2/t1tables.h
+./usr/X11R6/include/freetype2/ttnameid.h
+./usr/X11R6/include/freetype2/tttables.h
+./usr/X11R6/include/freetype2/tttags.h
+./usr/X11R6/include/freetype2/ttunpat.h
 ./usr/X11R6/include/pciaccess.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h