Updated x11/xf86-video-tdfx to 1.4.2

upstream changes:
    - No changelog available
pkgsrc changes:
    - Add patch to include <sys/time.h> so gettimeofday() actually works
    - Regen patches for changed line numbers

6 files changed, 33 insertions, 20 deletions

diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index 636d47e25bd..42e31842c8a 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2009/06/10 08:05:03 hasso Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/21 20:12:07 abs Exp $
 #
 
-DISTNAME=	xf86-video-tdfx-1.4.1
+DISTNAME=	xf86-video-tdfx-1.4.2
 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 1eff7bef8a5..5ae1a0a4b0e 100644
--- a/x11/xf86-video-tdfx/distinfo
+++ b/x11/xf86-video-tdfx/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2009/06/10 08:05:03 hasso Exp $
+$NetBSD: distinfo,v 1.4 2009/07/21 20:12:07 abs Exp $
 
-SHA1 (xf86-video-tdfx-1.4.1.tar.bz2) = 588b591a930838f9b48fae00507043a067f2bfe1
-RMD160 (xf86-video-tdfx-1.4.1.tar.bz2) = 9ae1418e36bd02f4d804608c725858f15830f698
-Size (xf86-video-tdfx-1.4.1.tar.bz2) = 286452 bytes
-SHA1 (patch-aa) = c6a83f95062b7e7cdf4eedab6dfb1112def41bb9
-SHA1 (patch-ac) = fed8d44cca95b1d47841239191bfd65811a19aa1
-SHA1 (patch-ad) = b93484d1688bc0e53a95b143d03c30ecad65417e
+SHA1 (xf86-video-tdfx-1.4.2.tar.bz2) = 4b24d7faa5f52c18abde843550dd2a6e8d7a90c4
+RMD160 (xf86-video-tdfx-1.4.2.tar.bz2) = d18660bc30df4a6d5b9ad55286ba164f91d4b56c
+Size (xf86-video-tdfx-1.4.2.tar.bz2) = 289115 bytes
+SHA1 (patch-aa) = 141702166cf3e35f4b2399fe83e9ea15c076e522
+SHA1 (patch-ab) = 3ea32f0847bc4fe1e66e3dec28c8c808b68dde11
+SHA1 (patch-ac) = 317b9f276d6c922ee362f4a682283cd604907367
+SHA1 (patch-ad) = ddbcf2c5ff23e25e62cdaed9037ff6158b776898
diff --git a/x11/xf86-video-tdfx/patches/patch-aa b/x11/xf86-video-tdfx/patches/patch-aa
index 3f54816c913..8c6a82b48a8 100644
--- a/x11/xf86-video-tdfx/patches/patch-aa
+++ b/x11/xf86-video-tdfx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2007/04/09 14:28:01 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/21 20:12:07 abs Exp $
 
---- src/tdfxdefs.h.orig	2007-03-27 07:50:42.000000000 -0400
-+++ src/tdfxdefs.h	2007-03-27 08:14:29.000000000 -0400
-@@ -384,4 +384,28 @@
+--- 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)
  
diff --git a/x11/xf86-video-tdfx/patches/patch-ab b/x11/xf86-video-tdfx/patches/patch-ab
new file mode 100644
index 00000000000..1bc2ae78d4e
--- /dev/null
+++ b/x11/xf86-video-tdfx/patches/patch-ab
@@ -0,0 +1,12 @@
+$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
index df8001ce8d2..1cae8c422e0 100644
--- a/x11/xf86-video-tdfx/patches/patch-ac
+++ b/x11/xf86-video-tdfx/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2007/08/15 17:55:42 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2009/07/21 20:12:07 abs Exp $
 
---- configure.ac.orig	2007-08-15 19:51:28.000000000 +0200
+--- configure.ac.orig	2009-07-02 16:47:46.000000000 +0100
 +++ configure.ac
-@@ -67,7 +67,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
+@@ -73,7 +73,7 @@ CPPFLAGS="$SAVE_CPPFLAGS"
  # Checks for header files.
  AC_HEADER_STDC
  
diff --git a/x11/xf86-video-tdfx/patches/patch-ad b/x11/xf86-video-tdfx/patches/patch-ad
index dbfab8d14ca..842904f7eae 100644
--- a/x11/xf86-video-tdfx/patches/patch-ad
+++ b/x11/xf86-video-tdfx/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2009/06/10 08:05:03 hasso Exp $
+$NetBSD: patch-ad,v 1.3 2009/07/21 20:12:07 abs Exp $
 
---- configure.orig	2008-12-22 07:20:58 +0200
-+++ configure	2009-06-10 10:30:58 +0300
-@@ -21499,7 +21499,7 @@ _ACEOF
+--- configure.orig	2009-07-02 16:48:01.000000000 +0100
++++ configure
+@@ -12610,7 +12610,7 @@ _ACEOF
  fi