diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index 84a31944ade1..811be656adf5 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -1,506 +1,507 @@
 PORTNAME=	nvidia-libs
-DISTVERSION?=	535.98
+DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 linux
 MASTER_SITES=	NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/
 DISTNAME=	NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}
 EXTRACT_SUFX=	.run
 PKGNAMEPREFIX=	linux-
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	NVidia graphics libraries and programs (Linux version)
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
+.include "${.CURDIR}/../nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 .if ${DISTVERSION:R} > 390
 PORTSCOUT=	limit:\.\d+$$		# ignore *-no-compat32 distfiles
 .else
 PORTSCOUT=	limit:^${DISTVERSION:R}\.\d+$$
 .endif
 
 USES=		linux
 USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 
 PLIST_RE=	# empty
 
 LINUX_LIBDIR=	/usr/lib${ARCH:S/i386//:S/amd//}
 
 LINUX_LIBS=	libcuda.so.${PORTVERSION} \
 		libnvcuvid.so.${PORTVERSION} \
 		libnvidia-cfg.so.${PORTVERSION} \
 		libnvidia-glcore.so.${PORTVERSION} \
 		libnvidia-ml.so.${PORTVERSION} \
 		libnvidia-opencl.so.${PORTVERSION} \
 		libnvidia-tls.so.${PORTVERSION} \
 		libvdpau_nvidia.so.${PORTVERSION}
 LINUX_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
 		libcuda.so.${PORTVERSION} libcuda.so \
 		libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
 		libnvcuvid.so.${PORTVERSION} libnvcuvid.so \
 		libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so.1 \
 		libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
 		libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
 		libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
 LINUX32_LIBS=	libcuda.so.${PORTVERSION} \
 		libnvidia-glcore.so.${PORTVERSION} \
 		libnvidia-ml.so.${PORTVERSION} \
 		libnvidia-opencl.so.${PORTVERSION} \
 		libnvidia-tls.so.${PORTVERSION} \
 		libvdpau_nvidia.so.${PORTVERSION}
 .if ${NVVERSION} < 415.013
 LINUX_LIBS+=	tls/libnvidia-tls.so.${PORTVERSION}
 LINUX32_LIBS+=	tls/libnvidia-tls.so.${PORTVERSION}
 .endif
 LINUX32_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
 		libcuda.so.${PORTVERSION} libcuda.so \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
 		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
 		libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
 		libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
 LINUX_PROGS=	nvidia-debugdump nvidia-settings nvidia-smi nvidia-xconfig
 LINUX_MANS=	nvidia-settings nvidia-smi nvidia-xconfig
 LINUX_DATA=	nvidia.icd /etc/OpenCL/vendors
 .if ${NVVERSION} >= 375.010
 LINUX_DATA+=	10_nvidia.json /usr/share/glvnd/egl_vendor.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/glvnd,d'
 .endif
 .if ${NVVERSION} >= 378.009
 LINUX_DATA+=	10_nvidia_wayland.json /usr/share/egl/egl_external_platform.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl,d'
 .endif
 .if ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libEGL_nvidia.so.${PORTVERSION}
 LINUX_LINKS+=	libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
 LINUX32_LIBS+=	libEGL_nvidia.so.${PORTVERSION}
 LINUX32_LINKS+=	libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
 .elif ${NVVERSION} >= 355.006
 LINUX_LIBS+=	libEGL_nvidia.so.0
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so\.${PORTVERSION},d'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so,d'
 .endif
 .if ${NVVERSION} >= 361.016 && ${NVVERSION} < 450.051
 LINUX_LIBS+=	libnvidia-fatbinaryloader.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-fatbinaryloader.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d'
 .endif
 .if ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
 		libGLESv2_nvidia.so.${PORTVERSION} \
 		libGLX_nvidia.so.${PORTVERSION} \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION}
 LINUX_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
 		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
 LINUX32_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
 		libGLESv2_nvidia.so.${PORTVERSION} \
 		libGLX_nvidia.so.${PORTVERSION} \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION}
 LINUX32_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
 		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
 		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
 		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \
 		'\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \
 		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
 .endif
 .if ${NVVERSION} >= 535.05403 # 535.54.03
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-compiler\.so,d'
 .else
 LINUX_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
 .endif
 .if ${NVVERSION} >= 535.05403 # 535.54.03
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.11
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.11 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.11/'
 .elif ${NVVERSION} >= 495.02905 # 495.29.05
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.9
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'
 .elif ${NVVERSION} >= 470.04201 # 470.42.01
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.7
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.7 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.7/'
 .elif ${NVVERSION} >= 460.02704 # 460.27.04
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.5
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.5 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.5/'
 .elif ${NVVERSION} >= 440.026
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.4
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.4 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.4/'
 .elif ${NVVERSION} >= 435.017
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.3
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.3 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.3/'
 .elif ${NVVERSION} >= 418.030
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.2
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.2 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.2/'
 .elif ${NVVERSION} >= 410.057
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.0
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.0 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.0/'
 .elif ${NVVERSION} >= 396.018
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.3
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.3 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.3/'
 .elif ${NVVERSION} >= 387.012
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.2
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'
 .elif ${NVVERSION} >= 378.013
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.1
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.1 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.1/'
 .elif ${NVVERSION} >= 378.009
 LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.0
 LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.0 libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.0/'
 .elif ${NVVERSION} >= 364.012
 LINUX_LIBS+=	libnvidia-egl-wayland.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-egl-wayland.so.${PORTVERSION} libnvidia-egl-wayland.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
 .endif
 .if ${NVVERSION} >= 331.013 && ${NVVERSION} < 495.02905
 LINUX_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
 		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
 LINUX32_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
 		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-ifr,d'
 .endif
 .if ${NVVERSION} >= 331.013
 LINUX_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 		libnvidia-fbc.so.${PORTVERSION} \
 		libnvidia-glsi.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
 		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
 LINUX32_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 		libnvidia-fbc.so.${PORTVERSION} \
 		libnvidia-glsi.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
 		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(eglcore|fbc|glsi),d'
 .endif
 .if ${NVVERSION} >= 310.014
 LINUX_LIBS+=	libnvidia-encode.so.${PORTVERSION}
 LINUX_LINKS+=	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
 		libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
 LINUX32_LIBS+=	libnvidia-encode.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
 		libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
 PLIST_RE+=	'\,${LINUXBASE}.*libXvMCNVIDIA,d'
 .else
 LINUX_LIBS+=	libXvMCNVIDIA.so.${PORTVERSION}
 LINUX_LINKS+=	libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so.1 \
 		libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-encode,d'
 .endif
 .if ${NVVERSION} >= 346.016
 LINUX_LIBS+=	libnvidia-gtk2.so.${PORTVERSION} \
 		libnvidia-gtk3.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gtk(2|3)\.so,d'
 .endif
 .if ${NVVERSION} >= 331.049 && ${NVVERSION} < 352.009
 LINUX_DATA+=	monitoring.conf /usr/share/nvidia \
 		${WRKSRC}/pci.ids /usr/share/nvidia
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*monitoring\.conf,d' \
 		'\,${LINUXBASE}.*pci\.ids,d'
 .endif
 .if ${NVVERSION} >= 334.016
 LINUX_DATA+=	nvidia-application-profiles-${PORTVERSION}-key-documentation /usr/share/nvidia
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*application-profiles-${PORTVERSION}-key-documentation,d'
 .endif
 .if ${NVVERSION} >= 319.012
 LINUX_DATA+=	nvidia-application-profiles-${PORTVERSION}-rc /usr/share/nvidia
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*share/nvidia,d'
 .endif
 .if ${NVVERSION} >= 319.017
 LINUX_PROGS+=	nvidia-cuda-mps-control nvidia-cuda-mps-server \
 		nvidia-persistenced
 LINUX_MANS+=	nvidia-cuda-mps-control nvidia-persistenced
 .else
 LINUX_PROGS+=	nvidia-cuda-proxy-control nvidia-cuda-proxy-server
 LINUX_MANS+=	nvidia-cuda-proxy-control
 PLIST_RE+=	'\,${LINUXBASE},s/cuda-mps/cuda-proxy/' \
 		'\,${LINUXBASE}.*nvidia-persistenced,d'
 .endif
 .if ${NVVERSION} >= 364.012
 LINUX_DATA+=	nvidia_icd.json /etc/vulkan/icd.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/etc/vulkan,d'
 .endif
 .if ${NVVERSION} >= 410.057 && ${NVVERSION} < 495.02905
 LINUX_LIBS+=	libnvidia-cbl.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-cbl\.so,d'
 .endif
 .if ${NVVERSION} >= 410.057
 LINUX_LIBS+=	libnvidia-rtcore.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-rtcore\.so,d'
 .endif
 .if ${NVVERSION} >= 396.018
 LINUX_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d'
 .endif
 .if ${NVVERSION} >= 525.08902 # 525.89.02
 LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \
 		libnvidia-nvvm.so.${PORTVERSION} \
 		libnvidia-ngx.so.${PORTVERSION} \
 		libnvidia-allocator.so.${PORTVERSION} \
 		libnvidia-opticalflow.so.${PORTVERSION} \
 		libnvidia-egl-gbm.so.1.1.0
 LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \
 		libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so \
 		libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so.4 \
 		libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so \
 		libnvidia-opticalflow.so.${PORTVERSION} libnvidia-opticalflow.so.1 \
 		libnvidia-opticalflow.so.${PORTVERSION} libnvidia-opticalflow.so \
 		libnvoptix.so.${PORTVERSION} libnvoptix.so.1 \
 		libnvoptix.so.${PORTVERSION} libnvoptix.so
 LINUX32_LIBS+=  libnvidia-nvvm.so.${PORTVERSION} \
 		libnvidia-allocator.so.${PORTVERSION} \
 		libnvidia-opticalflow.so.${PORTVERSION}
 LINUX32_LINKS+= libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so.4 \
 		libnvidia-nvvm.so.${PORTVERSION} libnvidia-nvvm.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvoptix\.so,d' \
 		'\,${LINUXBASE}.*libnvidia-(allocator|egl-gbm|ngx|nvvm|opticalflow),d'
 .endif
 
 PLIST_SUB+=	LINUXBASE=${LINUXBASE} \
 		LINUX_LIBDIR=${LINUX_LIBDIR} \
 		SHLIB_VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
 USE_LINUX+=	libglvnd
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d' \
 		'\,${LINUXBASE}.*libGL\.so,d' \
 		'\,${LINUXBASE}.*libGLESv(1_CM|2)\.so,d' \
 		'\,${LINUXBASE}.*libGLX\.so,d' \
 		'\,${LINUXBASE}.*libGLdispatch\.so,d' \
 		'\,${LINUXBASE}.*libOpenGL\.so,d'
 .else
 .if ${NVVERSION} >= 390.042
 LINUX_LIBS+=	libEGL.so.1.1.0
 LINUX_LINKS+=	libEGL.so.1.1.0 libEGL.so.1
 LINUX32_LIBS+=	libEGL.so.1.1.0
 LINUX32_LINKS+=	libEGL.so.1.1.0 libEGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libEGL\.so)\.X/\1.1.1.0/'
 .elif ${NVVERSION} >= 355.006
 LINUX_LIBS+=	libEGL.so.1
 LINUX32_LIBS+=	libEGL.so.1
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so\.X,d'
 .elif ${NVVERSION} >= 331.013
 LINUX_LIBS+=	libEGL.so.${PORTVERSION}
 LINUX_LINKS+=	libEGL.so.${PORTVERSION} libEGL.so.1
 LINUX32_LIBS+=	libEGL.so.${PORTVERSION}
 LINUX32_LINKS+=	libEGL.so.${PORTVERSION} libEGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libEGL\.so)\.X/\1.${PORTVERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d'
 .endif
 .if ${NVVERSION} >= 390.042
 LINUX_LIBS+=	libGL.so.1.7.0
 LINUX_LINKS+=	libGL.so.1.7.0 libGL.so.1
 LINUX32_LIBS+=	libGL.so.1.7.0
 LINUX32_LINKS+=	libGL.so.1.7.0 libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.7.0/'
 .elif ${NVVERSION} >= 361.028
 LINUX_LIBS+=	libGL.so.1.0.0
 LINUX_LINKS+=	libGL.so.1.0.0 libGL.so.1
 LINUX32_LIBS+=	libGL.so.1.0.0
 LINUX32_LINKS+=	libGL.so.1.0.0 libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.0.0/'
 .elif ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGL.so.1
 LINUX32_LIBS+=	libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE}.*libGL\.so\.X,d'
 .else
 LINUX_LIBS+=	libGL.so.${PORTVERSION}
 LINUX_LINKS+=	libGL.so.${PORTVERSION} libGL.so.1
 LINUX32_LIBS+=	libGL.so.${PORTVERSION}
 LINUX32_LINKS+=	libGL.so.${PORTVERSION} libGL.so.1
 PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.${PORTVERSION}/'
 .endif
 .if ${NVVERSION} >= 390.042
 LINUX_LIBS+=	libGLESv1_CM.so.1.2.0 \
 		libGLESv2.so.2.1.0
 LINUX_LINKS+=	libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
 		libGLESv2.so.2.1.0 libGLESv2.so.2
 LINUX32_LIBS+=	libGLESv1_CM.so.1.2.0 \
 		libGLESv2.so.2.1.0
 LINUX32_LINKS+=	libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
 		libGLESv2.so.2.1.0 libGLESv2.so.2
 PLIST_RE+=	'\,${LINUXBASE},s/(libGLESv1_CM\.so)\.X/\1.1.2.0/' \
 		'\,${LINUXBASE},s/(libGLESv2\.so)\.X/\1.2.1.0/'
 .elif ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGLESv1_CM.so.1 \
 		libGLESv2.so.2
 LINUX32_LIBS+=	libGLESv1_CM.so.1 \
 		libGLESv2.so.2
 PLIST_RE+=	'\,${LINUXBASE}.*GLESv(1_CM|2)\.so\.X,d'
 .elif ${NVVERSION} >= 331.013
 LINUX_LIBS+=	libGLESv1_CM.so.${PORTVERSION} \
 		libGLESv2.so.${PORTVERSION}
 LINUX_LINKS+=	libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
 		libGLESv2.so.${PORTVERSION} libGLESv2.so.2
 LINUX32_LIBS+=	libGLESv1_CM.so.${PORTVERSION} \
 		libGLESv2.so.${PORTVERSION}
 LINUX32_LINKS+=	libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
 		libGLESv2.so.${PORTVERSION} libGLESv2.so.2
 PLIST_RE+=	'\,${LINUXBASE},s/(libGLESv(1_CM|2)\.so)\.X/\1.${PORTVERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)\.so,d'
 .endif
 .if ${NVVERSION} >= 361.016
 LINUX_LIBS+=	libGLX.so.0
 LINUX32_LIBS+=	libGLX.so.0
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLX\.so,d'
 .endif
 .if ${NVVERSION} >= 355.006
 LINUX_LIBS+=	libGLdispatch.so.0 \
 		libOpenGL.so.0
 LINUX32_LIBS+=	libGLdispatch.so.0 \
 		libOpenGL.so.0
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libGLdispatch\.so,d' \
 		'\,${LINUXBASE}.*libOpenGL\.so,d'
 .endif
 .endif	# ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
 
 .if ${ARCH} == amd64
 .if ${NVVERSION} >= 310.014
 LINUX32_LIBS+=	libnvcuvid.so.${PORTVERSION}
 LINUX32_LINKS+=	libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
 		libnvcuvid.so.${PORTVERSION} libnvcuvid.so
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/lib/libnvcuvid\.so,d'
 .endif
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=	LINUX32=""
 .else
 PLIST_SUB+=	LINUX32="@comment "
 .endif
 
 do-extract:
 	@(cd ${WRKDIR} && ${SH} \
 		${DISTDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run \
 		--extract-only > /dev/null)
 
 post-patch:
 .if ${NVVERSION} >= 384.047 && ${NVVERSION} < 435.017
 	@${SED} 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
 		${WRKSRC}/nvidia_icd.json.template > \
 		${WRKSRC}/nvidia_icd.json
 .endif
 
 do-install:
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
 .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/libvdpau(_trace)?\.so/d;}' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 310.019
 	${REINPLACE_CMD} -e '\,${LINUXBASE},!{/libXvMCNVIDIA/d;}' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d;}' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 352.009
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(lib)?nvidia-(debugdump|smi|ml)/d;}' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 355.006
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(libEGL_nvidia|GLdispatch|OpenGL)/d;}' \
 		${TMPPLIST}
 .else
 	${REINPLACE_CMD} '\,${LINUXBASE},!s/libEGL\.so\.${PORTVERSION}/libEGL.so/' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 361.028
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(EGL_nvidia\.so|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d;}' \
 		${TMPPLIST}
 .else
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/\/lib\/libGLESv[12](_CM)?(\.so)?(_nvidia.so(\.[0-9]|\.[0-9]+\.[0-9]+)?)?$$/d ; \
 		/libEGL_nvidia\.so\.${PORTVERSION}/d;}' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 415.013
 	${REINPLACE_CMD} -e '/tls\/libnvidia-tls\.so/d' ${TMPPLIST}
 .endif
 	${REINPLACE_CMD} -E ${PLIST_RE:S/^/-e /} ${TMPPLIST}
 .for f d in ${LINUX_DATA}
 	${MKDIR} ${STAGEDIR}${LINUXBASE}${d}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${LINUXBASE}${d}
 .endfor
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/nvidia-bug-report.sh \
 		${STAGEDIR}${LINUXBASE}/usr/bin
 .for p in ${LINUX_PROGS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${STAGEDIR}${LINUXBASE}/usr/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/share/man/man1
 .for m in ${LINUX_MANS}
 	${INSTALL_MAN} ${WRKSRC}/${m}.1.gz \
 		${STAGEDIR}${LINUXBASE}/usr/share/man/man1
 .endfor
 	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/tls
 	${MKDIR} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/vdpau
 .for l in ${LINUX_LIBS}
 	${INSTALL_LIB} ${WRKSRC}/${l} \
 		${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${l}
 .endfor
 .for s t in ${LINUX_LINKS}
 	${RLN} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${s} \
 		${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t}
 .endfor
 .if ${ARCH} == amd64
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls
 	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau
 .for l in ${LINUX32_LIBS}
 	${INSTALL_LIB} ${WRKSRC}/32/${l} \
 		${STAGEDIR}${LINUXBASE}/usr/lib/${l}
 .endfor
 .for s t in ${LINUX32_LINKS}
 	${RLN} ${STAGEDIR}${LINUXBASE}/usr/lib/${s} \
 		${STAGEDIR}${LINUXBASE}/usr/lib/${t}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 24f855878f47..a722675748f7 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -1,421 +1,425 @@
 # For those wondering why this port is not under `x11-drivers' category,
 # have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930.
 #
 # Starting with version 1.0-7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
 # you need to use legacy driver version and install one of corresponding
 # slave ports instead (`x11/nvidia-driver-470', `x11/nvidia-driver-390',
 # `x11/nvidia-driver-340', or `x11/nvidia-driver-304').
 #
 # To simplify testing of new feature branches and beta driver versions,
 # the port aims to support building against arbitrary DISTVERSION, i.e.
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
-DISTVERSION?=	535.98
+DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	danfe@FreeBSD.org
 COMMENT?=	NVidia graphics card binary drivers for hardware OpenGL rendering
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
+.include "${.CURDIR}/../nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 # Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
 # obj/libEGL_nvidia.so.0 (see below)
 .if ${NVVERSION} >= 410.057
 PATCH_DEPENDS=	gsed:textproc/gsed
 BUILD_DEPENDS=	pkg-config:devel/pkgconf
 LIB_DEPENDS=	libOpenGL.so:graphics/libglvnd
 .endif
 .if ${NVVERSION} >= 415.013
 LIB_DEPENDS+=	libnvidia-egl-wayland.so:graphics/egl-wayland
 .endif
 
 USES=		kmod uidfix xorg
 .if ${NVVERSION} >= 470.04201
 USES+=		tar:xz
 .endif
 USE_XORG=	x11 xorg-server xext
 USE_LDCONFIG=	yes
 
 PIE_UNSAFE=	yes
 
 EGL_JSON_PATH=		${PREFIX}/share/egl/egl_external_platform.d
 GLVND_JSON_PATH=	${PREFIX}/share/glvnd/egl_vendor.d
 VKICD_PATH=		${PREFIX}/share/vulkan/icd.d
 VKLAYERS_PATH=		${PREFIX}/share/vulkan/implicit_layer.d
 MAKE_ENV=	DEBUG_FLAGS=${DEBUG_FLAGS} \
 		EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
 		VKICD_PATH=${STAGEDIR}${VKICD_PATH} \
 		VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH}
 .if ${NVVERSION} < 495.02905
 MAKE_ENV+=	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH}
 .else
 MAKE_ENV+=	EGL_EXTERNAL_PLATFORM_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH}
 .endif
 SUB_FILES=	pkg-message
 .if !defined(LIBGLDIR)
 SUB_FILES+=	nvidia.conf
 .endif
 SUB_PATCHES=	extra-patch-src-Makefile \
 		extra-patch-src-nv-freebsd.h
 .if ${NVVERSION} < 510.03901
 SUB_PATCHES+=	extra-patch-src-nvidia_dev.c \
 		extra-patch-src-nvidia_pci.c
 .endif
 .if ${NVVERSION} < 530.03002
 SUB_PATCHES+=	extra-patch-src-nvidia_subr.c
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 EXTENSIONSDIR?=	${MODULESDIR}/extensions/.nvidia
 PORTDOCS=	*
 
 .if ${NVVERSION} >= 331.013
 SUB_LIST+=	NVGL=""
 .else
 SUB_LIST+=	NVGL="\# "
 .endif
 
 .if ${NVVERSION} < 355.006
 NVSRC=		.
 .else
 NVSRC=		nvidia
 .endif
 
 .if ${NVVERSION} < 358.009
 SUB_LIST+=	KLDNAME=nvidia
 .else
 SUB_LIST+=	KLDNAME=nvidia-modeset
 .endif
 
