3 files changed, 14 insertions, 21 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 9b7679825d56..c884a09d443f 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	256.53
-PORTREVISION?=	1			# As a reminder it can be overridden
+DISTVERSION?=	270.41.19
+PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
@@ -22,7 +22,7 @@ LICENSE_FILE=	${WRKSRC}/doc/license.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
-NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
+USE_XORG=	xorg-server
 USE_GL=		gl
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
@@ -65,10 +65,6 @@ OPTIONS+=	WBINVD		"Enable heavy-weight cache-flush logic" off
 XSERVVERSION!=	${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true
 LIBGLVERSION!=	${PKG_INFO} -qO graphics/libGL 2>/dev/null || true
 
-.if empty(XSERVVERSION)
-IGNORE=		needs an X server implementation installed
-.endif
-
 PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
 		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
 		MODULESDIR=${MODULESDIR}
@@ -139,8 +135,9 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e 's/afterinstall/dontexecute/' ${WRKSRC}/Makefile
 
 pre-su-install:
-# XXX This port silently assumes PREFIX == LOCALBASE XXX
-	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
+# While this port silently assumes PREFIX == LOCALBASE, at least try to
+# pretend we support different paths thereof
+	@cd ${PREFIX}/${MODULESDIR} && ${MKDIR} drivers extensions
 
 post-install: .SILENT
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 49df238a6e95..652fa869fed0 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,9 +1,9 @@
-SHA256 (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 3c3d3a96f6ec79b86815423c4be38c819b2ff26124a8885421e34f60a3c70655
-SIZE (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 26347367
-SHA256 (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 2b849ec63dca049a36ba3d2d97fdf8af06bd3d9c0051ebeec1e0cb60bec416a2
-SIZE (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 26963917
-SHA256 (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 3389c1b2faf68bab3ebd55593539580e418ef3beba29428ae2fe11a9a5154ebb
-SIZE (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 17555603
+SHA256 (NVIDIA-FreeBSD-x86_64-270.41.19.tar.gz) = ee8124aed60fc7224898d3bc5dce23cca1160055a2b3d3ad23827cce384d948a
+SIZE (NVIDIA-FreeBSD-x86_64-270.41.19.tar.gz) = 29166391
+SHA256 (NVIDIA-FreeBSD-x86-270.41.19.tar.gz) = 352b3a666d7b799082896e82da6228eb61158dc1b9722a4f63ffe474b27b4750
+SIZE (NVIDIA-FreeBSD-x86-270.41.19.tar.gz) = 28488689
+SHA256 (NVIDIA-FreeBSD-x86-173.14.30.tar.gz) = 9e59d02ffadb4ea8dd57e07f60c1e1c0b7267c86ec3fc22bd1a86a884a2bb0a3
+SIZE (NVIDIA-FreeBSD-x86-173.14.30.tar.gz) = 17992540
 SHA256 (NVIDIA-FreeBSD-x86-96.43.19.tar.gz) = b5dce181cc654a729ba06dd528a180d14a792b0328fcfbf86bb0f819285c0dd5
 SIZE (NVIDIA-FreeBSD-x86-96.43.19.tar.gz) = 13352481
 SHA256 (NVIDIA-FreeBSD-x86-71.86.14.tar.gz) = 5a3c36dd9cfc0613190ca35d2e2c6aa88a703022dcf1d992bcc6526a5d8d3b04
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 82094f0dd7f9..f4764ce8ef78 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,14 +1,10 @@
-@comment I can't add the below files to the package because pkg_delete
-@comment will complain when removing this package:
-@comment     %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
-@comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
-@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
 @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
+%%MODULESDIR%%/extensions/libglx.so
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
 @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.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
 lib/libnvidia-tls.so.1
 lib/libnvidia-tls.so