Module Name: src
Committed By: sborrill
Date: Sat Oct 10 19:53:25 UTC 2009
Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/distrib/sets/lists/xcomp [netbsd-5]: mi
src/etc/mtree [netbsd-5]: NetBSD.dist
src/external/mit/xorg/lib/dri [netbsd-5]: dri.mk
src/external/mit/xorg/lib/dri/libmesa [netbsd-5]: Makefile
src/external/mit/xorg/lib/libGL [netbsd-5]: Makefile
src/external/mit/xorg/lib/libdrm [netbsd-5]: Makefile
src/external/mit/xorg/lib/libdrm/drm [netbsd-5]: Makefile
src/external/mit/xorg/lib/libdrm_intel [netbsd-5]: Makefile
src/external/mit/xorg/server/drivers [netbsd-5]: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-glint [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017 [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ivch [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/sil164 [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410 [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-mga [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-savage [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-tdfx [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-via [netbsd-5]:
Makefile
src/external/mit/xorg/server/xorg-server/GL/glx [netbsd-5]:
Makefile.glx
src/external/mit/xorg/server/xorg-server/glx [netbsd-5]: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri [netbsd-5]:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2 [netbsd-5]:
Makefile
Log Message:
Pull up the following revisions(s) (requested by snj in ticket #1079):
distrib/sets/lists/base/mi: patch
etc/mtree/NetBSD.dist: patch
distrib/sets/lists/xcomp/mi: revision 1.100
external/mit/xorg/lib/dri/dri.mk: revision 1.8
external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.4
external/mit/xorg/lib/libGL/Makefile: revision 1.10
external/mit/xorg/lib/libdrm/Makefile: revision 1.5
external/mit/xorg/lib/libdrm/drm/Makefile: revision 1.3
external/mit/xorg/lib/libdrm_intel/Makefile: revision 1.3
external/mit/xorg/server/drivers/Makefile.xf86-driver: revision 1.16
external/mit/xorg/server/drivers/xf86-video-glint/Makefile:
revision 1.7
external/mit/xorg/server/drivers/xf86-video-intel/Makefile:
revision 1.7
external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:
revision 1.2
external/mit/xorg/server/drivers/xf86-video-mga/Makefile:
revision 1.7
external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:
revision 1.5
external/mit/xorg/server/drivers/xf86-video-savage/Makefile:
revision 1.7
external/mit/xorg/server/drivers/xf86-video-sis/Makefile:
revision 1.7
external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:
revision 1.6
external/mit/xorg/server/drivers/xf86-video-via/Makefile:
revision 1.5
external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:
revision 1.5
external/mit/xorg/server/xorg-server/glx/Makefile.glx: revision 1.4
external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:
revision 1.7
external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:
revision 1.4
Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.
To generate a diff of this commit:
cvs rdiff -u -r1.780.2.12 -r1.780.2.13 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.71.2.5 -r1.71.2.6 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.385.2.4 -r1.385.2.5 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.3.4.3 -r1.3.4.4 src/external/mit/xorg/lib/dri/dri.mk
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \
src/external/mit/xorg/lib/libdrm/drm/Makefile
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
src/external/mit/xorg/lib/libdrm_intel/Makefile
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 \
src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
cvs rdiff -u -r1.5.8.1 -r1.5.8.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile
cvs rdiff -u -r1.4.8.2 -r1.4.8.3 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.1.8.1 -r1.1.8.2 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.4.8.2 -r1.4.8.3 \
src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 \
src/external/mit/xorg/server/drivers/xf86-video-via/Makefile
cvs rdiff -u -r1.4 -r1.4.6.1 \
src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.4.8.1 -r1.4.8.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.12 src/distrib/sets/lists/base/mi:1.780.2.13
--- src/distrib/sets/lists/base/mi:1.780.2.12 Tue Oct 6 23:57:56 2009
+++ src/distrib/sets/lists/base/mi Sat Oct 10 19:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.12 2009/10/06 23:57:56 snj Exp $
+# $NetBSD: mi,v 1.780.2.13 2009/10/10 19:53:24 sborrill Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -480,7 +480,7 @@
./usr/X11R7/include/GL/internal base-x11-root
./usr/X11R7/include/X11 base-x11-root
./usr/X11R7/include/X11/dri base-x11-root
-./usr/X11R7/include/X11/drm base-x11-root
+./usr/X11R7/include/X11/drm base-x11-root obsolete
./usr/X11R7/include/X11/ICE base-x11-root
./usr/X11R7/include/X11/PM base-x11-root
./usr/X11R7/include/X11/SM base-x11-root
@@ -495,6 +495,7 @@
./usr/X11R7/include/X11/extensions base-x11-root
./usr/X11R7/include/X11/fonts base-x11-root
./usr/X11R7/include/X11/pixmaps base-x11-root
+./usr/X11R7/include/drm base-x11-root
./usr/X11R7/include/fontconfig base-x11-root
./usr/X11R7/include/freetype2 base-x11-root
./usr/X11R7/include/freetype2/freetype base-x11-root
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.71.2.5 src/distrib/sets/lists/xcomp/mi:1.71.2.6
--- src/distrib/sets/lists/xcomp/mi:1.71.2.5 Thu Sep 17 04:24:27 2009
+++ src/distrib/sets/lists/xcomp/mi Sat Oct 10 19:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.71.2.5 2009/09/17 04:24:27 snj Exp $
+# $NetBSD: mi,v 1.71.2.6 2009/10/10 19:53:24 sborrill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5427,21 +5427,36 @@
./usr/X11R7/include/X11/cursorfont.h -unknown- xorg
./usr/X11R7/include/X11/dri/xf86dri.h -unknown- xorg
./usr/X11R7/include/X11/dri/xf86dristr.h -unknown- xorg
-./usr/X11R7/include/X11/drm/drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/drm_mode.h -unknown- xorg
-./usr/X11R7/include/X11/drm/drm_sarea.h -unknown- xorg
-./usr/X11R7/include/X11/drm/i915_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/mach64_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/mga_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/nouveau_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/r128_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/r300_reg.h -unknown- xorg
-./usr/X11R7/include/X11/drm/radeon_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/savage_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/sis_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/via_3d_reg.h -unknown- xorg
-./usr/X11R7/include/X11/drm/via_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/xgi_drm.h -unknown- xorg
+./usr/X11R7/include/X11/drm/drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/drm_mode.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/drm_sarea.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/i915_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/mach64_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/mga_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/nouveau_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/r128_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/r300_reg.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/radeon_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/savage_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/sis_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/via_3d_reg.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/via_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/xgi_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/drm.h -unknown- xorg
+./usr/X11R7/include/drm/drm_mode.h -unknown- xorg
+./usr/X11R7/include/drm/drm_sarea.h -unknown- xorg
+./usr/X11R7/include/drm/i915_drm.h -unknown- xorg
+./usr/X11R7/include/drm/mach64_drm.h -unknown- xorg
+./usr/X11R7/include/drm/mga_drm.h -unknown- xorg
+./usr/X11R7/include/drm/nouveau_drm.h -unknown- xorg
+./usr/X11R7/include/drm/r128_drm.h -unknown- xorg
+./usr/X11R7/include/drm/r300_reg.h -unknown- xorg
+./usr/X11R7/include/drm/radeon_drm.h -unknown- xorg
+./usr/X11R7/include/drm/savage_drm.h -unknown- xorg
+./usr/X11R7/include/drm/sis_drm.h -unknown- xorg
+./usr/X11R7/include/drm/via_3d_reg.h -unknown- xorg
+./usr/X11R7/include/drm/via_drm.h -unknown- xorg
+./usr/X11R7/include/drm/xgi_drm.h -unknown- xorg
./usr/X11R7/include/X11/extensions/MITMisc.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Print.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Printstr.h -unknown- xorg
@@ -5581,8 +5596,10 @@
./usr/X11R7/include/X11/fonts/pcf.h -unknown- xorg
./usr/X11R7/include/X11/keysym.h -unknown- xorg
./usr/X11R7/include/X11/keysymdef.h -unknown- xorg
-./usr/X11R7/include/X11/xf86drm.h -unknown- xorg
-./usr/X11R7/include/X11/xf86drmMode.h -unknown- xorg
+./usr/X11R7/include/X11/xf86drm.h -unknown- obsolete
+./usr/X11R7/include/X11/xf86drmMode.h -unknown- obsolete
+./usr/X11R7/include/xf86drm.h -unknown- xorg
+./usr/X11R7/include/xf86drmMode.h -unknown- xorg
./usr/X11R7/include/X11/xf86mm.h -obsolete- obsolete
./usr/X11R7/include/X11/xpm.h -unknown- xorg
./usr/X11R7/include/expat.h -unknown- xorg
Index: src/etc/mtree/NetBSD.dist
diff -u src/etc/mtree/NetBSD.dist:1.385.2.4 src/etc/mtree/NetBSD.dist:1.385.2.5
--- src/etc/mtree/NetBSD.dist:1.385.2.4 Sun Oct 4 00:42:21 2009
+++ src/etc/mtree/NetBSD.dist Sat Oct 10 19:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.385.2.4 2009/10/04 00:42:21 snj Exp $
+# $NetBSD: NetBSD.dist,v 1.385.2.5 2009/10/10 19:53:24 sborrill Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -252,7 +252,6 @@
./usr/X11R7/include/GL
./usr/X11R7/include/GL/internal
./usr/X11R7/include/X11
-./usr/X11R7/include/X11/drm
./usr/X11R7/include/X11/dri
./usr/X11R7/include/X11/ICE
./usr/X11R7/include/X11/PM
@@ -268,6 +267,7 @@
./usr/X11R7/include/X11/extensions
./usr/X11R7/include/X11/fonts
./usr/X11R7/include/X11/pixmaps
+./usr/X11R7/include/drm
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
./usr/X11R7/include/freetype2/freetype
Index: src/external/mit/xorg/lib/dri/dri.mk
diff -u src/external/mit/xorg/lib/dri/dri.mk:1.3.4.3 src/external/mit/xorg/lib/dri/dri.mk:1.3.4.4
--- src/external/mit/xorg/lib/dri/dri.mk:1.3.4.3 Thu Sep 17 04:24:29 2009
+++ src/external/mit/xorg/lib/dri/dri.mk Sat Oct 10 19:53:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.3.4.3 2009/09/17 04:24:29 snj Exp $
+# $NetBSD: dri.mk,v 1.3.4.4 2009/10/10 19:53:22 sborrill Exp $
# XXX DRI_LIB_DEPS
@@ -15,7 +15,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
-I${X11SRCDIR.MesaLib}/src/mesa \
-I${X11SRCDIR.MesaLib}/include \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.1.2.4 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.1.2.5
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.1.2.4 Thu Sep 17 04:24:30 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Sat Oct 10 19:53:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.4 2009/09/17 04:24:30 snj Exp $
+# $NetBSD: Makefile,v 1.1.2.5 2009/10/10 19:53:22 sborrill Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
-I${X11SRCDIR.MesaLib}/src/mesa \
-I${X11SRCDIR.MesaLib}/include \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= ${X11FLAGS.THREADLIB} \
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.5.6.1 src/external/mit/xorg/lib/libGL/Makefile:1.5.6.2
--- src/external/mit/xorg/lib/libGL/Makefile:1.5.6.1 Thu Sep 17 04:24:31 2009
+++ src/external/mit/xorg/lib/libGL/Makefile Sat Oct 10 19:53:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.6.1 2009/09/17 04:24:31 snj Exp $
+# $NetBSD: Makefile,v 1.5.6.2 2009/10/10 19:53:22 sborrill Exp $
.include <bsd.own.mk>
@@ -55,7 +55,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/GL \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/include/GL/internal \
-I${X11SRCDIR.MesaLib}/src/mesa \
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.2.8.1 src/external/mit/xorg/lib/libdrm/Makefile:1.2.8.2
--- src/external/mit/xorg/lib/libdrm/Makefile:1.2.8.1 Thu Sep 17 04:24:32 2009
+++ src/external/mit/xorg/lib/libdrm/Makefile Sat Oct 10 19:53:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.8.1 2009/09/17 04:24:32 snj Exp $
+# $NetBSD: Makefile,v 1.2.8.2 2009/10/10 19:53:22 sborrill Exp $
.include <bsd.own.mk>
@@ -8,10 +8,10 @@
SRCS= xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
INCS= xf86drm.h xf86drmMode.h
-INCSDIR=${X11INCDIR}/X11
+INCSDIR=${X11INCDIR}
.PATH: ${X11SRCDIR.${LIB}}/libdrm/intel
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
SUBDIR= drm
Index: src/external/mit/xorg/lib/libdrm/drm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/drm/Makefile:1.1.1.1.8.1 src/external/mit/xorg/lib/libdrm/drm/Makefile:1.1.1.1.8.2
--- src/external/mit/xorg/lib/libdrm/drm/Makefile:1.1.1.1.8.1 Thu Sep 17 04:24:32 2009
+++ src/external/mit/xorg/lib/libdrm/drm/Makefile Sat Oct 10 19:53:22 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1.8.1 2009/09/17 04:24:32 snj Exp $
+# $NetBSD: Makefile,v 1.1.1.1.8.2 2009/10/10 19:53:22 sborrill Exp $
-# install include/X11/drm files
+# install include/drm files
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
r128_drm.h r300_reg.h radeon_drm.h \
savage_drm.h sis_drm.h via_3d_reg.h via_drm.h \
xgi_drm.h
-INCSDIR=${X11INCDIR}/X11/drm
+INCSDIR=${X11INCDIR}/drm
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/libdrm_intel/Makefile
diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.2.2.2 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.2.2.3
--- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.2.2.2 Thu Sep 17 04:24:32 2009
+++ src/external/mit/xorg/lib/libdrm_intel/Makefile Sat Oct 10 19:53:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.2.2 2009/09/17 04:24:32 snj Exp $
+# $NetBSD: Makefile,v 1.2.2.3 2009/10/10 19:53:22 sborrill Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}/libdrm
INCS= intel_bufmgr.h
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.13.4.1 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.13.4.2
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.13.4.1 Thu Sep 17 04:24:35 2009
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Oct 10 19:53:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.13.4.1 2009/09/17 04:24:35 snj Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.13.4.2 2009/10/10 19:53:22 sborrill Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -29,7 +29,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
Index: src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.4.2.1 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.4.2.2
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.4.2.1 Thu Sep 17 04:24:35 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Sat Oct 10 19:53:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.2.1 2009/09/17 04:24:35 snj Exp $
+# $NetBSD: Makefile,v 1.4.2.2 2009/10/10 19:53:22 sborrill Exp $
DRIVER= xf86-video-glint
DRIVER_NAME= glint_drv
@@ -20,6 +20,6 @@
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.5.8.1 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.5.8.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.5.8.1 Thu Sep 17 04:24:35 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.8.1 2009/09/17 04:24:35 snj Exp $
+# $NetBSD: Makefile,v 1.5.8.2 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= intel_drv
@@ -17,7 +17,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS+= -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
LDADD+= -ldrm_intel
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:1.1.8.1
--- src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= ch7017_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/ch7017
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:1.1.8.1
--- src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= ch7xxx_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/ch7xxx
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:1.1.8.1
--- src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= ivch_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/ivch
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:1.1.8.1
--- src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= sil164_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/sil164
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:1.1.8.1
--- src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= tfp410_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/tfp410
Index: src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.4.8.2 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.4.8.3
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.4.8.2 Thu Sep 17 04:24:36 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.8.2 2009/09/17 04:24:36 snj Exp $
+# $NetBSD: Makefile,v 1.4.8.3 2009/10/10 19:53:23 sborrill Exp $
.include <bsd.own.mk>
@@ -27,7 +27,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS.mga_driver.c= -Wno-error # XXX fix me please
CPPFLAGS.mga_dacG.c= -Wno-error # XXX fix me please
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.1.8.1 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.1.8.2
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.1.8.1 Thu Sep 17 04:24:36 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.8.1 2009/09/17 04:24:36 snj Exp $
+# $NetBSD: Makefile,v 1.1.8.2 2009/10/10 19:53:23 sborrill Exp $
.include <bsd.own.mk>
@@ -35,7 +35,7 @@
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${X11SRCDIR.${DRIVER}}/../include
# XXX
Index: src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.4.8.2 src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.4.8.3
--- src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.4.8.2 Thu Sep 17 04:24:36 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.8.2 2009/09/17 04:24:36 snj Exp $
+# $NetBSD: Makefile,v 1.4.8.3 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-savage
DRIVER_NAME= savage_drv
@@ -21,7 +21,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS.savage_driver.c= -DPACKAGE_VERSION=\"${PACKAGE_MAJOR}\"
CPPFLAGS.savage_exa.c= -Wno-error # volatile -> mempcy
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.5.4.1 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.5.4.2
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.5.4.1 Thu Sep 17 04:24:36 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.4.1 2009/09/17 04:24:36 snj Exp $
+# $NetBSD: Makefile,v 1.5.4.2 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -14,7 +14,7 @@
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
# XXX
COPTS.sis_driver.c= -Wno-error
Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.3.8.1 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.3.8.2
--- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.3.8.1 Thu Sep 17 04:24:36 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.8.1 2009/09/17 04:24:36 snj Exp $
+# $NetBSD: Makefile,v 1.3.8.2 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-tdfx
DRIVER_NAME= tdfx_drv
@@ -10,7 +10,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
COPTS.tdfx_driver.c= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/drivers/xf86-video-via/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-via/Makefile:1.3.8.1 src/external/mit/xorg/server/drivers/xf86-video-via/Makefile:1.3.8.2
--- src/external/mit/xorg/server/drivers/xf86-video-via/Makefile:1.3.8.1 Thu Sep 17 04:24:37 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-via/Makefile Sat Oct 10 19:53:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.8.1 2009/09/17 04:24:37 snj Exp $
+# $NetBSD: Makefile,v 1.3.8.2 2009/10/10 19:53:23 sborrill Exp $
DRIVER= xf86-video-via
DRIVER_NAME= via_drv
@@ -12,7 +12,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.4 src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.4.6.1
--- src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.4 Thu Sep 25 15:02:58 2008
+++ src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx Sat Oct 10 19:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.4 2008/09/25 15:02:58 rtr Exp $
+# $NetBSD: Makefile.glx,v 1.4.6.1 2009/10/10 19:53:24 sborrill Exp $
.PATH: ${X11SRCDIR.xorg-server}/GL/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -49,7 +49,7 @@
-I${X11SRCDIR.MesaLib}/src/glx/x11 \
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.2 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.3
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.2 Thu Sep 17 04:24:38 2009
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Sat Oct 10 19:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.3.2.2 2009/09/17 04:24:38 snj Exp $
+# $NetBSD: Makefile.glx,v 1.3.2.3 2009/10/10 19:53:24 sborrill Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -52,7 +52,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.4.8.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.4.8.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.4.8.1 Thu Sep 17 04:24:39 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile Sat Oct 10 19:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.8.1 2009/09/17 04:24:39 snj Exp $
+# $NetBSD: Makefile,v 1.4.8.2 2009/10/10 19:53:24 sborrill Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -26,7 +26,7 @@
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.3.2.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.3.2.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.3.2.2 Thu Sep 17 04:24:39 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile Sat Oct 10 19:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.2.2 2009/09/17 04:24:39 snj Exp $
+# $NetBSD: Makefile,v 1.3.2.3 2009/10/10 19:53:24 sborrill Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -27,7 +27,7 @@
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
