[src/netbsd-2-0]: src/x11/share/nls/XLC_LOCALE Pullup rev 1.4 (requested by l...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81ca18f03657
branches:  netbsd-2-0
changeset: 560684:81ca18f03657
user:      jmc <jmc%NetBSD.org@localhost>
date:      Thu Apr 29 05:46:56 2004 +0000

description:
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.

diffstat:

 x11/share/nls/XLC_LOCALE/Makefile |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 49c743b09871 -r 81ca18f03657 x11/share/nls/XLC_LOCALE/Makefile
--- a/x11/share/nls/XLC_LOCALE/Makefile Thu Apr 29 05:46:48 2004 +0000
+++ b/x11/share/nls/XLC_LOCALE/Makefile Thu Apr 29 05:46:56 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/11/08 13:57:30 lukem Exp $
+#      $NetBSD: Makefile,v 1.3.2.1 2004/04/29 05:46:56 jmc Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,8 @@
        iso8859-15 ja ja.JIS ja.SJIS ja_JP.UTF-8 ko ko_KR.UTF-8 \
        koi8-c koi8-r koi8-u microsoft-cp1251 microsoft-cp1255 \
        microsoft-cp1256 mulelao-1 nokhchi-1 tatar-cyr th_TH \
-       th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii zh_CN zh_CN.gbk \
+       th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \
+       zh_CN zh_CN.UTF-8 zh_CN.gbk \
        zh_HK.big5 zh_HK.big5hkscs zh_TW zh_TW.UTF-8 zh_TW.big5
 
 FILESNAME=     XLC_LOCALE