diff --git a/graphics/egl-wayland/Makefile b/graphics/egl-wayland/Makefile
index 21d965a739d8..9a0a5d407fb5 100644
--- a/graphics/egl-wayland/Makefile
+++ b/graphics/egl-wayland/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	egl-wayland
 DISTVERSION=	1.1.21
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	EGLStream-based Wayland external platform
+COMMENT=	NVIDIA graphics EGLStream Wayland platform
 WWW=		https://github.com/NVIDIA/egl-wayland
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	eglexternalplatform>=1.1:graphics/eglexternalplatform \
 		${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm \
 		wayland-protocols>=1.8:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libwayland-server.so:graphics/wayland
 
 USES=		gl meson pkgconfig
 USE_GITHUB=	yes
 USE_GL=		egl
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	NVIDIA
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e "/install/s/datadir')/prefix'), 'libdata'/" \
 		${WRKSRC}/meson.build
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/egl/egl_external_platform.d
 	${INSTALL_DATA} ${FILESDIR}/10_nvidia_wayland.json \
 		${STAGEDIR}${PREFIX}/share/egl/egl_external_platform.d
 
 .include <bsd.port.mk>
diff --git a/graphics/egl-wayland2/Makefile b/graphics/egl-wayland2/Makefile
index 3930d6b48f22..e5efe3ed1b5e 100644
--- a/graphics/egl-wayland2/Makefile
+++ b/graphics/egl-wayland2/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	egl-wayland2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Dma-buf-based Wayland external platform library
+COMMENT=	NVIDIA graphics dma-buf Wayland platform
 WWW=		https://github.com/NVIDIA/egl-wayland2
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm \
 		eglexternalplatform>=1.2:graphics/eglexternalplatform \
 		wayland-protocols>=1.8:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libwayland-server.so:graphics/wayland
 
 USES=		gl meson pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NVIDIA
 USE_GL=		egl gbm
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e "/install/s/datadir')/prefix'), 'libdata'/" \
 		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/graphics/egl-x11/Makefile b/graphics/egl-x11/Makefile
index f68cf2e248bc..f9f206ad0ed9 100644
--- a/graphics/egl-x11/Makefile
+++ b/graphics/egl-x11/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	egl-x11
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.5
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	EGL X11/XCB platform library for NVIDIA driver
+COMMENT=	NVIDIA graphics EGL xlib/xcb XWayland platform
 WWW=		https://github.com/NVIDIA/egl-x11
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	eglexternalplatform>=1.2:graphics/eglexternalplatform \
 		${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm
 
 USES=		gl meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl gbm
 USE_XORG=	x11 xcb
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	NVIDIA
 
 PLIST_SUB+=	SHLIB_VERSION=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-kmod/Makefile b/graphics/nvidia-drm-kmod/Makefile
index 5c4fd91d0950..f96c1ab772e1 100644
--- a/graphics/nvidia-drm-kmod/Makefile
+++ b/graphics/nvidia-drm-kmod/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	nvidia-drm-kmod
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 PORTREVISION?=	0
 CATEGORIES=	graphics kld
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	NVIDIA DRM Kernel Module
+COMMENT=	NVIDIA DRM kernel module
 WWW=		https://www.nvidia.com/object/unix.html
 
 USES=		metaport
 
 .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=         not supported on anything but FreeBSD (missing linuxkpi functionality)
 .else
 .  if ${OSVERSION} >= 1302000 && ${OSVERSION} < 1400097
 RUN_DEPENDS+=  ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod${PKGNAMESUFFIX}
 .  elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64)
 RUN_DEPENDS+=  ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod${PKGNAMESUFFIX}
 .  elif ${OSVERSION} >= 1500031 && ${ARCH} == amd64
 RUN_DEPENDS+=	${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-66-kmod${PKGNAMESUFFIX}
 .  elif ${OSVERSION} >= 1400508
 RUN_DEPENDS+=  ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod${PKGNAMESUFFIX}
 .  endif
 .endif
 
 RUN_DEPENDS+=  nvidia-driver${PKGNAMESUFFIX}>0:x11/nvidia-driver${PKGNAMESUFFIX}
 
 CONFLICTS_INSTALL=	nvidia-drm-kmod*
 
 .include <bsd.port.post.mk>
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index db1a11bb2887..cc86f9665a1f 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	nvidia-texture-tools
 PORTVERSION=	2.1.2
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	Texture Tools with support for DirectX 10 texture formats
+COMMENT=	Texture Tools with support for DirectX 10 formats
 WWW=		https://github.com/castano/nvidia-texture-tools
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc powerpc64 armv6 aarch64 powerpc64le # see src/nvcore/nvcore.h
 BROKEN_aarch64=	error: use of undeclared identifier '__builtin_ia32_emms'
 
 USES=		cmake compiler:c++11-lang
 CMAKE_ON=	NVTT_SHARED \
 		NVCORE_SHARED \
 		NVTHREAD_SHARED \
 		NVIMAGE_SHARED
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	castano
 USE_LDCONFIG=	yes
 
 CFLAGS_i386=	-msse -msse2
 
 PORTDOCS=	ChangeLog README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index cf72868a28c7..78067d56daa4 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	nvclock
 DISTVERSION=	0.8b4
 PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.8%20%28beta4%29
 DISTNAME=	nvclock${DISTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	NVidia graphic card status and overclocking tool
+COMMENT=	NVIDIA graphics status and overclocking tool
 WWW=		https://www.linuxhardware.org/nvclock/
 
 LICENSE=	GPLv2+
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	mandir=${STAGEDIR}${PREFIX}/share/man
 
 PLIST_FILES=	bin/nvclock bin/smartdimmer share/man/man1/nvclock.1.gz
 PORTDOCS=	ABOUT AUTHORS ChangeLog FAQ README
 
 OPTIONS_DEFINE=	NVCONTROL X11 DOCS
 OPTIONS_DEFAULT=	NVCONTROL X11
 
 NVCONTROL_DESC=	NV-CONTROL support (for OpenGL settings)
 X11_DESC=	Build GUI program (requires GTK 2.x)
 
 NVCONTROL_USE=		XORG=xext
 NVCONTROL_USES=		pkgconfig xorg
 NVCONTROL_CONFIGURE_OFF=	--disable-nvcontrol
 
 X11_USES=		gnome
 X11_USE=		GNOME=gtk20
 X11_CONFIGURE_OFF=	--disable-gtk
 X11_PLIST_FILES=	bin/nvclock_gtk share/applications/nvclock.desktop \
 			share/icons/hicolor/48x48/apps/nvclock.png
 
 post-patch:
 # Uphold our C[XX]FLAGS except for backend part, it must be compiled with -O0
 	@${REINPLACE_CMD} -E 's|^(C(XX)?FLAGS)=|\1+=|' \
 		${WRKSRC}/src/gtk/Makefile.in \
 		${WRKSRC}/src/qt/Makefile.in \
 		${WRKSRC}/src/nvcontrol/Makefile.in
 # Prevent recursive prepending of DESTDIR
 	@${REINPLACE_CMD} -E '/exec_prefix|bindir/s|\$$\(DESTDIR\)||' \
 		${WRKSRC}/src/gtk/Makefile.in \
 		${WRKSRC}/src/qt/Makefile.in
 	@${REINPLACE_CMD} 's/-lnvcontrol/& @X11_LIBS@/' \
 		${WRKSRC}/src/gtk/Makefile.in
 # Fix the build with -fno-common (for Clang 11 and GCC 10)
 	@${REINPLACE_CMD} '/option_list/s,^,extern ,' \
 		${WRKSRC}/src/nvcontrol/nvcontrol.h
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-nvitop/Makefile b/sysutils/py-nvitop/Makefile
index 240d83753509..d1ed6984fac4 100644
--- a/sysutils/py-nvitop/Makefile
+++ b/sysutils/py-nvitop/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=      nvitop
 PORTVERSION=   1.6.2
 CATEGORIES=    sysutils python
 MASTER_SITES=  PYPI
 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=    tiga@FreeBSD.org
-COMMENT=       Interactive NVIDIA-GPU process viewer
+COMMENT=       Interactive NVIDIA GPU process viewer
 WWW=           https://github.com/XuehaiPan/nvitop
 
 LICENSE=       APACHE20
 LICENSE_FILE=  ${WRKSRC}/LICENSE
 
 BUILD_DEPENDS= ${PY_SETUPTOOLS} \
                ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 RUN_DEPENDS=   ${PYTHON_PKGNAMEPREFIX}nvidia_ml_py>0:devel/py-nvidia-ml-py@${PY_FLAVOR} \
                ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 
 USES=          ncurses python
 USE_PYTHON=    autoplist pep517
 
 NO_ARCH=       yes
 
 .include <bsd.port.mk>
diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index 9c5486a3b2f2..b57811b9f357 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -1,619 +1,619 @@
 PORTNAME=	nvidia-libs
 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)
+COMMENT=	NVIDIA graphics libraries and programs (Linux)
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
 .include "${.CURDIR}/../nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 CONFLICTS_INSTALL=	linux-nvidia-libs*
 
 # Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
 # Kept for switching to centralized distinfo with suffixes.
 .ifdef PKGNAMESUFFIX
 DISTINFO_FILE=	${.CURDIR}/distinfo
 .endif
 
 .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} >= 570.00000
 LINUX_DATA+=	20_nvidia_xcb.json /usr/share/egl/egl_external_platform.d \
 		20_nvidia_xlib.json /usr/share/egl/egl_external_platform.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json,d'\
 		'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/20_nvidia_xlib.json,d'
 .endif
 .if ${NVVERSION} >= 595.00000
 LINUX_DATA+=	09_nvidia_wayland2.json /usr/share/egl/egl_external_platform.d
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/99_nvidia_wayland2.json,d'
 .elif ${NVVERSION} >= 590.00000
 LINUX_DATA+=	99_nvidia_wayland2.json /usr/share/egl/egl_external_platform.d
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/09_nvidia_wayland2.json,d'
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/09_nvidia_wayland2.json,d'
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl/egl_external_platform.d/99_nvidia_wayland2.json,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} >= 590.00000 # 590.000.00
 LINUX_LIBS+=	libnvidia-tileiras.so.${PORTVERSION}
 LINUX32_LIBS+=	libnvidia-tileiras.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-tileiras\.so,d'
 .endif
 
 ## graphics/egl-wayland supports
 ## Estimated to be upgraded often.
 .if ${NVVERSION} >= 570.18100
 NV_EGL_W_VERSION=	1.1.20
 .elif ${NVVERSION} >= 570.14400 # 570.144, excuding 570.181 to below 575.000
 NV_EGL_W_VERSION=	1.1.19
 .elif ${NVVERSION} >= 470.04201 # 470.42.01
 NV_EGL_W_VERSION=	1.1.7
 .elif ${NVVERSION} >= 387.012
 NV_EGL_W_VERSION=	1.0.2
 .elif ${NVVERSION} >= 364.012	# Intentionally kept to indicate from which version
 				# this library is introduced.
 NV_EGL_W_VERSION=	${PORTVERSION}
 .else # Fool proof (Poka-yoke)
 NV_EGL_W_VERSION=	""
 .endif
 
 .if ${NVVERSION} >= 364.012 # Start graphics/egl-wayland support
 LINUX_LIBS+=    libnvidia-egl-wayland.so.${NV_EGL_W_VERSION}
 LINUX_LINKS+=   libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayland.so.1
 .  if ${NVVERSION} >= 570.12400 # 570.124 added 32bit version supports
 LINUX32_LIBS+=	libnvidia-egl-wayland.so.${NV_EGL_W_VERSION}
 LINUX32_LINKS+=	libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayland.so.1
 .  else
 PLIST_RE+=	'\,${LINUXBASE}.*lib\/libnvidia-egl-wayland\.so,d'
 .  endif # 570.124
 PLIST_RE+=      '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${NV_EGL_W_VERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
 .endif # 364.012
 # End of graphics/egl-wayland supports
 
 ## graphics/egl-wayland2 supports
 ## Estimated to be upgraded often.
 .if ${NVVERSION} >= 590.00000
 NV_EGL_W2_VERSION=	1.0.1
 .else # Fool proof (Poka-yoke)
 NV_EGL_W2_VERSION=	""
 .endif
 
 .if ${NVVERSION} >= 590.00000 # Start graphics/egl-wayland2 support
 LINUX_LIBS+=    libnvidia-egl-wayland2.so.${NV_EGL_W2_VERSION}
 LINUX_LINKS+=   libnvidia-egl-wayland2.so.${NV_EGL_W2_VERSION} libnvidia-egl-wayland2.so.1
 LINUX32_LIBS+=	libnvidia-egl-wayland2.so.${NV_EGL_W2_VERSION}
 LINUX32_LINKS+=	libnvidia-egl-wayland2.so.${NV_EGL_W2_VERSION} libnvidia-egl-wayland2.so.1
 PLIST_RE+=      '\,${LINUXBASE},s/(libnvidia-egl-wayland2\.so)\.X/\1.${NV_EGL_W2_VERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland2\.so,d'
 .endif # 590.000.00
 # End of graphics/egl-wayland2 supports
 
 
 .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} >= 545.00000 # 545.00
 LINUX_LIBS+=	libnvidia-gpucomp.so.${PORTVERSION}
 LINUX32_LIBS+=  libnvidia-gpucomp.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'
 .endif # 545.00
 
 
 # nvidia-egl-X11 supports (not in x11/nvidia-driver nor separate ports)
 # Estimated to be upgrated often.
 .if ${NVVERSION} >= 595.00000 || \
 ${NVVERSION} >= 580.14200 && ${NVVERSION} < 590.00000	# 580.142 or 595
 NV_EGL_X_VERSION=	1.0.5
 .elif ${NVVERSION} >= 580.10508	# 580.105.08
 NV_EGL_X_VERSION=	1.0.4
 .elif ${NVVERSION} >= 570.18100	# 570.181
 NV_EGL_X_VERSION=	1.0.3
 .elif ${NVVERSION} >= 570.15302	# 570.153.02
 NV_EGL_X_VERSION=	1.0.2
 .elif ${NVVERSION} >= 570.14400 # 570.144
 NV_EGL_X_VERSION=	1.0.1
 .elif ${NVVERSION} >= 570.00000	# 570.00, Intentionally kept to clarify
 				# the start of egl-x11 support.
 NV_EGL_X_VERSION=	1.0.0
 .else # Fool proof (Poka-yoke)
 NV_EGL_X_VERSION=	""
 .endif
 
 .if ${NVVERSION} >= 570.00000 # 570.00, start of egl-x11 support
 LINUX_LIBS+=	libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} \
 		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION}
 LINUX_LINKS+=	libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so.1 \
 		libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so \
 		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so.1 \
 		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so
 LINUX32_LIBS+=  libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} \
 		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION}
 LINUX32_LINKS+=	libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so.1 \
 		libnvidia-egl-xcb.so.${NV_EGL_X_VERSION} libnvidia-egl-xcb.so \
 		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so.1 \
 		libnvidia-egl-xlib.so.${NV_EGL_X_VERSION} libnvidia-egl-xlib.so
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-(egl-xcb|egl-xlib)\.so)\.X/\1.${NV_EGL_X_VERSION}/'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(egl-xcb|egl-xlib),d'
 .endif
 # End nvidia-egl-X11 supports
 
 
 # nvidia-egl-gbm supports.
 .if ${NVVERSION} >= 580.12609 # 580.126.09
 NV_EGL_G_VERSION=	1.1.3
 .elif ${NVVERSION} >= 565.00000 # 565.00
 NV_EGL_G_VERSION=	1.1.2
 .elif ${NVVERSION} >= 550.00000 # 550.00
 NV_EGL_G_VERSION=	1.1.1
 .elif ${NVVERSION} >= 525.08902	# 525.89.02, Intentionally kept to clarify
 				# the start of nvidia-egl-gbm support
 NV_EGL_G_VERSION=	1.1.0
 .else # Fool proof (Poka-yoke)
 NV_EGL_G_VERSION=	""
 .endif # 565.00
 
 .if ${NVVERSION} >= 525.08902 # 525.89.02
 LINUX_LIBS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION}
 LINUX_LINKS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so.1 \
 		libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so
 .  if ${NVVERSION} >= 570.00000 # 570.00, first LINUX32 support
 LINUX32_LIBS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION}
 LINUX32_LINKS+=	libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so.1 \
 		libnvidia-egl-gbm.so.${NV_EGL_G_VERSION} libnvidia-egl-gbm.so
 .  endif # 570.00
 PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.${NV_EGL_G_VERSION}/'
 .endif # 525.89.02
 # End of nvidia-egl-gbm supports
 
 
 # Vulkan layer implementing NVIDIA Smooth Motion support
 .if ${NVVERSION} >= 580.06506 # 580.65.06
 LINUX_LIBS+=	libnvidia-present.so.${PORTVERSION}
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-present\.so,d'
 .endif # 580.65.06
 # End of Vulkan layer implementing NVIDIA Smooth Motion support
 
 
 .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}
 LINUX_LINKS+=	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 1297ab6d0ded..fb838e8765c5 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -1,301 +1,301 @@
 # 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?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	x11@FreeBSD.org
