[src/netbsd-2-0]: src/x11/bin/xclock Pullup rev 1.4 (requested by lukem in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/ce4a1b296b7f
branches:  netbsd-2-0
changeset: 560672:ce4a1b296b7f
user:      jmc <jmc%NetBSD.org@localhost>
date:      Thu Apr 29 05:46:06 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/bin/xclock/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 850e22dfa607 -r ce4a1b296b7f x11/bin/xclock/Makefile
--- a/x11/bin/xclock/Makefile   Thu Apr 29 05:46:03 2004 +0000
+++ b/x11/bin/xclock/Makefile   Thu Apr 29 05:46:06 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:30 lukem Exp $
+#      $NetBSD: Makefile,v 1.3.2.1 2004/04/29 05:46:06 jmc Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,10 @@
 
 CPPFLAGS+=-DXRENDER -I${DESTDIR}${X11INCDIR}/freetype2
 
-APPDEFS=XClock.ad
+APPDEFS=XClock.ad XClock-color.ad
+
+BUILDSYMLINKS=  XClk-col.ad XClock-color.ad
+
 
 LDADD+=        -lXft -lfontconfig -lfreetype -lexpat -lXrender
 DPADD+=        ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}