+.if ${NVVERSION} >= 530.03002 && ${NVVERSION} < 545.00
+SUB_PATCHES += surplus-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
+.endif
 .if ${NVVERSION} < 460.039
 .  if ${NVVERSION} >= 358.009
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
 .  endif
 SUB_PATCHES+=	extra-patch-src-nvidia_ctl.c \
 		extra-patch-src-nvidia_linux.c
 .elif ${NVVERSION} < 510.03901
 EXTRA_PATCHES+=	${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
 		${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \
 		${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
 .endif
 .if ${NVVERSION} < 470.04201
 SUB_PATCHES+=	extra-patch-src-nv-misc.h
 .endif
 
 OPTIONS_DEFINE=	ACPI_PM LINUX WBINVD DOCS
 OPTIONS_DEFINE_i386=	PAE
 OPTIONS_DEFAULT=	ACPI_PM LINUX
 
 ACPI_PM_DESC=		ACPI Power Management support
 LINUX_DESC=		Linux compatibility support
 PAE_DESC=		Physical Address Extensions support
 WBINVD_DESC=		Flush CPU caches directly with WBINVD
 
 .if ${NVVERSION} < 310.014
 OPTIONS_DEFINE+=	FREEBSD_AGP
 FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
 .endif
 
 PLIST_SUB+=	MODULESDIR=${MODULESDIR}
 .if ${NVVERSION} < 410.057
 PLIST_SUB+=	EXTENSIONSDIR=${EXTENSIONSDIR}
 .else
 PLIST_SUB+=	EXTENSIONSDIR="@comment "
 .endif
 .if defined(LIBGLDIR)
 PLIST_SUB+=	LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
 .else
 PLIST_SUB+=	LIBGLDIR="@comment " LIBGLMAP=""
 .endif
 
 # Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB
 .if ${NVVERSION} >= 515.04304
 PLIST_FILES+=	lib/libnvidia-wayland-client.so.${DISTVERSION}
 .endif
 
 CONFLICTS_INSTALL+=	nvidia-driver nvidia-driver-*
 .if ${PORTNAME} != nvidia-secondary-driver
 CONFLICTS_INSTALL+=	nvidia-secondary-driver
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 .for p in ${SUB_PATCHES}
 	@${SED} 's/%%NVSRC%%/${NVSRC}/g' ${PATCHDIR}/${p}.in > ${WRKDIR}/${p}
 .endfor
 .for p in ${SUB_PATCHES}
 EXTRA_PATCHES+=	${WRKDIR}/${p}
 .endfor
 
 post-patch: .SILENT
 # We should support -CURRENT: kill the check (first #if __FreeBSD_version)
 	linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h) ; ${REINPLACE_CMD} \
 		-e "$$linenum,+2d" ${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 # Adjust Linux headers #include's after FreeBSD src r246085
 	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \
 		{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \
 			${WRKSRC}/src/${NVSRC}/nvidia_linux.c
 # Fix bogus memset() call
 	${REINPLACE_CMD} -e '/memset/s/sizeof(ci/sizeof(*ci/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 # Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232
 	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .if ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .endif
 # KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318
 .if ${NVVERSION} < 530.03002
 	${REINPLACE_CMD} \
 	    -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \
 	    -e 's/kmem_free(kmem_arena, /kmem_free(/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
 # Pull the right header after FreeBSD src r347984
 .if ${OSVERSION} >= 1300029 && ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .endif
 # After src df38ada2931f, `sys/module.h' must be included after `sys/param.h'
 .if ${NVVERSION} >= 358.009
 	@${REINPLACE_CMD} -e '/^#include <sys\/param\.h>/d; \
 		/^#include <sys\/module\.h>/ { x; \
 		s:^:#include <sys/param.h>:; G; }' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .endif
 # Disable installation of Linux libraries (provided by the corresponding
 # `x11/linux-nvidia-libs' port or its slaves)
 	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \
 		${WRKSRC}/lib/Makefile
 # Do not install VDPAU libraries which are provided by `multimedia/libvdpau'
 # port for a while now
 	${REINPLACE_CMD} -e '/libvdpau[[:blank:]_][^n]/d ; \
 		s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile
 # Do not build any binaries (native nvidia-settings and nvidia-xconfig are
 # provided by their corresponding ports) and manual pages
 	${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
 	${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
 # Also do not install libnvidia-gtk* libraries which are for nvidia-settings
 .if ${NVVERSION} >= 346.016
 	${REINPLACE_CMD} -e '/libnvidia-gtk/d' ${WRKSRC}/lib/Makefile
 .endif
 # Adjust installation path of a conflicting file (shared between
 # nvidia-driver and xorg-server) to ease package manager work
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
 		${WRKSRC}/x11/extension/Makefile
 .endif
 # Do not execute afterinstall target (prevent automatic module registration
 # and "smart" installation of conflicting files heuristics)
 	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \
 		${WRKSRC}/lib/Makefile ${WRKSRC}/src/${NVSRC}/Makefile
 # /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
 # won't adhere to this stupidity and install nvidia-application-profiles-*
 # files as part of documentation
 .if ${NVVERSION} >= 410.057
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile ${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} -e '/AUXLINK_LINK/s,\$${DESTDIR},,' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/glvnd/egl_vendor\.d.{$$padding},${GLVND_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libglvnd/libEGL.so.1
 .elif ${NVVERSION} >= 334.016
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
 .endif
 .if ${NVVERSION} >= 415.013
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${EGL_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libEGL_nvidia.so.0
 .endif
 # Unbreak the build against -Werror,-Wunused-but-set-variable CFLAGS
 .if ${NVVERSION} < 450.51
 	${REINPLACE_CMD} -e '/void nvidia_dev_dtor/,+8s,.*status.*,,' \
 		${WRKSRC}/src/${NVSRC}/nvidia_dev.c
 .endif
 # Move symlinks under PREFIX
 .if ${NVVERSION} >= 525.08902
 	${REINPLACE_CMD} -e '/ln/s/$${LOCALBASE}\/lib/../' \
 		-e '/LIBDIR/!s/$${LOCALBASE}/$${DESTDIR}$${PREFIX}/' \
 		${WRKSRC}/lib/libnvidia-allocator/Makefile
 .endif
 # After src 2a99dd30dfaa, DRIVER_MODULE should not include nvidia_devclass
 .if ${OSVERSION} >= 1400058
 	${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \
 		${WRKSRC}/src/${NVSRC}/nvidia_pci.c
 .endif
 # Catch up with pmap_unmapdev() and kmem_*() changes in 14-CURRENT
 .if ${OSVERSION} >= 1400070 && ${NVVERSION} < 530.03002
 	${REINPLACE_CMD} -e '/pmap_unmapdev/s,(vm_offset_t),,' \
 		${WRKSRC}/src/${NVSRC}/nvidia_os.c
 	${REINPLACE_CMD} -e '/vm_offset_t virtual_address/s,vm_offset_t ,char *,' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 	${REINPLACE_CMD} -e '/vm_offset_t address;/s,vm_offset_t ,void *,' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
 # Fix a K&R prototype
 .if ${NVVERSION:R} >= 390
 	${REINPLACE_CMD} -e '/nvlink_allocLock/s,(),(void),' \
 		${WRKSRC}/src/${NVSRC}/nvlink_freebsd.c
 .endif
 # Finally, process OPTIONS
 .if ${PORT_OPTIONS:MFREEBSD_AGP}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 .if ${PORT_OPTIONS:MACPI_PM}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 .if ! ${PORT_OPTIONS:MLINUX}
 	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .  if ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -E 's/define (NVKMS_SUPPORT_LINUX_COMPAT)/undef \1/' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .  endif
 .endif
 .if ${PORT_OPTIONS:MPAE}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 .if ${PORT_OPTIONS:MWBINVD}
 	${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
 		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
 .endif
 # Conditionally install documentation (but you generally want it)
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
 .endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
 		${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions
 
 post-install: .SILENT
 	${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \
 		${STAGEDIR}${PREFIX}/bin
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
 .if ${NVVERSION:R} < 460
 	${REINPLACE_CMD} -e '/libnvidia-glvkspirv\.so/d ; \
 		/nvidia_icd\.json/d ; /nvidia_layers\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016
 	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 310.019
 	${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST}
 .else	# some applications need this symlink (see PR ports/72877)
 	${LN} -sf libXvMCNVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .endif
 .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 352.009
 	${REINPLACE_CMD} -E '/(lib)?nvidia-(debugdump|smi|ml)/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 358.009
 	${REINPLACE_CMD} -e '/nvidia-modeset\.ko/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -E '/lib(EGL|GLESv[12].*)_nvidia/d ; \
 		/lib(GLX|GLdispatch|OpenGL)/d ; \
 		/extensions\/libglxserver_nvidia\.so/d ; \
 		/10_nvidia\.json/d' ${TMPPLIST}
 .else
 	${REINPLACE_CMD} -e '/extensions\/\.nvidia\/libglx/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 415.013
 	${REINPLACE_CMD} -e '/libnvidia-egl-wayland\.so/d ; \
 		/10_nvidia_wayland\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 440.036
 	${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}
 .elif ${NVVERSION} < 465.01901
 	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 470.074
 	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 495.02905
 	${REINPLACE_CMD} -e '/libnvidia-egl-gbm\.so/d ; \
 		/15_nvidia_gbm\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 525.08902
 	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \
 		/nvidia-drm_gbm\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 410.057
 # Rename some libraries and install a libmap file to resolve conflict with
 # Mesa libraries.
 	${LN} -sf libGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGL.so
 .  if ${NVVERSION} >= 331.013
 	${LN} -sf libEGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libEGL.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so.1
 	${LN} -sf libGLESv2-NVIDIA.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
 .  endif
 # Configuration of Nvidia as secondary GPU requires preserving libglvnd or mesa
 # libraries as default implementation; a libmap must not override in this case.
 .  if !defined(LIBGLDIR)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/
 .  else
 # libgl proxies require a library path containing unrenamed lib*GL*.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBGLDIR}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGL.so.1
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libEGL.so.1
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 \
 		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGLESv2.so.2
 .  endif
 # Configuration of Nvidia as secondary GPU requires preserving xorg-server's
 # libglx.so and moving Nvidia's glx to where it can be found by a secondary
 # Xorg instance.
 # Not needed since 410.057: Nvidia driver finds libglxserver_nvidia.so instead.
 .  if ${EXTENSIONSDIR} != ${MODULESDIR}/extensions/.nvidia
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}
 	${MV} ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions/.nvidia/* \
 		${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}/
 .  endif
 .else
 	${REINPLACE_CMD} -E '/-NVIDIA/d ; \
 		/lib(Open)?E?GLX?(ESv[12](_CM)?|dispatch)?\.so/d' \
 		${TMPPLIST}
 # Override mesa.conf if GLX_EXT_libglvnd is missing
 	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_nvidia.so.0" \
 		>${STAGEDIR}${PREFIX}/etc/libmap.d/nvidia.conf
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
new file mode 100644
index 000000000000..751e2bcb6e9c
--- /dev/null
+++ b/x11/nvidia-driver/Makefile.version
@@ -0,0 +1,4 @@
+# NVIDIA Distversion
+#
+# This will be included from x11/nvidia-driver and the nvidia-drm port
+NVIDIA_DISTVERSION = 535.98
diff --git a/x11/nvidia-driver/files/surplus-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c.in b/x11/nvidia-driver/files/surplus-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c.in
new file mode 100644
index 000000000000..0df09d8811c6
--- /dev/null
+++ b/x11/nvidia-driver/files/surplus-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c.in
@@ -0,0 +1,131 @@
+--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig	2023-03-28 22:14:28 UTC
++++ src/nvidia-modeset/nvidia-modeset-freebsd.c
+@@ -368,6 +368,7 @@ struct nvkms_timer_t {
+     NvBool cancel;
+     NvBool complete;
+     NvBool isRefPtr;
++    NvBool needsNvkmsLock;
+     NvBool callout_created;
+     nvkms_timer_proc_t *proc;
+     void *dataPtr;
+@@ -406,7 +407,14 @@ static void nvkms_taskqueue_callback(void *arg, int pe
+         callout_drain(&timer->callout);
+     }
+ 
+-    sx_xlock(&nvkms_lock);
++    /*
++     * Only lock if this timer requests it. DRM's callback nv_drm_event_callback
++     * will not need this, since it may reenter nvkms through the kapi and lock
++     * nvkms_lock then.
++     */
++    if (timer->needsNvkmsLock) {
++        sx_xlock(&nvkms_lock);
++    }
+ 
+     if (timer->isRefPtr) {
+         // If the object this timer refers to was destroyed, treat the timer as
+@@ -424,11 +432,13 @@ static void nvkms_taskqueue_callback(void *arg, int pe
+         timer->complete = NV_TRUE;
+     }
+ 
++    if (timer->needsNvkmsLock) {
++        sx_xunlock(&nvkms_lock);
++    }
++
+     if (timer->cancel || timer->isRefPtr) {
+         nvkms_free(timer, sizeof(*timer));
+     }
+-
+-    sx_xunlock(&nvkms_lock);
+ }
+ 
+ static void nvkms_callout_callback(void *arg)
+@@ -441,11 +451,13 @@ nvkms_init_timer(struct nvkms_timer_t *timer, nvkms_ti
+ 
+ static void
+ nvkms_init_timer(struct nvkms_timer_t *timer, nvkms_timer_proc_t *proc,
+-                 void *dataPtr, NvU32 dataU32, NvBool isRefPtr, NvU64 usec)
++                 void *dataPtr, NvU32 dataU32, NvBool isRefPtr, NvU64 usec,
++                 NvBool needsNvkmsLock)
+ {
+     timer->cancel = NV_FALSE;
+     timer->complete = NV_FALSE;
+     timer->isRefPtr = isRefPtr;
++    timer->needsNvkmsLock = needsNvkmsLock;
+ 
+     timer->proc = proc;
+     timer->dataPtr = dataPtr;
+@@ -479,19 +491,27 @@ nvkms_init_timer(struct nvkms_timer_t *timer, nvkms_ti
+     mtx_unlock_spin(&nvkms_timers.lock);
+ }
+ 
+-nvkms_timer_handle_t*
+-nvkms_alloc_timer(nvkms_timer_proc_t *proc,
+-                  void *dataPtr, NvU32 dataU32,
+-                  NvU64 usec)
++static nvkms_timer_handle_t*
++nvkms_alloc_timer_locked(nvkms_timer_proc_t *proc,
++                         void *dataPtr, NvU32 dataU32,
++                         NvU64 usec, NvBool needsNvkmsLock)
+ {
+     // nvkms_alloc_timer cannot be called from an interrupt context.
+     struct nvkms_timer_t *timer = nvkms_alloc(sizeof(*timer), NV_TRUE);
+     if (timer) {
+-        nvkms_init_timer(timer, proc, dataPtr, dataU32, NV_FALSE, usec);
++        nvkms_init_timer(timer, proc, dataPtr, dataU32, NV_FALSE, usec, needsNvkmsLock);
+     }
+     return timer;
+ }
+ 
++nvkms_timer_handle_t*
++nvkms_alloc_timer(nvkms_timer_proc_t *proc,
++                  void *dataPtr, NvU32 dataU32,
++                  NvU64 usec)
++{
++    return nvkms_alloc_timer_locked(proc, dataPtr, dataU32, usec, NV_TRUE);
++}
++
+ NvBool
+ nvkms_alloc_timer_with_ref_ptr(nvkms_timer_proc_t *proc,
+                                struct nvkms_ref_ptr *ref_ptr,
+@@ -506,7 +526,7 @@ nvkms_alloc_timer_with_ref_ptr(nvkms_timer_proc_t *pro
+         // Reference the ref_ptr to make sure that it doesn't get freed before
+         // the timer fires.
+         nvkms_inc_ref(ref_ptr);
+-        nvkms_init_timer(timer, proc, ref_ptr, dataU32, NV_TRUE, usec);
++        nvkms_init_timer(timer, proc, ref_ptr, dataU32, NV_TRUE, usec, NV_TRUE);
+     }
+ 
+     return timer != NULL;
+@@ -570,10 +590,11 @@ nvkms_event_queue_changed(nvkms_per_open_handle_t *pOp
+             break;
+         case NVKMS_CLIENT_KERNEL_SPACE:
+             if (!popen->kernel.task) {
+-                popen->kernel.task = nvkms_alloc_timer(nvkms_kapi_task_callback,
+-                                                       popen,
+-                                                       0, /* dataU32 */
+-                                                       0 /* callout delay */);
++                popen->kernel.task = nvkms_alloc_timer_locked(nvkms_kapi_task_callback,
++                                                              popen,
++                                                              0, /* dataU32 */
++                                                              0, /* callout delay */
++                                                              NV_FALSE);
+             }
+             break;
+     }
+@@ -828,10 +849,11 @@ static struct nvkms_per_open *nvkms_open_common(enum N
+         case NVKMS_CLIENT_KERNEL_SPACE:
+             /* enqueue our new task */
+             popen->kernel.device = device;
+-            popen->kernel.task = nvkms_alloc_timer(nvkms_kapi_task_callback,
+-                                                   popen,
+-                                                   0, /* dataU32 */
+-                                                   0 /* callout delay */);
++            popen->kernel.task = nvkms_alloc_timer_locked(nvkms_kapi_task_callback,
++                                                          popen,
++                                                          0, /* dataU32 */
++                                                          0, /* callout delay */
++                                                          NV_FALSE);
+             break;
+     }
+