Module Name:	src
Committed By:	jmc
Date:		Thu Apr 29 05:46:06 UTC 2004

Modified Files:
	src/x11/bin/xclock [netbsd-2-0]: Makefile

Log Message:
Pullup rev 1.4 (requested by lukem in ticket #224)

Fix up botches in X userland from upgrade from XFree86 4.3.0 -> 4.4.0.
* 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.3 -r1.3.2.1 src/x11/bin/xclock/Makefile

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