update to xf86-video-tdfx-1.4.5 for modular-xorg-server-1.12.4

6 files changed, 6 insertions, 82 deletions

diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index 6d071c6e4f0..405acce767c 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2012/10/29 05:07:06 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/05/16 06:28:49 richard Exp $
 #
 
-DISTNAME=	xf86-video-tdfx-1.4.3
-PKGREVISION=	1
+DISTNAME=	xf86-video-tdfx-1.4.5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-tdfx/distinfo b/x11/xf86-video-tdfx/distinfo
index 41273c9ea36..f1b9adefff6 100644
--- a/x11/xf86-video-tdfx/distinfo
+++ b/x11/xf86-video-tdfx/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.5 2009/08/09 22:57:19 wiz Exp $
+$NetBSD: distinfo,v 1.6 2013/05/16 06:28:49 richard Exp $
 
-SHA1 (xf86-video-tdfx-1.4.3.tar.bz2) = d091d3c93b500b361c083bc1b54c4f5d5fac0943
-RMD160 (xf86-video-tdfx-1.4.3.tar.bz2) = 2aaf601c6375f6b37f2a9f65424367fe9e3e6d83
-Size (xf86-video-tdfx-1.4.3.tar.bz2) = 290172 bytes
-SHA1 (patch-aa) = 141702166cf3e35f4b2399fe83e9ea15c076e522
-SHA1 (patch-ab) = 3ea32f0847bc4fe1e66e3dec28c8c808b68dde11
-SHA1 (patch-ac) = 317b9f276d6c922ee362f4a682283cd604907367
-SHA1 (patch-ad) = ddbcf2c5ff23e25e62cdaed9037ff6158b776898
+SHA1 (xf86-video-tdfx-1.4.5.tar.bz2) = f53097e3e01c153776ff9f7496121f373178416f
+RMD160 (xf86-video-tdfx-1.4.5.tar.bz2) = aee4f309d112e581be43e964ecc976f507ead41a
+Size (xf86-video-tdfx-1.4.5.tar.bz2) = 339623 bytes
diff --git a/x11/xf86-video-tdfx/patches/patch-aa b/x11/xf86-video-tdfx/patches/patch-aa
deleted file mode 100644
index 8c6a82b48a8..00000000000
--- a/x11/xf86-video-tdfx/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/07/21 20:12:07 abs Exp $
-
---- src/tdfxdefs.h.orig	2008-08-15 18:55:32.000000000 +0100
-+++ src/tdfxdefs.h
-@@ -405,4 +405,28 @@
- 
- #define SST_POWERDOWN_DAC               BIT(8)
- 
-+/* VIDSERIALPARALELPORT */
-+#define VSP_TVOUT_RESET 0x80000000      /* 0 forces TVout reset */
-+#define VSP_GPIO2_IN    0x40000000
-+#define VSP_GPIO1_OUT   0x20000000
-+#define VSP_VMI_RESET_N 0x10000000      /* 0 forces a VMI reset */
-+#define VSP_SDA1_IN     0x08000000      /* i2c bus on the feature connector */
-+#define VSP_SCL1_IN     0x04000000
-+#define VSP_SDA1_OUT    0x02000000
-+#define VSP_SCL1_OUT    0x01000000
-+#define VSP_ENABLE_IIC1 0x00800000      /* 1 enables I2C bus 1 */
-+#define VSP_SDA0_IN     0x00400000      /* i2c bus on the monitor connector */
-+#define VSP_SCL0_IN     0x00200000
-+#define VSP_SDA0_OUT    0x00100000
-+#define VSP_SCL0_OUT    0x00080000
-+#define VSP_ENABLE_IIC0 0x00040000      /* 1 enables I2C bus 0 */
-+#define VSP_VMI_ADDRESS 0x0003c000      /* mask */
-+#define VSP_VMI_DATA    0x00003fc0      /* mask */
-+#define VSP_VMI_DISABLE 0x00000020      /* 0 enables VMI output */
-+#define VSP_VMI_RDY_N   0x00000010
-+#define VSP_RW_N        0x00000008
-+#define VSP_DS_N        0x00000004
-+#define VSP_CS_N        0x00000002
-+#define VSP_HOST_ENABLE 0x00000001      /* 1 enables VMI host control*/
-+
- #endif
diff --git a/x11/xf86-video-tdfx/patches/patch-ab b/x11/xf86-video-tdfx/patches/patch-ab
deleted file mode 100644
index 1bc2ae78d4e..00000000000
--- a/x11/xf86-video-tdfx/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2009/07/21 20:12:07 abs Exp $
-
---- src/tdfx.h.orig	2008-08-15 18:55:32.000000000 +0100
-+++ src/tdfx.h
-@@ -11,6 +11,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <sys/time.h>
- 
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
diff --git a/x11/xf86-video-tdfx/patches/patch-ac b/x11/xf86-video-tdfx/patches/patch-ac
deleted file mode 100644
index 1cae8c422e0..00000000000
--- a/x11/xf86-video-tdfx/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2009/07/21 20:12:07 abs Exp $
-
---- configure.ac.orig	2009-07-02 16:47:46.000000000 +0100
-+++ configure.ac
-@@ -73,7 +73,7 @@ CPPFLAGS="$SAVE_CPPFLAGS"
- # 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-tdfx/patches/patch-ad b/x11/xf86-video-tdfx/patches/patch-ad
deleted file mode 100644
index 842904f7eae..00000000000
--- a/x11/xf86-video-tdfx/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/07/21 20:12:07 abs Exp $
-
---- configure.orig	2009-07-02 16:48:01.000000000 +0100
-+++ configure
-@@ -12610,7 +12610,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; }