-COMMENT?=	NVidia graphics card binary drivers for hardware OpenGL rendering
+COMMENT?=	NVIDIA graphics driver userland
 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"
 
 FLAVORS=	xorg xlibre
 FLAVOR?=	${FLAVORS:[1]}
 
 # the package provides lib32 versions of the libraries, which then depends
 # themselves in non existing lib32 libraries, so we don't want the package
 # to end up depending on non existing libraries
 NO_SHLIB_REQUIRES_GLOB=*:32
 
 # Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
 # Kept for switching to centralized distinfo with suffixes.
 .ifdef PKGNAMESUFFIX
 DISTINFO_FILE=	${.CURDIR}/distinfo
 .endif
 
 # 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
 
 RUN_DEPENDS=	${KMODDIR}/nvidia.ko:x11/nvidia-kmod${PKGNAMESUFFIX}
 
 .if ${NVVERSION} >= 415.013
 LIB_DEPENDS+=	libnvidia-egl-wayland.so:graphics/egl-wayland
 .endif
 
 .if ${NVVERSION} >= 580.00000
 LIB_DEPENDS+=	libnvidia-egl-xcb.so:graphics/egl-x11
 LIB_DEPENDS+=	libnvidia-egl-wayland2.so:graphics/egl-wayland2
 .endif
 
 USES=		uidfix xorg
 .if ${NVVERSION} >= 470.04201
 USES+=		tar:xz
 .endif
 
 USE_XORG=	x11 xext
 .if ${FLAVOR} == xlibre
 PKGNAMEPREFIX=	xlibre-
 USES+=xlibre
 USE_XLIBRE+=	xlibre-server
 CONFLICTS_BUILD+=	xorg-server
 .else
 USE_XORG+=	xorg-server
 CONFLICTS_BUILD+=	xlibre-server
 .endif
 
 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
 
 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
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB+=	MODULESDIR=${MODULESDIR}
 .if ${NVVERSION} < 410.057
 PLIST_SUB+=	EXTENSIONSDIR=${EXTENSIONSDIR}
 .else
 PLIST_SUB+=	EXTENSIONSDIR="@comment "
 .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*
 
 .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
 # Patch only needed for non-kmod
 	${REINPLACE_CMD} -e '/SUBDIR=\tsrc \\/d' -e 's/\tlib/SUBDIR=\tlib/' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/\.if exists(firmware)/,/\.endif/d' \
 		${WRKSRC}/Makefile
 
 .if ${NVVERSION} >= 390
 	${REINPLACE_CMD} -e 's|/man/man1|/share/man/man1|' ${WRKSRC}/nvml/man/Makefile
 .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
 # 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
 # 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} < 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 || ${NVVERSION} >= 545.000
 	${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} < 545.000
 	${REINPLACE_CMD} -e '/libnvidia-gpucomp\.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
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/
 .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-kmod/Makefile b/x11/nvidia-kmod/Makefile
