2 files changed, 15 insertions, 17 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 47a6c4839110..6bd8557f6d8e 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	nvidia-driver
 DISTVERSION?=	319.32
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
-CATEGORIES=	x11 kld
+CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
 DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
@@ -18,8 +18,8 @@ LICENSE_NAME=	License For Customer Use of NVIDIA Software
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-SSP_UNSAFE=	kernel module does not support ssp
 ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
+USES=		kmod
 USE_XORG=	xorg-server
 USE_GL=		gl
 USE_LDCONFIG=	yes
@@ -29,9 +29,8 @@ USE_LDCONFIG=	yes
 # -Wmissing-include-dirs was added for kernel sources.  Until properly
 # fixed upstream (across all versions, including legacy ones), use this
 # hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
-# since it is going away from `Mk/bsd.port.mk' as deprecated.
-MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} \
-		SYSDIR=${SRC_BASE}/sys
+# since it is still used by legacy drivers.
+MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 890b9bb5d1ef..7c2a9de4bb3b 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -2,28 +2,27 @@ bin/nvidia-bug-report.sh
 lib/.nvidia/libGL.so
 lib/.nvidia/libGL.so.1
 @dirrm lib/.nvidia
-lib/libnvidia-tls.so.1
-lib/libnvidia-tls.so
-lib/libnvidia-cfg.so.1
-lib/libnvidia-cfg.so
-lib/libGLcore.so.1
 lib/libGLcore.so
-lib/vdpau/libvdpau_nvidia.so.1
-lib/libvdpau_nvidia.so
-lib/libXvMCNVIDIA.so.1
-lib/libXvMCNVIDIA.so
+lib/libGLcore.so.1
 lib/libXvMCNVIDIA.a
+lib/libXvMCNVIDIA.so
+lib/libXvMCNVIDIA.so.1
 lib/libXvMCNVIDIA_dynamic.so.1
+lib/libnvidia-cfg.so
+lib/libnvidia-cfg.so.1
+lib/libnvidia-tls.so
+lib/libnvidia-tls.so.1
+lib/libvdpau_nvidia.so
+lib/vdpau/libvdpau_nvidia.so.1
 @dirrmtry lib/vdpau
-%%MODULESDIR%%/libnvidia-wfb.so.1
 %%MODULESDIR%%/drivers/nvidia_drv.so
 %%MODULESDIR%%/extensions/.nvidia/libglx.so
 %%MODULESDIR%%/extensions/.nvidia/libglx.so.1
+%%MODULESDIR%%/libnvidia-wfb.so.1
 @dirrm %%MODULESDIR%%/extensions/.nvidia
 @dirrmtry %%MODULESDIR%%/drivers
-@cwd /boot/modules
+@cwd /%%KMODDIR%%
 nvidia.ko
-@unexec kldxref %D
 %%LINUX%%@cwd %%LINUXBASE%%
 %%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%%
 %%LINUX%%usr/lib/libGL.so.1