Change configure to check for DRI headers only if DRI is not explicitly

enabled or disabled. Request it for pkgsrc. Disable SGML check.

4 files changed, 49 insertions, 2 deletions

diff --git a/x11/xf86-video-i810/Makefile b/x11/xf86-video-i810/Makefile
index e85d2572020..bf0265c02d4 100644
--- a/x11/xf86-video-i810/Makefile
+++ b/x11/xf86-video-i810/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/08/07 16:20:25 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/08/15 19:44:55 joerg Exp $
 
 DISTNAME=	xf86-video-i810-1.7.4
 CATEGORIES=	x11
@@ -12,6 +12,8 @@ COMMENT=	Modular Xorg Intel video driver
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+CONFIGURE_ARGS+=	--enable-dri
+
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake pkg-config
diff --git a/x11/xf86-video-i810/distinfo b/x11/xf86-video-i810/distinfo
index 0cc8f93b6d6..274ea96d7d4 100644
--- a/x11/xf86-video-i810/distinfo
+++ b/x11/xf86-video-i810/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/02/26 18:14:06 drochner Exp $
+$NetBSD: distinfo,v 1.3 2007/08/15 19:44:55 joerg Exp $
 
 SHA1 (xf86-video-i810-1.7.4.tar.bz2) = 3c2837283ec3e9d1aeec430bb2460178aec94a90
 RMD160 (xf86-video-i810-1.7.4.tar.bz2) = cbb8ebd7e36d07513e00c232cbb1e0b12a0de3b2
 Size (xf86-video-i810-1.7.4.tar.bz2) = 461513 bytes
+SHA1 (patch-aa) = 46216c0fd3f83bd584b1a392defcd9cf78bacc6e
+SHA1 (patch-ab) = 1839dd6d21360bbba938c3584edb388a3ae166f9
diff --git a/x11/xf86-video-i810/patches/patch-aa b/x11/xf86-video-i810/patches/patch-aa
new file mode 100644
index 00000000000..90447ef2c2f
--- /dev/null
+++ b/x11/xf86-video-i810/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 19:44:55 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 21:31:11.000000000 +0200
++++ configure.ac
+@@ -87,7 +87,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-if test "$DRI" != no; then
++if test "x$DRI" = xauto; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
diff --git a/x11/xf86-video-i810/patches/patch-ab b/x11/xf86-video-i810/patches/patch-ab
new file mode 100644
index 00000000000..12cbc55ac63
--- /dev/null
+++ b/x11/xf86-video-i810/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2007/08/15 19:44:55 joerg Exp $
+
+--- configure.orig	2007-08-15 21:33:41.000000000 +0200
++++ configure
+@@ -21022,7 +21022,7 @@ _ACEOF
+ fi
+ 
+ 
+-if test "$DRI" != no; then
++if test "x$DRI" = xauto; then
+         as_ac_File=`echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
+ echo $ECHO_N "checking for ${sdkdir}/dri.h... $ECHO_C" >&6; }
+@@ -21407,16 +21407,8 @@ echo $ECHO_N "checking for $prefix/share
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  test "$cross_compiling" = yes &&
+-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "$prefix/share/X11/sgml/defs.ent"; then
+-  eval "$as_ac_File=yes"
+-else
+   eval "$as_ac_File=no"
+ fi
+-fi
+ ac_res=`eval echo '${'$as_ac_File'}'`
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }