- Use accurate NVVERSION for checking libcuda compat library presence

- Now that no version of drivers installs nvidia_drv.o, remove the check
  and clean up pkg-plist

2 files changed, 4 insertions, 4 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 248e9b6ba090..632c20a817e1 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -108,14 +108,15 @@ post-install:
 # pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's
 .if ${NVVERSION} < 817400
 	@${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST}
-.else
-	@${REINPLACE_CMD} '/nvidia_drv\.o/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 974600
 	@${REINPLACE_CMD} '/wfb/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 1802900
-	@${REINPLACE_CMD} '/libcuda/d ; /libvdpau/d' ${TMPPLIST}
+	@${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST}
+.endif
+.if ${NVVERSION} < 1851829
+	@${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST}
 .endif
 # Some applications need this symlink (see PR ports/72877)
 	@${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 9498be854bff..ea374077f974 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -27,7 +27,6 @@ lib/libXvMCNVIDIA.so
 lib/libXvMCNVIDIA.a
 lib/libXvMCNVIDIA_dynamic.so.1
 %%MODULESDIR%%/libnvidia-wfb.so.1
-%%MODULESDIR%%/drivers/nvidia_drv.o
 %%MODULESDIR%%/drivers/nvidia_drv.so
 %%MODULESDIR%%/extensions/libglx.so.1
 @dirrmtry %%MODULESDIR%%/drivers