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

enabled or disabled. Request DRI explicitly. Disable the SGML check.

4 files changed, 47 insertions, 5 deletions

diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index 9bc503049fb..ab433ddd53c 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:44:20 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/15 18:03:32 joerg Exp $
 #
 
 DISTNAME=	xf86-video-sis-0.9.3
@@ -11,6 +11,8 @@ COMMENT=	Modular Xorg SiS and XGI video driver
 
 PKG_DESTDIR_SUPPORT=    user-destdir
 
+CONFIGURE_ARGS+=	--enable-dri
+
 USE_LIBTOOL=    yes
 GNU_CONFIGURE=  yes
 USE_TOOLS+=     pkg-config
diff --git a/x11/xf86-video-sis/distinfo b/x11/xf86-video-sis/distinfo
index bb070ab3457..2f14abd97bf 100644
--- a/x11/xf86-video-sis/distinfo
+++ b/x11/xf86-video-sis/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/04/04 13:23:01 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/08/15 18:03:32 joerg Exp $
 
 SHA1 (xf86-video-sis-0.9.3.tar.bz2) = fb386185a91bbc6764445ef251d4a0216ec9b9d0
 RMD160 (xf86-video-sis-0.9.3.tar.bz2) = 797104eab78486411a876def8e87870946fbe273
 Size (xf86-video-sis-0.9.3.tar.bz2) = 617592 bytes
-SHA1 (patch-aa) = 3783136ffb53afa09a5491bf36caa438c3274aee
+SHA1 (patch-aa) = 068952660754a35ce2662bdb8513b59b81eb65d4
 SHA1 (patch-ab) = 72557e7a7ff406549471bc59570f0fa5074df2a8
+SHA1 (patch-ac) = 6ce332ff427b33c40a25efb86101038510c532ed
diff --git a/x11/xf86-video-sis/patches/patch-aa b/x11/xf86-video-sis/patches/patch-aa
index a7f2d3ba09f..540bf746247 100644
--- a/x11/xf86-video-sis/patches/patch-aa
+++ b/x11/xf86-video-sis/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/22 15:44:20 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2007/08/15 18:03:32 joerg Exp $
 
---- configure.orig	2007-03-22 16:16:34.000000000 +0100
+--- configure.orig	2006-11-30 18:58:33.000000000 +0100
 +++ configure
 @@ -2283,10 +2283,10 @@ AMSHOWCMDSAT=''
  AMDEPSHOWCMDSAT=''
@@ -15,3 +15,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/22 15:44:20 joerg Exp $
    AMPRETTYECHO=echo
    AMCMDECHO=true
    LT_QUIET='--quiet'
+@@ -21618,7 +21618,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; }
+@@ -21956,16 +21956,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; }
diff --git a/x11/xf86-video-sis/patches/patch-ac b/x11/xf86-video-sis/patches/patch-ac
new file mode 100644
index 00000000000..98bc2fc264c
--- /dev/null
+++ b/x11/xf86-video-sis/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/08/15 18:03:32 joerg Exp $
+
+--- configure.ac.orig	2007-08-15 19:56:03.000000000 +0200
++++ configure.ac
+@@ -70,7 +70,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],