- Stop checking for XFree86-4-Server and xorg-server-snap, they're gone

- Rename XLIBVERSION to LIBGLVERSION here and there
- Remove now superfluous insertion of <sys/priv.h>
- Minor comment nit in pkg-plist

2 files changed, 8 insertions, 13 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 4b478cdf1472..ce2635799ef1 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -42,14 +42,14 @@ NVVERSION=	${DISTVERSION:S/.//g}
 
 # XXX Should use ${PKG_INFO} XXX
 #
-XSERVVERSION!=	/usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || /usr/sbin/pkg_info -O x11-servers/xorg-server 2>/dev/null | ${GREP} server- || /usr/sbin/pkg_info -qO x11-servers/xorg-server-snap 2>/dev/null || true
-XLIBVERSION!=	/usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O graphics/libGL 2>/dev/null | ${GREP} libGL- || true
+XSERVVERSION!=	/usr/sbin/pkg_info -qO x11-servers/xorg-server 2>/dev/null || true
+LIBGLVERSION!=	/usr/sbin/pkg_info -qO graphics/libGL 2>/dev/null || true
 
 .if empty(XSERVVERSION)
 IGNORE=		needs an X server implementation installed
 .endif
 
-PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
+PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
 		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
 		MODULESDIR=${MODULESDIR}
 
@@ -80,11 +80,6 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e 's,pci/agpvar\.h,dev/agp/agpvar.h,' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
-# Building with -Werror requires prototype for suser() which was moved
-.if ${OSVERSION} >= 700048
-	${REINPLACE_CMD} -e '15s,^,#include <sys/priv.h>,' \
-		${WRKSRC}/src/nvidia_os.c
-.endif
 # Switch from suser() to priv_check() API on recent -CURRENT
 .if ${OSVERSION} >= 800049
 	${REINPLACE_CMD} -e \
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index cf0340e581a1..29566abeb075 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -3,8 +3,8 @@
 @comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
 @comment     %%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%%
 @comment     %%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%%
-@comment     lib/XXX-libGL.a.%%%%.%%XLIBVERSION%%
-@comment     lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%%
+@comment     lib/XXX-libGL.a.%%%%.%%LIBGLVERSION%%
+@comment     lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
 @comment They are however restored when this package is removed:
 @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
@@ -14,11 +14,11 @@
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.la
 @exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.so %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%%
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.so
-@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%%
+@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
 lib/libGL.so.1
-@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%% %D/lib/libGL.so.1
+@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
 @exec ln -sf libGL.so.1 %D/lib/libGL.so
-@comment No rm -f %D/lib/libGL.so because default XFree needs this also
+@comment No rm -f %D/lib/libGL.so because X needs this also
 lib/libGLcore.so.1
 @exec ln -sf libGLcore.so.1 %D/lib/libGLcore.so
 @unexec rm -f %D/lib/libGLcore.so