- handles the rename of PCIR_HEADERTYPE -> PCIR_HDRTYPE #define

- nvidia.ko is now installed under /boot/modules rather
  than /boot/kernel on 5.x

PR:		ports/61867
Submitted by:	maintainer

4 files changed, 22 insertions, 6 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 4a776f08398b..9bb21e649a12 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvidia-driver
 PORTVERSION=	1.0.${NVVERSION}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		ftp://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
@@ -59,19 +59,24 @@ pre-everything::
 	@${ECHO_MSG} "Define WITH_NVIDIA_HACKS to enable work-arounds to override basic AGP setup"
 .endif
 
-.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) || defined(WITH_NVIDIA_HACKS)
+.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) || defined(WITH_NVIDIA_HACKS) || ${OSVERSION} > 501106
 USE_REINPLACE=	yes
 
 post-patch:
 . if defined(WITH_FREEBSD_AGP)
-	@${REINPLACE_CMD} "s/undef USE_OS_AGP_GART/define USE_OS_AGP_GART/" \
+	@${REINPLACE_CMD} 's/undef USE_OS_AGP_GART/define USE_OS_AGP_GART/' \
 		${WRKSRC}/src/nv-freebsd.h
 . endif
 . if defined(FORCE_AGP_RATE)
-	@${REINPLACE_CMD} 's/NVreg_ReqAGPRate,[[:blank:]]*0/NVreg_ReqAGPRate, 1/' ${WRKSRC}/src/nvidia_os_registry.c
+	@${REINPLACE_CMD} 's/NVreg_ReqAGPRate,[[:blank:]]*0/NVreg_ReqAGPRate, 1/' \
+		${WRKSRC}/src/nvidia_os_registry.c
 . endif
 . if defined(WITH_NVIDIA_HACKS)
-	@${REINPLACE_CMD} 's/NVreg_UpdateKernelAGP,[[:blank:]]*1/NVreg_UpdateKernelAGP, 0/' ${WRKSRC}/src/nvidia_os_registry.c
+	@${REINPLACE_CMD} 's/NVreg_UpdateKernelAGP,[[:blank:]]*1/NVreg_UpdateKernelAGP, 0/' \
+		${WRKSRC}/src/nvidia_os_registry.c
+. endif
+. if ${OSVERSION} > 501106
+	@${REINPLACE_CMD} 's/PCIR_HEADERTYPE/PCIR_HDRTYPE/' ${WRKSRC}/src/nvidia_sysctl.c
 . endif
 .endif
 
diff --git a/x11/nvidia-driver/files/patch-module::Makefile b/x11/nvidia-driver/files/patch-module::Makefile
new file mode 100644
index 000000000000..7a5768b48624
--- /dev/null
+++ b/x11/nvidia-driver/files/patch-module::Makefile
@@ -0,0 +1,11 @@
+--- module/Makefile.orig	Wed May 28 23:51:52 2003
++++ module/Makefile	Sun Jan 25 11:47:48 2004
+@@ -14,6 +14,8 @@
+ BUILD_DONE=	${.CURDIR}/.build_done
+ CLEANFILES+=	${BUILD_DONE}
+ 
++KMODDIR?=	/boot/modules
++
+ #
+ # To enable debugging see nvidia_debug.h
+ # uncomment the following line and change the 'debug'
diff --git a/x11/nvidia-driver/files/patch-nvidia_pci.c b/x11/nvidia-driver/files/patch-src::nvidia_pci.c
index b2e92abdf256..b2e92abdf256 100644
--- a/x11/nvidia-driver/files/patch-nvidia_pci.c
+++ b/x11/nvidia-driver/files/patch-src::nvidia_pci.c
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 3925c718afc2..693bf7b1f96c 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -28,7 +28,7 @@ share/doc/NVIDIA/README.Linux
 share/doc/NVIDIA/XF86Config.sample
 share/doc/NVIDIA/license.txt
 %%FREEBSD4%%@cwd /modules
-%%FREEBSD5%%@cwd /boot/kernel
+%%FREEBSD5%%@cwd /boot/modules
 nvidia.ko
 %%FREEBSD4%%@cwd /dev
 %%FREEBSD4%%MAKEDEV.nvidia