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

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

details:   https://anonhg.NetBSD.org/src/rev/9a5afbe3e7a1
branches:  netbsd-3
changeset: 575161:9a5afbe3e7a1
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 20:47:23 2005 +0000

description:
Pull up revision 1.3 (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/Xserver/hw/xfree86/drivers/dummy/Makefile |  4 ++--
 x11/lib/freetype2/freetype/cache/Makefile     |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 140b4f9bcf29 -r 9a5afbe3e7a1 x11/Xserver/hw/xfree86/drivers/dummy/Makefile
--- a/x11/Xserver/hw/xfree86/drivers/dummy/Makefile     Wed Apr 06 20:47:18 2005 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/dummy/Makefile     Wed Apr 06 20:47:23 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
+#      $NetBSD: Makefile,v 1.2.8.1 2005/04/06 20:47:23 tron Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
 
@@ -7,7 +7,7 @@
 MODULE=        dummy_drv
 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy
 
-SRCS=  dummy_driver.c dummy_cursor.c dummy_dga.c
+SRCS=  dummy_driver.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy \
                -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
diff -r 140b4f9bcf29 -r 9a5afbe3e7a1 x11/lib/freetype2/freetype/cache/Makefile
--- a/x11/lib/freetype2/freetype/cache/Makefile Wed Apr 06 20:47:18 2005 +0000
+++ b/x11/lib/freetype2/freetype/cache/Makefile Wed Apr 06 20:47:23 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/13 20:18:56 lukem Exp $
+#      $NetBSD: Makefile,v 1.2.8.1 2005/04/06 20:47:23 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 INCSDIR=${X11INCDIR}/freetype2/freetype/cache
 
 INCS=  ftccache.h ftccmap.h ftcglyph.h ftcimage.h ftcmanag.h \
-       ftcsbits.h ftlru.h
+       ftcsbits.h
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>