Module Name:	src
Committed By:	lukem
Date:		Wed Apr 28 14:17:57 UTC 2004

Modified Files:
	src/distrib/sets/lists/base: mi
	src/distrib/sets/lists/xbase: mi
	src/distrib/sets/lists/xcomp: mi
	src/distrib/sets/lists/xfont: mi
	src/etc/mtree: NetBSD.dist
	src/x11: TODO
	src/x11/bin: Makefile
	src/x11/bin/xclock: Makefile
	src/x11/bin/xedit/modules/progmodes: Makefile
	src/x11/bin/xkbcomp/geometry: Makefile
	src/x11/bin/xkbcomp/symbols/pc: Makefile
	src/x11/bin/xkbcomp/symbols/sun: Makefile
	src/x11/bin/xkbcomp/types: Makefile
	src/x11/lib/XRes: Makefile
	src/x11/lib/Xfontcache: Makefile
	src/x11/lib/Xss: Makefile
	src/x11/lib/Xxf86dga: Makefile
	src/x11/lib/expat: Makefile
	src/x11/lib/fontconfig: Makefile
	src/x11/lib/freetype2: Makefile
	src/x11/share/fonts/encodings: Makefile
	src/x11/share/fonts/scaled/TTF: Makefile
	src/x11/share/nls/XI18N_OBJS: Makefile
	src/x11/share/nls/XLC_LOCALE: Makefile
	src/x11/tools/fc-cache: Makefile
Added Files:
	src/x11/bin/fonttosfnt: Makefile
	src/x11/bin/xkbcomp/geometry/ibm: Makefile
Removed Files:
	src/x11/lib/expat: Makefile.expatdefs

Log Message:
Fix up botches in X userland from upgrade from XFree86 4.3.0 -> 4.4.0.
(All paths are relative to usr/X11R6)

* Obsolete:
	bin/fontconfig-config

* Add directories:
	lib/X11/locale/zh_CN.UTF-8
	lib/X11/xkb/geometry/ibm

* Rename include/freetype2/ft2build.h to include/ft2build.h and obsolete former

* Add files:
	fonttosfnt(1) program & man page
	include/expat.h
	lib/X11/app-defaults/XClock-color
	lib/X11/fonts/TTF/Vera*.ttf
	some font encodings
	zn_CN.UTF-8 locale
	some font encodings
	various xkb config files
	lib/X11/xedit/lisp/progmodes/patch.lsp
	Xfontcache(3) and various links
	XDGA(3) and various links
	XRes(3) and various links
	Xss(3) and various XScreenSaver*(3) links

* Add some more TODO items

* Clean up lib/expat build now that the version is hard coded.


To generate a diff of this commit:
cvs rdiff -r1.473 -r1.474 src/distrib/sets/lists/base/mi
cvs rdiff -r1.40 -r1.41 src/distrib/sets/lists/xbase/mi
cvs rdiff -r1.23 -r1.24 src/distrib/sets/lists/xcomp/mi
cvs rdiff -r1.19 -r1.20 src/distrib/sets/lists/xfont/mi
cvs rdiff -r1.259 -r1.260 src/etc/mtree/NetBSD.dist
cvs rdiff -r1.9 -r1.10 src/x11/TODO
cvs rdiff -r1.5 -r1.6 src/x11/bin/Makefile
cvs rdiff -r0 -r1.1 src/x11/bin/fonttosfnt/Makefile
cvs rdiff -r1.3 -r1.4 src/x11/bin/xclock/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/bin/xedit/modules/progmodes/Makefile
cvs rdiff -r1.3 -r1.4 src/x11/bin/xkbcomp/geometry/Makefile
cvs rdiff -r0 -r1.1 src/x11/bin/xkbcomp/geometry/ibm/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/bin/xkbcomp/symbols/pc/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/bin/xkbcomp/symbols/sun/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/bin/xkbcomp/types/Makefile
cvs rdiff -r1.3 -r1.4 src/x11/lib/XRes/Makefile
cvs rdiff -r1.3 -r1.4 src/x11/lib/Xfontcache/Makefile
cvs rdiff -r1.4 -r1.5 src/x11/lib/Xss/Makefile
cvs rdiff -r1.4 -r1.5 src/x11/lib/Xxf86dga/Makefile
cvs rdiff -r1.6 -r1.7 src/x11/lib/expat/Makefile
cvs rdiff -r1.1 -r0 src/x11/lib/expat/Makefile.expatdefs
cvs rdiff -r1.7 -r1.8 src/x11/lib/fontconfig/Makefile
cvs rdiff -r1.5 -r1.6 src/x11/lib/freetype2/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/share/fonts/encodings/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/share/fonts/scaled/TTF/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/share/nls/XI18N_OBJS/Makefile
cvs rdiff -r1.3 -r1.4 src/x11/share/nls/XLC_LOCALE/Makefile
cvs rdiff -r1.7 -r1.8 src/x11/tools/fc-cache/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.