Pass "-I." to the preprocessor so that xf86drm.h is found on Linux.

Approved by the maintainer.

3 files changed, 25 insertions, 7 deletions

diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 8ac238865cb..73be1b3f9b5 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2006/06/17 12:33:52 markd Exp $
+$NetBSD: distinfo,v 1.47 2006/07/23 13:34:06 minskim Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -40,8 +40,8 @@ SHA1 (patch-bb) = dac048c885a080f3975728de2afbadf17c3bee9c
 SHA1 (patch-bc) = b735c3f0cfd5ac161eff941a9878c6840ee45788
 SHA1 (patch-bd) = 2ea3591101f5e9602cc6846ca259b63cdcb88b73
 SHA1 (patch-be) = b9bc7d05429652400343609b123c99c76f64b33a
-SHA1 (patch-bf) = 753c56b84a6859fa4048d88a53f9c04400525d72
-SHA1 (patch-bg) = 3db63fcbe81d9f801ccac6353ad4a213a15c3ffe
+SHA1 (patch-bf) = 2751406222a5d08a04e6d654201ecb4775d2d3f3
+SHA1 (patch-bg) = e4ffb540483b2c379a25214b6ddcb9f32edf8020
 SHA1 (patch-bh) = 9e7e86c9abde02c7c80ddcf5d88e8429b85cd3a6
 SHA1 (patch-bi) = 37a0e96c7341b2e3314b4ee20b04fa56b55e7b48
 SHA1 (patch-bj) = d8c784081e7631e12a09c88eba08147e9020c51c
diff --git a/x11/xorg-libs/patches/patch-bf b/x11/xorg-libs/patches/patch-bf
index ef6f81a65d4..1330c900b26 100644
--- a/x11/xorg-libs/patches/patch-bf
+++ b/x11/xorg-libs/patches/patch-bf
@@ -1,7 +1,16 @@
-$NetBSD: patch-bf,v 1.3 2006/02/27 18:59:05 joerg Exp $
+$NetBSD: patch-bf,v 1.4 2006/07/23 13:34:06 minskim Exp $
 
---- lib/XvMC/hw/via/unichrome/Imakefile.orig	2006-02-23 22:36:33.000000000 +0100
+--- lib/XvMC/hw/via/unichrome/Imakefile.orig	2005-11-30 18:15:37.000000000 -0800
 +++ lib/XvMC/hw/via/unichrome/Imakefile
+@@ -19,7 +19,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+       DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0
+      INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \
+ 		-I$(XF86COMSRC) -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core \
+-		-I$(XF86OSSRC)/linux/drm/kernel -I$(XF86DRIVERSRC)/via
++		-I$(XF86OSSRC)/linux/drm/kernel -I$(XF86DRIVERSRC)/via -I.
+          SRCS = viaLowLevel.c 
+          OBJS = viaXvMC.o viaLowLevel.o xf86drm.o xf86drmHash.o \
+ 	        xf86drmRandom.o xf86drmSL.o xf86dri.o driDrawable.o
 @@ -34,6 +34,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
  LIBDRM_DIR = ../../../../../extras/drm/libdrm
  
diff --git a/x11/xorg-libs/patches/patch-bg b/x11/xorg-libs/patches/patch-bg
index 9316baa5512..85f2f09e95d 100644
--- a/x11/xorg-libs/patches/patch-bg
+++ b/x11/xorg-libs/patches/patch-bg
@@ -1,7 +1,16 @@
-$NetBSD: patch-bg,v 1.3 2006/02/27 18:59:05 joerg Exp $
+$NetBSD: patch-bg,v 1.4 2006/07/23 13:34:06 minskim Exp $
 
---- lib/XvMC/hw/via/unichromeProA/Imakefile.orig	2006-02-23 22:37:03.000000000 +0100
+--- lib/XvMC/hw/via/unichromeProA/Imakefile.orig	2005-11-30 18:15:38.000000000 -0800
 +++ lib/XvMC/hw/via/unichromeProA/Imakefile
+@@ -19,7 +19,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+       DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0
+      INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \
+ 		-I$(XF86COMSRC) -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core \
+-		-I$(XF86OSSRC)/linux/drm/kernel -I$(XF86DRIVERSRC)/via
++		-I$(XF86OSSRC)/linux/drm/kernel -I$(XF86DRIVERSRC)/via -I.
+          SRCS = viaLowLevelPro.c 
+          OBJS = viaXvMC.o viaLowLevelPro.o xf86drm.o xf86drmHash.o \
+ 	        xf86drmRandom.o xf86drmSL.o xf86dri.o driDrawable.o
 @@ -33,6 +33,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
  LIBDRM_DIR = ../../../../../extras/drm/libdrm