pkg/43886: Update for x11/xf86-video-nv [patch]

[cheusov%tut.by@localhost]

>Number:         43886
>Category:       pkg
>Synopsis:       Update for x11/xf86-video-nv [patch]
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 16 18:05:00 +0000 2010
>Originator:     Aleksey Cheusov
>Release:        NetBSD 5.1_RC3
>Organization:
>Environment:
System: NetBSD asrock.chizhovka.net 5.1_RC3 NetBSD 5.1_RC3 (GENERIC) #1: Mon 
Jun 28 00:06:07 EEST 2010 
cheusov%asrock.chizhovka.net@localhost:/srv/obj/sys/arch/amd64/compile/GENERIC 
amd64
Architecture: x86_64
Machine: amd64
>Description:
Update of x11/xf86-video-nv is needed. New version of the software supports
lots of new graphic cards and it works fine for me with ION. Patch is below.
patches/* are removed because there were applied in upstream.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xf86-video-nv/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile    14 Sep 2010 11:03:14 -0000      1.20
+++ Makefile    16 Sep 2010 17:57:53 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.20 2010/09/14 11:03:14 wiz Exp $
 
-DISTNAME=      xf86-video-nv-2.1.14
-PKGREVISION=   2
+DISTNAME=      xf86-video-nv-2.1.18
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,6 +9,8 @@
 HOMEPAGE=      http://xorg.freedesktop.org/
 COMMENT=       Modular Xorg NVIDIA video driver
 
+LICENSE=       mit AND modified-bsd
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LIBTOOL=   YES
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xf86-video-nv/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo    9 Aug 2009 22:47:09 -0000       1.14
+++ distinfo    16 Sep 2010 17:57:53 -0000
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.14 2009/08/09 22:47:09 wiz Exp $
 
-SHA1 (xf86-video-nv-2.1.14.tar.bz2) = eda0e94c7a86c7cbc51a9a5de79e71813f28d045
-RMD160 (xf86-video-nv-2.1.14.tar.bz2) = 
cd1d21ffe9cfb115acd821fe6ea03b2572eb0aa6
-Size (xf86-video-nv-2.1.14.tar.bz2) = 380104 bytes
-SHA1 (patch-aa) = 46425003bc1a8bd8b80c31eeb59162ba5b33be16
-SHA1 (patch-ab) = 406f8233b47222e18ecad8288388122eadd1e0e6
+SHA1 (xf86-video-nv-2.1.18.tar.bz2) = d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2
+RMD160 (xf86-video-nv-2.1.18.tar.bz2) = 
8a3833ce1523f01306c5829dc2947ac90bcaddfc
+Size (xf86-video-nv-2.1.18.tar.bz2) = 354719 bytes
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- patches/patch-aa    9 Aug 2009 22:47:09 -0000       1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/08/09 22:47:09 wiz Exp $
-
---- src/nv_driver.c.orig       2009-06-27 00:47:57.000000000 +0000
-+++ src/nv_driver.c
-@@ -373,6 +373,7 @@ static SymTabRec NVKnownChipsets[] =
-   { 0x10DE0244, "GeForce Go 6150" },
-   { 0x10DE0245, "Quadro NVS 210S / NVIDIA GeForce 6150LE" },
-   { 0x10DE0247, "GeForce Go 6100" },
-+  { 0x10DE0533, "GeForce 7000M" },
- 
-   { 0x10DE03D0, "GeForce 6150SE" },
-   { 0x10DE03D1, "GeForce 6100 nForce 405" },
-@@ -764,6 +765,7 @@ NVIsSupported(CARD32 id)
-     case 0x0340:
-     case 0x0390:
-     case 0x03D0:
-+    case 0x0530:
-         return TRUE;
-     }
- 
-@@ -1685,6 +1687,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
-     case 0x0390:   /* GeForce 7600 */
-     case 0x0240:   /* GeForce 6100 */
-     case 0x03D0:
-+    case 0x0530:   /* GeForce 7000M */
-          pNv->Architecture =  NV_ARCH_40;
-          break;
-     default:
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab    12 May 2009 13:20:41 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/05/12 13:20:41 tnn Exp $
-
---- src/nv_hw.c.orig   2008-10-27 22:54:04.000000000 +0100
-+++ src/nv_hw.c
-@@ -890,6 +890,7 @@ void NVCalcStateExt (
-         case NV_ARCH_30:
-         default:
-             if(((pNv->Chipset & 0xfff0) == 0x0240) ||
-+             ((pNv->Chipset & 0xfff0) == 0x0530) ||
-                ((pNv->Chipset & 0xfff0) == 0x03D0))
-             {
-                 state->arbitration0 = 128; 
-@@ -1226,6 +1227,7 @@ void NVLoadStateExt (
-               case 0x01D0:
-               case 0x0240:
-               case 0x03D0:
-+              case 0x0530:
-                  pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4];
-                  pNv->PMC[0x1704/4] = 0;
-                  pNv->PMC[0x1708/4] = 0;
-@@ -1316,6 +1318,7 @@ void NVLoadStateExt (
-                    pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i];
-                    if(((pNv->Chipset & 0xfff0) != 0x0160) &&
-                       ((pNv->Chipset & 0xfff0) != 0x0220) &&
-+                      ((pNv->Chipset & 0xfff0) != 0x0530) &&
-                       ((pNv->Chipset & 0xfff0) != 0x0240))
-                    {
-                       pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i];