5 files changed, 15 insertions, 20 deletions

diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile
index 4741f6077a47..508dabff9605 100644
--- a/x11/nvidia-driver-304/Makefile
+++ b/x11/nvidia-driver-304/Makefile
@@ -3,7 +3,7 @@
 
 DISTVERSION=	304.131
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-304
diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile
index 7019e8e7fd54..4e740085de9d 100644
--- a/x11/nvidia-driver-340/Makefile
+++ b/x11/nvidia-driver-340/Makefile
@@ -3,7 +3,7 @@
 
 DISTVERSION=	340.96
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-340
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 6189b32c8a97..7572f7b10d6b 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -12,7 +12,7 @@
 PORTNAME=	nvidia-driver
 DISTVERSION?=	367.35
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -241,9 +241,6 @@ post-install: .SILENT
 .endif
 .if ${NVVERSION} < 358.009
 	${REINPLACE_CMD} '/nvidia-modeset.ko/d' ${TMPPLIST}
-.else
-	${REINPLACE_CMD} 's/nvidia$$/nvidia-modeset/ ; s/nvidia_/nvidia-modeset_/' \
-		${PKGMESSAGE}
 .endif
 .if ${NVVERSION} >= 361.028
 	${REINPLACE_CMD} -E '/(EGL_nvidia\.so|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d' \
diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in
index 7f5dfa235718..ba3fdc042f68 100644
--- a/x11/nvidia-driver/files/pkg-message.in
+++ b/x11/nvidia-driver/files/pkg-message.in
@@ -1,11 +1,11 @@
 To use these drivers, make sure that you have loaded the NVidia kernel
 module, by doing
 
-	# kldload nvidia
+	# kldload nvidia	(or nvidia-modeset, see below)
 
 or adding
 
-	nvidia_load="YES"
+	nvidia_load="YES"	(or nvidia-modeset_load="YES", see below)
 
 to your /boot/loader.conf.
 
@@ -30,4 +30,14 @@ If X.org cannot start and reports
 in /var/log/Xorg.0.log while actually you have ``options SYSVSHM''
 enabled in kernel, the sysctl ``kern.ipc.shmall'' should be increased.
 
+Starting with version 358.09, some important functionality of the driver
+has been broken out into a separate kernel module, nvidia-modeset.ko.
+Users that experience a hang when starting X11 server, or observe
+
+	(II) NVIDIA(0): Validated MetaModes:
+	(II) NVIDIA(0):     "NULL"
+
+in /var/log/Xorg.0.log should replace `nvidia.ko' with `nvidia-modeset.ko'
+in their /boot/loader.conf or /etc/rc.conf configuration files.
+
 See %%DOCSDIR%%/README for more information.
diff --git a/x11/nvidia-driver/pkg-message b/x11/nvidia-driver/pkg-message
deleted file mode 100644
index bf8608d67aea..000000000000
--- a/x11/nvidia-driver/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-The Nvidia driver has been updated to 367.35.  In this version of the driver,
-some important functionality has been broken out into a separate
-nvidia-modeset.ko.
-
-Users that experience a hang starting X or observe
-
-  [    43.243] (II) NVIDIA(0): Validated MetaModes:
-  [    43.243] (II) NVIDIA(0):     "NULL"
-
-in their Xorg.logs should replace 'nvidia.ko' with 'nvidia-modeset.ko' in their
-loader.conf or rc.conf configurations.  (nvidia-modeset.ko has a MODULE_DEPENDS
-relationship to nvidia.ko and will bring it in automatically.)