[src/netbsd-3]: src/x11 Pull up revision 1.9 (requested by jmc in ticket #114):

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

details:   https://anonhg.NetBSD.org/src/rev/4e250f30fcc2
branches:  netbsd-3
changeset: 575168:4e250f30fcc2
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 20:52:27 2005 +0000

description:
Pull up revision 1.9 (requested by jmc in ticket #114):
Adjust for the latest XFree86 import. Code now compiles, but libraries
might be incomplete and sets are definitely still broken.

diffstat:

 x11/lib/font/Makefile       |  4 ++--
 x11/lib/freetype2/Makefile  |  5 +++--
 x11/tools/fc-cache/Makefile |  5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (70 lines):

diff -r 084557d75c02 -r 4e250f30fcc2 x11/lib/font/Makefile
--- a/x11/lib/font/Makefile     Wed Apr 06 20:52:22 2005 +0000
+++ b/x11/lib/font/Makefile     Wed Apr 06 20:52:27 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2004/04/05 12:03:25 lukem Exp $
+#      $NetBSD: Makefile,v 1.8.4.1 2005/04/06 20:52:27 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -168,7 +168,7 @@
                ${SRCS.FreeType} ${SRCS.X-TrueType} ${SRCS.builtins} \
                ${SRCS.util}
 
-SUBDIR=        stubs xtt
+SUBDIR=        stubs
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 084557d75c02 -r 4e250f30fcc2 x11/lib/freetype2/Makefile
--- a/x11/lib/freetype2/Makefile        Wed Apr 06 20:52:22 2005 +0000
+++ b/x11/lib/freetype2/Makefile        Wed Apr 06 20:52:27 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2005/01/21 05:15:36 rtr Exp $
+#      $NetBSD: Makefile,v 1.8.2.1 2005/04/06 20:52:28 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@
 SUBDIR=        freetype
 
 SRCS=  ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
-       ftinit.c ftmm.c ftpfr.c ftstroker.c ftsynth.c ftsystem.c \
+       ftinit.c ftlzw.c ftmm.c ftpfr.c ftsynth.c ftsystem.c \
        fttype1.c ftwinfnt.c ftxf86.c autohint.c bdf.c cff.c \
        type1cid.c ftgzip.c pcf.c pfr.c psaux.c pshinter.c psnames.c \
        raster.c sfnt.c smooth.c truetype.c type1.c type42.c winfnt.c
@@ -32,6 +32,7 @@
 .PATH: ${FREETYPESRC}/cff
 .PATH: ${FREETYPESRC}/cid
 .PATH: ${FREETYPESRC}/gzip
+.PATH: ${FREETYPESRC}/lzw
 .PATH: ${FREETYPESRC}/pcf
 .PATH: ${FREETYPESRC}/pfr
 .PATH: ${FREETYPESRC}/psaux
diff -r 084557d75c02 -r 4e250f30fcc2 x11/tools/fc-cache/Makefile
--- a/x11/tools/fc-cache/Makefile       Wed Apr 06 20:52:22 2005 +0000
+++ b/x11/tools/fc-cache/Makefile       Wed Apr 06 20:52:27 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2004/04/28 14:17:57 lukem Exp $
+#      $NetBSD: Makefile,v 1.8.4.1 2005/04/06 20:52:28 tron Exp $
 
 NOMAN=         1
 
@@ -25,6 +25,7 @@
 .PATH:         ${FREETYPESRC}/cff
 .PATH:         ${FREETYPESRC}/cid
 .PATH:         ${FREETYPESRC}/gzip
+.PATH:         ${FREETYPESRC}/lzw
 .PATH:         ${FREETYPESRC}/pcf
 .PATH:         ${FREETYPESRC}/pfr
 .PATH:         ${FREETYPESRC}/psaux
@@ -41,7 +42,7 @@
                ftglyph.c ftinit.c ftmm.c ftsynth.c ftsystem.c fttype1.c \
                ftxf86.c pcf.c pfr.c psaux.c pshinter.c psnames.c raster.c \
                sfnt.c smooth.c truetype.c type1.c type1cid.c type42.c \
-               winfnt.c ftgzip.c
+               winfnt.c ftgzip.c ftlzw.c
 
 .PATH:         ${X11SRCDIR.xc}/extras/expat/lib
 SRCS+=         xmlparse.c xmlrole.c xmltok.c