update to xf86-video-sis-0.10.7 for modular-xorg-server-1.12.4

5 files changed, 6 insertions, 66 deletions

diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index ec01e814e74..a5a09910b82 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/10/29 05:07:06 asau Exp $
+# $NetBSD: Makefile,v 1.15 2013/05/16 06:27:55 richard Exp $
 #
 
-DISTNAME=	xf86-video-sis-0.10.2
-PKGREVISION=	1
+DISTNAME=	xf86-video-sis-0.10.7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-sis/distinfo b/x11/xf86-video-sis/distinfo
index 4312d43c7f1..16e03d11733 100644
--- a/x11/xf86-video-sis/distinfo
+++ b/x11/xf86-video-sis/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/08/09 22:56:13 wiz Exp $
+$NetBSD: distinfo,v 1.7 2013/05/16 06:27:55 richard Exp $
 
-SHA1 (xf86-video-sis-0.10.2.tar.bz2) = c7369196d504671b6fdc9e17c90c0f07aa8e0c24
-RMD160 (xf86-video-sis-0.10.2.tar.bz2) = ba5773d307af3c5d1b6820c48d2934165aae910e
-Size (xf86-video-sis-0.10.2.tar.bz2) = 642160 bytes
-SHA1 (patch-aa) = d0157c386200821133f2049beb5b698cab21126a
-SHA1 (patch-ab) = 72557e7a7ff406549471bc59570f0fa5074df2a8
-SHA1 (patch-ac) = 6ce332ff427b33c40a25efb86101038510c532ed
+SHA1 (xf86-video-sis-0.10.7.tar.bz2) = 8f8cd88fe7d3a85f6bf2b12a34fd55db35f186d7
+RMD160 (xf86-video-sis-0.10.7.tar.bz2) = d6be4d2f6ee8182e988ff52990cc680e9a2dd310
+Size (xf86-video-sis-0.10.7.tar.bz2) = 699499 bytes
diff --git a/x11/xf86-video-sis/patches/patch-aa b/x11/xf86-video-sis/patches/patch-aa
deleted file mode 100644
index 742e600711b..00000000000
--- a/x11/xf86-video-sis/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/06/09 06:50:08 hasso Exp $
-
---- configure.orig	2008-12-22 06:39:06 +0200
-+++ configure	2009-06-09 09:31:19 +0300
-@@ -21603,7 +21603,7 @@ _ACEOF
- fi
- 
- 
--if test "$DRI" != no; then
-+if test "x$DRI" = xauto; then
-         as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
- $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
-@@ -22157,16 +22157,8 @@ $as_echo_n "checking for $XORG_SGML_PATH
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-   $as_echo_n "(cached) " >&6
- else
--  test "$cross_compiling" = yes &&
--  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--$as_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 'as_val=${'$as_ac_File'}
- 		 $as_echo "$as_val"'`
- 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
diff --git a/x11/xf86-video-sis/patches/patch-ab b/x11/xf86-video-sis/patches/patch-ab
deleted file mode 100644
index 6c6148a5919..00000000000
--- a/x11/xf86-video-sis/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/04/04 13:23:01 joerg Exp $
-
---- src/sis_dri.c.orig	2007-04-04 15:18:44.000000000 +0200
-+++ src/sis_dri.c
-@@ -125,6 +125,8 @@ static void SISDRIInitBuffers(WindowPtr 
- static void SISDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
-                    RegionPtr prgnSrc, CARD32 index);
- 
-+void	SISDRICloseScreen(ScreenPtr);
-+
- static Bool
- SISInitVisualConfigs(ScreenPtr pScreen)
- {
diff --git a/x11/xf86-video-sis/patches/patch-ac b/x11/xf86-video-sis/patches/patch-ac
deleted file mode 100644
index 98bc2fc264c..00000000000
--- a/x11/xf86-video-sis/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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],