From 267655c110394fb5fd46b353508a764f8e89db51 Mon Sep 17 00:00:00 2001 From: todd Date: Mon, 10 Sep 2007 02:27:00 +0000 Subject: [PATCH] sync --- distrib/sets/lists/xbase/md.alpha | 4 ++-- distrib/sets/lists/xbase/md.amd64 | 4 ++-- distrib/sets/lists/xbase/md.armish | 4 ++-- distrib/sets/lists/xbase/md.hppa | 4 ++-- distrib/sets/lists/xbase/md.i386 | 4 ++-- distrib/sets/lists/xbase/md.macppc | 4 ++-- distrib/sets/lists/xbase/md.mvme68k | 4 ++-- distrib/sets/lists/xbase/md.sparc | 4 ++-- distrib/sets/lists/xbase/md.sparc64 | 4 ++-- distrib/sets/lists/xbase/md.vax | 4 ++-- distrib/sets/lists/xbase/md.zaurus | 4 ++-- distrib/sets/lists/xserv/md.vax | 2 +- distrib/sets/lists/xshare/mi | 3 +++ 13 files changed, 26 insertions(+), 23 deletions(-) diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha index 5a9816d86..56ee2f930 100644 --- a/distrib/sets/lists/xbase/md.alpha +++ b/distrib/sets/lists/xbase/md.alpha @@ -496,7 +496,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -527,7 +527,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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.amd64 b/distrib/sets/lists/xbase/md.amd64 index 5a9816d86..56ee2f930 100644 --- a/distrib/sets/lists/xbase/md.amd64 +++ b/distrib/sets/lists/xbase/md.amd64 @@ -496,7 +496,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -527,7 +527,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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.armish b/distrib/sets/lists/xbase/md.armish index c0a0e6643..b267dee84 100644 --- a/distrib/sets/lists/xbase/md.armish +++ b/distrib/sets/lists/xbase/md.armish @@ -481,7 +481,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -510,7 +510,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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 6f7e0d7d6..258d4f275 100644 --- a/distrib/sets/lists/xbase/md.hppa +++ b/distrib/sets/lists/xbase/md.hppa @@ -462,7 +462,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -491,7 +491,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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 5a9816d86..56ee2f930 100644 --- a/distrib/sets/lists/xbase/md.i386 +++ b/distrib/sets/lists/xbase/md.i386 @@ -496,7 +496,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -527,7 +527,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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.macppc b/distrib/sets/lists/xbase/md.macppc index 5a9816d86..56ee2f930 100644 --- a/distrib/sets/lists/xbase/md.macppc +++ b/distrib/sets/lists/xbase/md.macppc @@ -496,7 +496,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -527,7 +527,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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.mvme68k b/distrib/sets/lists/xbase/md.mvme68k index b241eba8a..8583b02c0 100644 --- a/distrib/sets/lists/xbase/md.mvme68k +++ b/distrib/sets/lists/xbase/md.mvme68k @@ -462,7 +462,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -491,7 +491,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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.sparc b/distrib/sets/lists/xbase/md.sparc index ea76c2418..4df891ac7 100644 --- a/distrib/sets/lists/xbase/md.sparc +++ b/distrib/sets/lists/xbase/md.sparc @@ -463,7 +463,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -492,7 +492,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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 6a64eaf40..708983172 100644 --- a/distrib/sets/lists/xbase/md.sparc64 +++ b/distrib/sets/lists/xbase/md.sparc64 @@ -496,7 +496,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -527,7 +527,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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.vax b/distrib/sets/lists/xbase/md.vax index d12fae273..d5f9c2d3a 100644 --- a/distrib/sets/lists/xbase/md.vax +++ b/distrib/sets/lists/xbase/md.vax @@ -248,6 +248,7 @@ ./etc/X11/xkb/symbols/mk ./etc/X11/xkb/symbols/ml ./etc/X11/xkb/symbols/mm +./etc/X11/xkb/symbols/mn ./etc/X11/xkb/symbols/mt ./etc/X11/xkb/symbols/mt_us ./etc/X11/xkb/symbols/nec @@ -391,6 +392,7 @@ ./etc/X11/xkb/types.dir ./etc/X11/xkb/types/README ./etc/X11/xkb/types/basic +./etc/X11/xkb/types/cancel ./etc/X11/xkb/types/caps ./etc/X11/xkb/types/complete ./etc/X11/xkb/types/default @@ -1002,5 +1004,3 @@ ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 ./usr/X11R6/man/man3/XFree86-DGA.3 ./usr/X11R6/man/man7/Xprint.7 -./etc/X11/xkb/symbols/mn -./etc/X11/xkb/types/cancel diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus index c0a0e6643..b267dee84 100644 --- a/distrib/sets/lists/xbase/md.zaurus +++ b/distrib/sets/lists/xbase/md.zaurus @@ -481,7 +481,7 @@ ./usr/X11R6/lib/libXevie.so.2.0 ./usr/X11R6/lib/libXext.so.10.0 ./usr/X11R6/lib/libXfixes.so.5.0 -./usr/X11R6/lib/libXfont.so.6.0 +./usr/X11R6/lib/libXfont.so.7.0 ./usr/X11R6/lib/libXfontcache.so.4.0 ./usr/X11R6/lib/libXft.so.7.0 ./usr/X11R6/lib/libXi.so.10.0 @@ -510,7 +510,7 @@ ./usr/X11R6/lib/libexpat_pic.a ./usr/X11R6/lib/libfontconfig.so.5.1 ./usr/X11R6/lib/libfontenc.so.3.0 -./usr/X11R6/lib/libfreetype.so.14.0 +./usr/X11R6/lib/libfreetype.so.15.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/xserv/md.vax b/distrib/sets/lists/xserv/md.vax index b353ec43c..63fddb7e9 100644 --- a/distrib/sets/lists/xserv/md.vax +++ b/distrib/sets/lists/xserv/md.vax @@ -8,6 +8,7 @@ ./usr/X11R6/lib/modules/linux ./usr/X11R6/lib/modules/multimedia ./usr/X11R6/lib/xserver +./usr/X11R6/lib/xserver/SecurityPolicy ./usr/X11R6/man/man1/Xnest.1 ./usr/X11R6/man/man1/Xserver.1 ./usr/X11R6/man/man1/Xvfb.1 @@ -40,4 +41,3 @@ ./var/db ./var/db/xkb ./var/db/xkb/README.compiled -./usr/X11R6/lib/xserver/SecurityPolicy diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi index c26356711..cf059c236 100644 --- a/distrib/sets/lists/xshare/mi +++ b/distrib/sets/lists/xshare/mi @@ -607,8 +607,10 @@ ./usr/X11R6/include/freetype2/freetype/ftchapters.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/ftimage.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 @@ -654,6 +656,7 @@ ./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