[PATCH] dfports: x11/nvidia-driver

[Emiel Kollof <coolvibe@xxxxxxxxxxxxxxxx>]

Hi,

Attached is a patch for the x11/nvidia-driver override port. It makes
the kld compile and install again.

Please review.

Cheers,
Emiel
-- 

Index: Makefile
===================================================================
RCS file: /home/dcvs/dfports/x11/nvidia-driver/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	14 Oct 2003 00:01:43 -0000	1.1
+++ Makefile	12 Jan 2004 13:57:14 -0000
@@ -81,6 +81,7 @@
 	@${MKDIR} ${LINUXBASE}/usr/lib
 .endif
 	-@(kldstat -n linux || kldload linux)
+	-rm ${WRKSRC}/module/i386 # hack
 
 post-install:
 .if ${OSVERSION} < 500000
Index: files/patch-aa
===================================================================
RCS file: /home/dcvs/dfports/x11/nvidia-driver/files/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- files/patch-aa	14 Oct 2003 00:01:45 -0000	1.1
+++ files/patch-aa	12 Jan 2004 13:56:03 -0000
@@ -1,6 +1,6 @@
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/module/Makefile ./module/Makefile
---- ../NVIDIA-FreeBSD-x86-1.0-4365/module/Makefile	Wed May 28 18:51:52 2003
-+++ ./module/Makefile	Fri Oct 10 13:09:27 2003
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/module/Makefile	Wed May 28 16:51:52 2003
++++ ./module/Makefile	Sun Jan 11 04:51:56 2004
 @@ -6,7 +6,7 @@
  KMOD=		nvidia
  SRCS=		nvidia_ctl.c nvidia_dev.c nvidia_linux.c nvidia_os.c nvidia_os_pci.c nvidia_os_registry.c nvidia_pci.c nvidia_subr.c nvidia_sysctl.c 
@@ -11,9 +11,17 @@
  OBJS+=		NVIDIA.o
  NOOBJ=		true
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nv-freebsd.h ./src/nv-freebsd.h
---- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nv-freebsd.h	Wed Oct  8 18:22:17 2003
-+++ ./src/nv-freebsd.h	Fri Oct 10 13:26:26 2003
-@@ -75,12 +75,12 @@
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nv-freebsd.h	Wed May 28 16:51:53 2003
++++ ./src/nv-freebsd.h	Sun Jan 11 04:52:47 2004
+@@ -20,6 +20,7 @@
+ #endif
+ 
+ #include <sys/param.h>
++#include <stdarg.h>
+ 
+ /*
+  * This driver relies on a few changes to the FreeBSD kernel that are not
+@@ -75,12 +76,12 @@
  #include <vm/pmap.h>
  #include <vm/vm_map.h>
  
@@ -29,7 +37,7 @@
  
  #if __FreeBSD_version >= 500000
  #include <sys/mutex.h>
-@@ -102,8 +102,8 @@
+@@ -102,8 +103,8 @@
  
  #else
  #include <machine/smp.h>
@@ -40,7 +48,7 @@
  
  #define vm_page_lock_queues()
  #define vm_page_unlock_queues()
-@@ -116,8 +116,8 @@
+@@ -116,8 +117,8 @@
   * on FreeBSD, due to its thread-aware reference counting.
   */
  
@@ -52,8 +60,8 @@
  #endif
  
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_ctl.c ./src/nvidia_ctl.c
---- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_ctl.c	Wed Oct  8 18:22:17 2003
-+++ ./src/nvidia_ctl.c	Fri Oct 10 13:27:59 2003
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_ctl.c	Wed May 28 16:51:52 2003
++++ ./src/nvidia_ctl.c	Sun Jan 11 04:51:56 2004
 @@ -20,6 +20,12 @@
  
  static struct cdevsw nvidia_ctl_cdevsw = {
@@ -103,8 +111,8 @@
          destroy_dev(nvidia_ctl_cdev);
      }
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_dev.c ./src/nvidia_dev.c
---- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_dev.c	Wed Oct  8 18:22:17 2003
-+++ ./src/nvidia_dev.c	Fri Oct 10 13:19:08 2003
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_dev.c	Wed May 28 16:51:52 2003
++++ ./src/nvidia_dev.c	Sun Jan 11 04:51:56 2004
 @@ -21,6 +21,12 @@
  
  static struct cdevsw nvidia_dev_cdevsw = {
@@ -136,8 +144,8 @@
      .d_open =      nvidia_dev_open,
      .d_close =     nvidia_dev_close,
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_linux.c ./src/nvidia_linux.c
---- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_linux.c	Wed May 28 18:51:52 2003
-+++ ./src/nvidia_linux.c	Fri Oct 10 13:19:26 2003
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_linux.c	Wed May 28 16:51:52 2003
++++ ./src/nvidia_linux.c	Sun Jan 11 04:51:56 2004
 @@ -33,7 +33,7 @@
       * copy the user data in/out correctly.
       */
@@ -148,8 +156,8 @@
  
  struct linux_ioctl_handler nvidia_handler = {
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_os.c ./src/nvidia_os.c
---- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_os.c	Wed Oct  8 18:22:17 2003
-+++ ./src/nvidia_os.c	Fri Oct 10 13:22:20 2003
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_os.c	Wed May 28 16:51:52 2003
++++ ./src/nvidia_os.c	Sun Jan 11 04:51:56 2004
 @@ -164,11 +164,7 @@
  
  BOOL os_is_administrator(PHWINFO pDev)
@@ -163,8 +171,8 @@
  
  U008 os_io_read_byte(
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_pci.c ./src/nvidia_pci.c
---- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_pci.c	Wed Oct  8 18:22:17 2003
-+++ ./src/nvidia_pci.c	Fri Oct 10 13:20:24 2003
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_pci.c	Wed May 28 16:51:52 2003
++++ ./src/nvidia_pci.c	Sun Jan 11 04:51:56 2004
 @@ -96,7 +96,7 @@
      mtx_init(&sc->mtx_api, "dev.mtx_api", NULL, MTX_DEF);
      mtx_init(&sc->mtx_rm,  "dev.mtx_rm",  NULL, MTX_SPIN);
@@ -184,8 +192,8 @@
  
      status = nvidia_detach(dev);
 diff -urN ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_subr.c ./src/nvidia_subr.c
---- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_subr.c	Wed Oct  8 18:22:17 2003
-+++ ./src/nvidia_subr.c	Fri Oct 10 13:27:19 2003
+--- ../NVIDIA-FreeBSD-x86-1.0-4365/src/nvidia_subr.c	Wed May 28 16:51:52 2003
++++ ./src/nvidia_subr.c	Sun Jan 11 04:51:56 2004
 @@ -297,7 +297,7 @@
      u_long cmd,
      caddr_t data,