index 1fb53627f0d5..3d34f9a3eb6d 100644
--- a/x11/nvidia-kmod/Makefile
+++ b/x11/nvidia-kmod/Makefile
@@ -1,260 +1,260 @@
 # 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-kmod
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	x11@FreeBSD.org
-COMMENT?=	kmod part of NVidia graphics card binary drivers for hardware OpenGL rendering
+COMMENT?=	NVIDIA graphics driver kernel module
 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"
 
 # the package provides lib32 versions of the libraries, which then depends
 # themselves in non existing lib32 libraries, so we don't want the package
 # to end up depending on non existing libraries
 NO_SHLIB_REQUIRES_GLOB=*:32
 
 # Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
 DISTINFO_FILE=	${.CURDIR}/../nvidia-driver${PKGNAMESUFFIX}/distinfo
 
 # Share patches with main part of ports
 FILESDIR=	${.CURDIR}/../nvidia-driver/files
 PATCHDIR=	${FILESDIR}
 
 USES=		kmod uidfix
 .if ${NVVERSION} >= 470.04201
 USES+=		tar:xz
 .endif
 USE_LDCONFIG=	yes
 
 PIE_UNSAFE=	yes
 
 MAKE_ENV=	DEBUG_FLAGS=${DEBUG_FLAGS}
 SUB_FILES=	pkg-message
 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} < 470.25602 || ${NVVERSION} >= 480.00000 && ${NVVERSION} < 530.03002
 SUB_PATCHES+=	extra-patch-src-nvidia_subr.c
 .endif
 
 # At commit 9562994a7aacee2baae6ddee1a7b558b48ae39ef on main,
 # Local sym resolution was disabled by default in kernel linker.
 # Explicitly export functions from nvidia.ko to make nvidia-drm-*-kmod
 # ports work after the commit. These symbols do not exist in legacy
 # versions prior to 580 series.
 
 .if ${NVVERSION} >= 580.00000
 SUB_PATCHES+=	extra-patch-src-Makefile-2
 .endif
 
 # Temporarily disable GSP firmware as it is known to cause
 # issues with suspend/resume
 .if ${NVVERSION} >= 565.00000
 SUB_PATCHES+=	extra-gsp-patch-src-common-inc-nv_firmware_registry.h
 .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 += extra-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
 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
 
 CONFLICTS_INSTALL+=	nvidia-kmod*
 
 .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
 # Patch only needed for kmod
 	${REINPLACE_CMD} -e 's/SUBDIR=\tsrc \\/SUBDIR=\tsrc/' -e '/lib/,/doc/d' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/\.if exists(nvml)/,/\.endif/d' \
 		${WRKSRC}/Makefile
 
 # 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 ${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
 # 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
 # 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
 # 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} < 470.25602  || ${NVVERSION} >= 480.00000 && ${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 build with clang 21 for nvidia-modeset.ko
 .if ${NVVERSION:R} >= 390
 	${REINPLACE_CMD} -e 's/format (printf, 3, 4)/format (__printf__, 3, 4)/' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-os-interface.h
 	${REINPLACE_CMD} -e 's/va_list ap);/va_list ap); __attribute__((format (__printf__, 3, 0)));/' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-os-interface.h
 .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
 # DMAP_MIN_ADDRESS and DMAP_MAX_ADDRESS is deleted from src at commit
 # 4dd828c80828637452a8a4e07a64e294c82e5d8b on main branch.
 # Note that there are about 10 days of broken window, as the commit
 # does not have corresponding version bump.
 .if ${OSVERSION} >= 1500051
 	${REINPLACE_CMD} -e 's/DMAP_MIN_ADDRESS/kva_layout.dmap_low/' \
 		-e 's/DMAP_MAX_ADDRESS/kva_layout.dmap_high/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
 
 post-install: .SILENT
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
 .if ${NVVERSION} < 358.009
 	${REINPLACE_CMD} -e '/nvidia-modeset\.ko/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 560.02803
 	${REINPLACE_CMD} -e '/nvidia_gsp_ga10x_fw\.ko/d' ${TMPPLIST}
 	${REINPLACE_CMD} -e '/nvidia_gsp_tu10x_fw\.ko/d' ${TMPPLIST}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index f7470ed5d60c..f3e31e928010 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	nvidia-settings
 PORTVERSION=	580.142
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Display Control Panel for X NVidia driver
+COMMENT=	Display Control Panel for NVIDIA graphics
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	Nvidia driver is only available on x86
 
 BUILD_DEPENDS=	${LOCALBASE}/include/dbus-1.0/dbus/dbus.h:devel/dbus \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjansson.so:devel/jansson \
 		libvdpau.so:multimedia/libvdpau
 
 USES=		gl gmake gnome pkgconfig gettext-runtime xorg \
 		desktop-file-utils
 USE_GNOME=	gtk30 cairo gdkpixbuf
 USE_GL=		gl
 USE_XORG=	x11 xext xv xxf86vm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NVIDIA
 
 PLIST_FILES=	bin/nvidia-settings \
 		libexec/nvidia-settings \
 		lib/libnvidia-gtk3.so.${PORTVERSION} \
 		share/applications/nvidia-settings.desktop \
 		share/man/man1/nvidia-settings.1.gz \
 		share/pixmaps/nvidia-settings.png
 
 SUB_FILES=	nvidia-settings
 
 LDFLAGS+=	-pthread
 LLD_UNSAFE=	yes
 MAKE_ENV=	NV_USE_BUNDLED_LIBJANSSON=0 \
 		NV_VERBOSE=1 \
 		GTK2_AVAILABLE=0 \
 		INSTALL_DOC_ARGS="${INSTALL_MAN:Ninstall}" \
 		XNVCTRL_CFLAGS=-I${LOCALBASE}/include \
 		XNVCTRL_LDFLAGS=-L${LOCALBASE}/lib
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -E -e 's,__(PIXMAP|UTILS)_PATH__/,,' \
 		-e 's|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;HardwareSettings;|' \
 		${WRKSRC}/doc/nvidia-settings.desktop
 	${REINPLACE_CMD} -e 's|/usr/share/nvidia/|${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/|' \
 		${WRKSRC}/src/gtk+-2.x/ctkappprofile.c
 
 post-install:	.SILENT
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnvidia-gtk3.so.${PORTVERSION}
 	${RM} ${STAGEDIR}/${PREFIX}/lib/libnvidia-wayland-client.so.${PORTVERSION}
 	${INSTALL_DATA} ${WRKSRC}/doc/nvidia-settings.desktop \
 		${STAGEDIR}/${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/nvidia-settings.png \
 		${STAGEDIR}/${PREFIX}/share/pixmaps
 	${MV} ${STAGEDIR}${PREFIX}/bin/nvidia-settings \
 		${STAGEDIR}${PREFIX}/libexec/nvidia-settings
 	${INSTALL} ${WRKDIR}/nvidia-settings \
 		${STAGEDIR}${PREFIX}/bin/nvidia-settings
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
index eb1341c47a36..08e4ca924639 100644
--- a/x11/nvidia-xconfig/Makefile
+++ b/x11/nvidia-xconfig/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	nvidia-xconfig
 PORTVERSION=	580.142
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Tool to manipulate X configuration files for the NVidia driver
+COMMENT=	NVIDIA graphics X configuration utility
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 USES=		gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	NVIDIA
 
 MAKE_ENV=	NV_VERBOSE=1
 
 PLIST_FILES=	bin/nvidia-xconfig \
 		share/man/man1/nvidia-xconfig.1.gz
 
 .include <bsd.port.mk>