ports/63326: PORT UPDATE: x11/nvidia-driver catchup after __FreeBSD_version bump of 502103

[Alexey Dokuchaev]

>Number:         63326
>Category:       ports
>Synopsis:       PORT UPDATE: x11/nvidia-driver catchup after __FreeBSD_version bump of 502103
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 24 18:10:06 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Alexey Dokuchaev
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
CNIT NSU
>Environment:
System: FreeBSD regency.nsu.ru 4.9-STABLE FreeBSD 4.9-STABLE #2: Sat Feb 7 22:10:21 NOVT 2004 root at regency.nsu.ru:/usr/obj/usr/src/sys/REGENCY i386
>Description:
These patches required for this port to work with versions after 502103
(inclusive).
>How-To-Repeat:
N/A
>Fix:
Please put these 3 patches under files/:

%%% patch-src::nv-freebsd.h %%%
--- src/nv-freebsd.h.orig	Wed May 28 23:51:53 2003
+++ src/nv-freebsd.h	Wed Feb 25 07:57:39 2004
@@ -217,7 +217,9 @@
 } nvidia_softc_t;
 
 
+#if __FreeBSD_version < 502103
 #define CDEV_MAJOR      180
+#endif
 #define CDEV_CTL_MINOR  255
 
 extern devclass_t nvidia_devclass;
%%% patch-src::nvidia_ctl.c %%%
--- src/nvidia_ctl.c.orig	Sun Feb 22 13:05:46 2004
+++ src/nvidia_ctl.c	Sun Feb 22 13:07:25 2004
@@ -43,7 +43,12 @@
     .d_ioctl =     nvidia_ctl_ioctl,
     .d_poll =      nvidia_ctl_poll,
     .d_name =      "nvidiactl",
+#if __FreeBSD_version < 502103
     .d_maj =       CDEV_MAJOR,
     .d_flags =     D_TRACKCLOSE
+#else
+    .d_version =   D_VERSION, 
+    .d_flags =     D_NEEDGIANT
+#endif 
 #endif
 };
%%% patch-src::nvidia_dev.c %%%
--- src/nvidia_dev.c.orig	Wed May 28 12:51:52 2003
+++ src/nvidia_dev.c	Sun Feb 22 13:36:25 2004
@@ -45,7 +45,12 @@
     .d_poll =      nvidia_dev_poll,
     .d_mmap =      nvidia_dev_mmap,
     .d_name =      "nvidia",
+#if __FreeBSD_version < 502103
     .d_maj =       CDEV_MAJOR,
     .d_flags =     D_MEM|D_TRACKCLOSE
+#else
+    .d_version =   D_VERSION,
+    .d_flags   =   D_MEM|D_TRACKCLOSE|D_NEEDGIANT
+#endif
 #endif
 };
>Release-Note:
>Audit-Trail:
>Unformatted: