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

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

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

description:
Pull up revision 1.6 (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/GL/glx/Makefile.glx |  6 ++++--
 x11/bin/twm/Makefile            |  6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r bd0ec1e07288 -r a07affcaf0da x11/Xserver/GL/glx/Makefile.glx
--- a/x11/Xserver/GL/glx/Makefile.glx   Wed Apr 06 20:52:00 2005 +0000
+++ b/x11/Xserver/GL/glx/Makefile.glx   Wed Apr 06 20:52:08 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.glx,v 1.5 2004/03/06 03:31:05 rtr Exp $
+#      $NetBSD: Makefile.glx,v 1.5.8.1 2005/04/06 20:52:08 tron Exp $
 
 LIB=           glx
 
@@ -18,7 +18,9 @@
                -I${X11SRCDIR.xc}/programs/Xserver/mi \
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/include/fonts \
-               -I${X11SRCDIR.xc}/extras/Mesa/src \
+               -I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
+               -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \
+               -I${X11SRCDIR.xc}/extras/Mesa/include \
                -I${X11SRCDIR.xc}/lib/GL/include
 
 CPPFLAGS+=     -DGLXEXT -DGLX_USE_MESA
diff -r bd0ec1e07288 -r a07affcaf0da x11/bin/twm/Makefile
--- a/x11/bin/twm/Makefile      Wed Apr 06 20:52:00 2005 +0000
+++ b/x11/bin/twm/Makefile      Wed Apr 06 20:52:08 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2004/05/16 10:25:14 lukem Exp $
+#      $NetBSD: Makefile,v 1.5.4.1 2005/04/06 20:52:08 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -34,8 +34,8 @@
        echo '    (char *) 0 };' >>$@
 
 
-LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11
-DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+=        -lXpm -lXmu -lXt -lSM -lICE -lXext -lX11
+DPADD+=        ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.xc}/programs/${PROG}