Update to 2.1.13

4 files changed, 4 insertions, 50 deletions

diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 3fd0dafd5d0c..72374dce12e1 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-nv
-PORTVERSION=	2.1.12
-PORTREVISION=	3
+PORTVERSION=	2.1.13
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo
index 0d1689928e5c..ab52ff0559d3 100644
--- a/x11-drivers/xf86-video-nv/distinfo
+++ b/x11-drivers/xf86-video-nv/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-nv-2.1.12.tar.bz2) = 42f12a36d7afc26c817e8e8f5c8b7274
-SHA256 (xorg/driver/xf86-video-nv-2.1.12.tar.bz2) = f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e
-SIZE (xorg/driver/xf86-video-nv-2.1.12.tar.bz2) = 388330
+MD5 (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = c3231c8808a11eb4ca066e43e0f1a273
+SHA256 (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = 60179d0f406ea6a84e5ec6beb80d8b7b472f97c81c63bc5acc3064b5a64c13a3
+SIZE (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = 397630
diff --git a/x11-drivers/xf86-video-nv/files/patch-src-g80_driver.c b/x11-drivers/xf86-video-nv/files/patch-src-g80_driver.c
deleted file mode 100644
index 1a1f88f6ba25..000000000000
--- a/x11-drivers/xf86-video-nv/files/patch-src-g80_driver.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/g80_driver.c.orig	2008-08-04 17:08:54.000000000 -0500
-+++ src/g80_driver.c	2009-02-28 20:24:36.000000000 -0600
-@@ -206,11 +206,8 @@
-     CARD32 tmp;
-     memType BAR1sizeKB;
- 
--    if(flags & PROBE_DETECT) {
--        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                "G80 PROBE_DETECT unimplemented\n");
--        return FALSE;
--    }
-+    if(flags & PROBE_DETECT)
-+        return TRUE;
- 
-     /* Check the number of entities, and fail if it isn't one. */
-     if(pScrn->numEntities != 1)
diff --git a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
deleted file mode 100644
index 87261c525dab..000000000000
--- a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/nv_driver.c.orig	2008-08-26 15:46:19.000000000 -0500
-+++ src/nv_driver.c	2009-02-28 20:24:36.000000000 -0600
-@@ -77,11 +77,22 @@
- static Bool	NVSetModeVBE(ScrnInfoPtr pScrn, DisplayModePtr pMode);
- 
- #if XSERVER_LIBPCIACCESS
--/* For now, just match any NVIDIA PCI device and sort through them in the probe
-- * routine */
-+/* For now, just match any NVIDIA display device and sort through them in the
-+ * probe routine */
-+
-+/*
-+ * libpciaccess's masks are shifted by 8 bits compared to the ones in xf86Pci.h.
-+ */
-+#define LIBPCIACCESS_CLASS_SHIFT (PCI_CLASS_SHIFT - 8)
-+#define LIBPCIACCESS_CLASS_MASK (PCI_CLASS_MASK >> 8)
-+
- static const struct pci_id_match NVPciIdMatchList[] = {
--    { PCI_VENDOR_NVIDIA, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0 },
--    { PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
-+    { PCI_VENDOR_NVIDIA, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
-+      PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 },
-+
-+    { PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
-+      PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 },
-+
-     { 0, 0, 0 }
- };
- #endif