[src/netbsd-2-0]: src/x11/lib Pullup rev 1.5 (requested by lukem in ticket #224)

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

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

description:
Pullup rev 1.5 (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/lib/Xss/Makefile      |  14 +++++++++++++-
 x11/lib/Xxf86dga/Makefile |  24 +++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r 2a3a45708793 -r c61e8a0b7111 x11/lib/Xss/Makefile
--- a/x11/lib/Xss/Makefile      Thu Apr 29 05:46:27 2004 +0000
+++ b/x11/lib/Xss/Makefile      Thu Apr 29 05:46:33 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2003/10/24 13:10:53 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.4.2.1 2004/04/29 05:46:33 jmc Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,18 @@
 
 SRCS=  XScrnSaver.c
 
+MAN=   Xss.3
+MLINKS=        Xss.3 XScreenSaverAllocInfo.3 \
+       Xss.3 XScreenSaverGetRegistered.3 \
+       Xss.3 XScreenSaverQueryExtension.3 \
+       Xss.3 XScreenSaverQueryInfo.3 \
+       Xss.3 XScreenSaverQueryVersion.3 \
+       Xss.3 XScreenSaverRegister.3 \
+       Xss.3 XScreenSaverSelectInput.3 \
+       Xss.3 XScreenSaverSetAttributes.3 \
+       Xss.3 XScreenSaverUnregister.3 \
+       Xss.3 XScreenSaverUnsetAttributes.3
+
 LDADD+=        -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
diff -r 2a3a45708793 -r c61e8a0b7111 x11/lib/Xxf86dga/Makefile
--- a/x11/lib/Xxf86dga/Makefile Thu Apr 29 05:46:27 2004 +0000
+++ b/x11/lib/Xxf86dga/Makefile Thu Apr 29 05:46:33 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2004/03/06 03:05:39 rtr Exp $
+#      $NetBSD: Makefile,v 1.4.2.1 2004/04/29 05:46:36 jmc Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,28 @@
 
 SRCS=  XF86DGA.c XF86DGA2.c
 
+MAN=   XDGA.3
+MLINKS=        XDGA.3 XF86DGA.3 \
+       XDGA.3 XFree86-DGA.3 \
+       XDGA.3 XDGAChangePixmapMode.3 \
+       XDGA.3 XDGACloseFramebuffer.3 \
+       XDGA.3 XDGACopyArea.3 \
+       XDGA.3 XDGACopyTransparentArea.3 \
+       XDGA.3 XDGACreateColormap.3 \
+       XDGA.3 XDGAFillRectangle.3 \
+       XDGA.3 XDGAGetViewportStatus.3 \
+       XDGA.3 XDGAInstallColormap.3 \
+       XDGA.3 XDGAKeyEventToXKeyEvent.3 \
+       XDGA.3 XDGAOpenFramebuffer.3 \
+       XDGA.3 XDGAQueryExtension.3 \
+       XDGA.3 XDGAQueryModes.3 \
+       XDGA.3 XDGAQueryVersion.3 \
+       XDGA.3 XDGASelectInput.3 \
+       XDGA.3 XDGASetClientVersion.3 \
+       XDGA.3 XDGASetMode.3 \
+       XDGA.3 XDGASetViewport.3 \
+       XDGA.3 XDGASync.3
+
 CPPFLAGS+=     ${X11FLAGS.THREADLIB}
 
 CPPFLAGS.XF86DGA2.c=   -Wno-error      # gcc3