Support DESTDIR. Disable SGML check. Change configure to check for

DRI headers only, if it is not explicitly enabled or disabled.
Enable it for pkgsrc.

4 files changed, 51 insertions, 2 deletions

diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index b0bce44543a..6f4f229b25f 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/08/07 16:20:26 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/15 19:09:50 joerg Exp $
 
 DISTNAME=	xf86-video-intel-2.1.0
 CATEGORIES=	x11
@@ -11,6 +11,10 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg Intel video driver
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+CONFIGURE_ARGS+=	--enable-dri
+
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 USE_TOOLS+=	pkg-config
diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo
index 2b12604e3ce..f6c8dcfe410 100644
--- a/x11/xf86-video-intel/distinfo
+++ b/x11/xf86-video-intel/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/07/13 17:50:11 drochner Exp $
+$NetBSD: distinfo,v 1.2 2007/08/15 19:09:51 joerg Exp $
 
 SHA1 (xf86-video-intel-2.1.0.tar.bz2) = 007412d72428e2dbc067a5d6fa00fbcfcc9c99c4
 RMD160 (xf86-video-intel-2.1.0.tar.bz2) = 323f5f5d50d492d1a068b7fad9399920a6998e36
 Size (xf86-video-intel-2.1.0.tar.bz2) = 544558 bytes
+SHA1 (patch-aa) = d0a27b41536e665a898d41a6a671a595bab57f3f
+SHA1 (patch-ab) = d9d43a87b26f8d9463ede28f082a469682173484
diff --git a/x11/xf86-video-intel/patches/patch-aa b/x11/xf86-video-intel/patches/patch-aa
new file mode 100644
index 00000000000..c6fdf2eaaee
--- /dev/null
+++ b/x11/xf86-video-intel/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/08/15 19:09:51 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 20:24:10.000000000 +0200
++++ configure.ac
+@@ -96,7 +96,7 @@ AM_CONDITIONAL(HAVE_PCIACCESS, test "x$h
+ # 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-intel/patches/patch-ab b/x11/xf86-video-intel/patches/patch-ab
new file mode 100644
index 00000000000..1c93dd375e0
--- /dev/null
+++ b/x11/xf86-video-intel/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2007/08/15 19:09:51 joerg Exp $
+
+--- configure.orig	2007-07-02 23:47:55.000000000 +0200
++++ configure
+@@ -21062,7 +21062,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; }
+@@ -21733,16 +21733,8 @@ echo $ECHO_N "checking for $XORG_SGML_PA
+ 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 "$XORG_SGML_PATH/X11/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; }