Module Name: src
Committed By: mrg
Date: Wed Jun 10 07:52:36 UTC 2009
Modified Files:
src/distrib/sets/lists/xbase: shl.elf shl.mi
src/distrib/sets/lists/xcomp: mi
Log Message:
merge libXfont 1.4.0.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xbase/shl.elf
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/xcomp/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.elf
diff -u src/distrib/sets/lists/xbase/shl.elf:1.25 src/distrib/sets/lists/xbase/shl.elf:1.26
--- src/distrib/sets/lists/xbase/shl.elf:1.25 Mon Apr 20 04:03:49 2009
+++ src/distrib/sets/lists/xbase/shl.elf Wed Jun 10 07:52:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.25 2009/04/20 04:03:49 mrg Exp $
+# $NetBSD: shl.elf,v 1.26 2009/06/10 07:52:36 mrg Exp $
./usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 -unknown- x11
./usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -unknown- x11
./usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -unknown- x11
@@ -152,7 +152,7 @@
./usr/X11R7/lib/libXfixes.so -unknown- xorg
./usr/X11R7/lib/libXfixes.so.4 -unknown- xorg
./usr/X11R7/lib/libXfont.so -unknown- xorg
-./usr/X11R7/lib/libXfont.so.2 -unknown- xorg
+./usr/X11R7/lib/libXfont.so.3 -unknown- xorg
./usr/X11R7/lib/libXfontcache.so -unknown- xorg
./usr/X11R7/lib/libXfontcache.so.2 -unknown- xorg
./usr/X11R7/lib/libXft.so -unknown- xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.31 src/distrib/sets/lists/xbase/shl.mi:1.32
--- src/distrib/sets/lists/xbase/shl.mi:1.31 Tue Jun 9 04:39:50 2009
+++ src/distrib/sets/lists/xbase/shl.mi Wed Jun 10 07:52:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.31 2009/06/09 04:39:50 mrg Exp $
+# $NetBSD: shl.mi,v 1.32 2009/06/10 07:52:36 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -76,7 +76,7 @@
./usr/X11R7/lib/libXevie.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXext.so.7.0 -unknown- xorg
./usr/X11R7/lib/libXfixes.so.4.0 -unknown- xorg
-./usr/X11R7/lib/libXfont.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libXfont.so.3.0 -unknown- xorg
./usr/X11R7/lib/libXfontcache.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXft.so.3.0 -unknown- xorg
./usr/X11R7/lib/libXi.so.7.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.93 src/distrib/sets/lists/xcomp/mi:1.94
--- src/distrib/sets/lists/xcomp/mi:1.93 Wed Jun 10 04:37:27 2009
+++ src/distrib/sets/lists/xcomp/mi Wed Jun 10 07:52:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.93 2009/06/10 04:37:27 mrg Exp $
+# $NetBSD: mi,v 1.94 2009/06/10 07:52:36 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5616,7 +5616,7 @@
./usr/X11R7/include/X11/fonts/fontenc.h -unknown- xorg
./usr/X11R7/include/X11/fonts/fontencc.h -unknown- xorg
./usr/X11R7/include/X11/fonts/fontmisc.h -unknown- xorg
-./usr/X11R7/include/X11/fonts/fontmod.h -unknown- xorg
+./usr/X11R7/include/X11/fonts/fontmod.h -obsolete- obsolete
./usr/X11R7/include/X11/fonts/fontproto.h -unknown- xorg
./usr/X11R7/include/X11/fonts/fontshow.h -unknown- xorg
./usr/X11R7/include/X11/fonts/fontstruct.h -unknown- xorg
