sync

20 files changed, 19 insertions, 53 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 3b1512e1f..c469f9dc4 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 8be3551cf..ab2a8a871 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.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 a3ef83670..b2f0ff7b1 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 a3ef83670..b2f0ff7b1 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 616c3e839..6c89c5bdc 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 8d04a6d23..919d081c6 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 b3f917c84..c8453e704 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.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 a0c64d8e3..8789ae178 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 b63d97484..c2c64819d 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 170a042fb..46c0e5f6b 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 320f3ceb2..6ce455a5d 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 88dd6fe49..cd9e6bd98 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 170a042fb..46c0e5f6b 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 8c7e78479..0d9a5d98e 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.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 543737e92..4871c043e 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 24b62ada9..bd62b8db8 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 24b62ada9..bd62b8db8 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 4991f7f45..80bd1da32 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 a3ef83670..b2f0ff7b1 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.0
 ./usr/X11R6/lib/libfontconfig.so.9.0
 ./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.21.0
+./usr/X11R6/lib/libfreetype.so.21.1
 ./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 34e44af48..1ba3c6be8 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -647,41 +647,7 @@
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/freetype2/freetype/ftxf86.h
 ./usr/X11R6/include/freetype2/freetype/internal
-./usr/X11R6/include/freetype2/freetype/internal/autohint.h
-./usr/X11R6/include/freetype2/freetype/internal/ftcalc.h
-./usr/X11R6/include/freetype2/freetype/internal/ftdebug.h
-./usr/X11R6/include/freetype2/freetype/internal/ftdriver.h
-./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
-./usr/X11R6/include/freetype2/freetype/internal/fttrace.h
-./usr/X11R6/include/freetype2/freetype/internal/ftvalid.h
-./usr/X11R6/include/freetype2/freetype/internal/internal.h
-./usr/X11R6/include/freetype2/freetype/internal/psaux.h
-./usr/X11R6/include/freetype2/freetype/internal/pshints.h
 ./usr/X11R6/include/freetype2/freetype/internal/services
-./usr/X11R6/include/freetype2/freetype/internal/services/svbdf.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svcid.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svgldict.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svkern.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svmm.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svpfr.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svpostnm.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svpscmap.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svpsinfo.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svsfnt.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svttcmap.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svtteng.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svttglyf.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svwinfnt.h
-./usr/X11R6/include/freetype2/freetype/internal/services/svxf86nm.h
-./usr/X11R6/include/freetype2/freetype/internal/sfnt.h
-./usr/X11R6/include/freetype2/freetype/internal/t1types.h
-./usr/X11R6/include/freetype2/freetype/internal/tttypes.h
 ./usr/X11R6/include/freetype2/freetype/t1tables.h
 ./usr/X11R6/include/freetype2/freetype/ttnameid.h
 ./usr/X11R6/include/freetype2/freetype/tttables.h