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

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

details:   https://anonhg.NetBSD.org/src/rev/87d287934857
branches:  netbsd-3
changeset: 575162:87d287934857
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 20:47:27 2005 +0000

description:
Pull up revision 1.4 (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/bin/scanpci/Makefile  |   3 ++-
 x11/bin/mkfontdir/Makefile                   |  15 +++++++++++----
 x11/lib/freetype2/freetype/internal/Makefile |  15 +++++++++------
 3 files changed, 22 insertions(+), 11 deletions(-)

diffs (75 lines):

diff -r 9a5afbe3e7a1 -r 87d287934857 x11/Xserver/hw/xfree86/bin/scanpci/Makefile
--- a/x11/Xserver/hw/xfree86/bin/scanpci/Makefile       Wed Apr 06 20:47:23 2005 +0000
+++ b/x11/Xserver/hw/xfree86/bin/scanpci/Makefile       Wed Apr 06 20:47:27 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/03/27 15:27:01 soren Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2005/04/06 20:47:27 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -15,6 +15,7 @@
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc \
                -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
                -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/scanpci \
diff -r 9a5afbe3e7a1 -r 87d287934857 x11/bin/mkfontdir/Makefile
--- a/x11/bin/mkfontdir/Makefile        Wed Apr 06 20:47:23 2005 +0000
+++ b/x11/bin/mkfontdir/Makefile        Wed Apr 06 20:47:27 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/03/06 03:09:36 rtr Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2005/04/06 20:47:27 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -6,9 +6,16 @@
 
 MAN=   mkfontdir.1
 
-CPPSCRIPTS=    mkfontdir
-CPPSCRIPTFLAGS=        -DBINDIR=${X11BINDIR}
-SCRIPTS=       mkfontdir
+PROG=  mkfontdir
+CPPFLAGS+=-I${X11SRCDIR.xc}/lib/font/include
+CPPFLAGS+=-I${X11SRCDIR.xc}/include/fonts
+LDADD+= -lXfont -lfreetype -lfntstubs 
+DPADD+= ${LIBXFONT} ${LIBFREETYPE} ${LIBFNTSTUBS}
+LDADD+=        -lXt -lXext -lX11 -lz -lm
+DPADD+=        ${LIBXT} ${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM}
+#CPPSCRIPTS=   mkfontdir
+#CPPSCRIPTFLAGS=       -DBINDIR=${X11BINDIR}
+#SCRIPTS=      mkfontdir
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 9a5afbe3e7a1 -r 87d287934857 x11/lib/freetype2/freetype/internal/Makefile
--- a/x11/lib/freetype2/freetype/internal/Makefile      Wed Apr 06 20:47:23 2005 +0000
+++ b/x11/lib/freetype2/freetype/internal/Makefile      Wed Apr 06 20:47:27 2005 +0000
@@ -1,16 +1,19 @@
-#      $NetBSD: Makefile,v 1.3 2004/03/06 03:05:40 rtr Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2005/04/06 20:47:27 tron Exp $
 
 .include <bsd.own.mk>
 
+SUBDIR=services
+
 .PATH: ${X11SRCDIR.xc}/extras/freetype2/include/freetype/internal
 
 INCSDIR=${X11INCDIR}/freetype2/freetype/internal
 
-INCS=  autohint.h bdftypes.h cfftypes.h fnttypes.h ftcalc.h \
-       ftcore.h ftdebug.h ftdriver.h ftexcept.h ftgloadr.h \
-       fthash.h ftmemory.h ftobject.h ftobjs.h ftstream.h \
-       fttrace.h internal.h pcftypes.h psaux.h pfr.h pshints.h \
-       psnames.h sfnt.h t1types.h t42types.h tttypes.h
+INCS=  autohint.h ftcalc.h \
+       ftdebug.h ftdriver.h ftgloadr.h \
+       ftmemory.h ftobjs.h ftrfork.h ftserv.h ftstream.h \
+       fttrace.h internal.h pcftypes.h psaux.h pshints.h \
+       sfnt.h t1types.h tttypes.h
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
+.include <bsd.subdir.mk>