Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile	(revision 314128)
+++ x11/nvidia-driver/Makefile	(working copy)
@@ -11,7 +11,6 @@
 # or `x11/nvidia-driver-304' slave ports.
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	310.32
 # Always try to set PORTREVISION as can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 kld
@@ -27,6 +26,8 @@
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
+.include "${.CURDIR}/../nvidia-driver/Makefile.common"
+
 ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
 USE_XORG=	xorg-server
 USE_GL=		gl
Index: x11/nvidia-driver/Makefile.common
===================================================================
--- x11/nvidia-driver/Makefile.common	(revision 0)
+++ x11/nvidia-driver/Makefile.common	(working copy)
@@ -0,0 +1 @@
+DISTVERSION?=	310.40
Index: x11/nvidia-driver/distinfo
===================================================================
--- x11/nvidia-driver/distinfo	(revision 314128)
+++ x11/nvidia-driver/distinfo	(working copy)
@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-310.32.tar.gz) = f0935abf74a1298471a5eb0ede56ab913e358b76935557d618915a97efda9224
-SIZE (NVIDIA-FreeBSD-x86_64-310.32.tar.gz) = 33511666
-SHA256 (NVIDIA-FreeBSD-x86-310.32.tar.gz) = 3f00f5a13dc04f51b2a1b000ad53741ac6b81bd6e70258e7b9f200daf8f52b2d
-SIZE (NVIDIA-FreeBSD-x86-310.32.tar.gz) = 32541283
+SHA256 (NVIDIA-FreeBSD-x86_64-310.40.tar.gz) = f010d62498864fb61367577d0f19e186d6f7867281a451db21b89e15d812c74a
+SIZE (NVIDIA-FreeBSD-x86_64-310.40.tar.gz) = 33553148
+SHA256 (NVIDIA-FreeBSD-x86-310.40.tar.gz) = 0b591930dff9d4c8fd45859b510247be078957b2efac3bd743b0c215d7595884
+SIZE (NVIDIA-FreeBSD-x86-310.40.tar.gz) = 32582005
 SHA256 (NVIDIA-FreeBSD-x86_64-304.64.tar.gz) = 9887e4147fcb16141dcb6b153ff71a28c73cf2a4c16b60e4c6fcb8586a1c5400
 SIZE (NVIDIA-FreeBSD-x86_64-304.64.tar.gz) = 34247065
 SHA256 (NVIDIA-FreeBSD-x86-304.64.tar.gz) = e129d0d0e8d256d6328cddc4c18edb96c1e444c354f7c806ece4192621a1c1b5
Index: x11/nvidia-settings/Makefile
===================================================================
--- x11/nvidia-settings/Makefile	(revision 314128)
+++ x11/nvidia-settings/Makefile	(working copy)
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	nvidia-settings
-PORTVERSION=	310.14
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-settings/
@@ -16,6 +15,8 @@
 
 LICENSE=	GPLv2
 
+.include "${.CURDIR}/../nvidia-driver/Makefile.common"
+
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
Index: x11/nvidia-settings/distinfo
===================================================================
--- x11/nvidia-settings/distinfo	(revision 314128)
+++ x11/nvidia-settings/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
-SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
+SHA256 (nvidia-settings-310.40.tar.bz2) = 161c47fac12f72f58433f400890b9de5b8965c92ef8cf05b3a44886acbb8100b
+SIZE (nvidia-settings-310.40.tar.bz2) = 1485133
Index: x11/nvidia-xconfig/Makefile
===================================================================
--- x11/nvidia-xconfig/Makefile	(revision 314128)
+++ x11/nvidia-xconfig/Makefile	(working copy)
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	310.14
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-xconfig/
@@ -16,6 +15,8 @@
 
 LICENSE=	GPLv2
 
+.include "${.CURDIR}/../nvidia-driver/Makefile.common"
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
Index: x11/nvidia-xconfig/distinfo
===================================================================
--- x11/nvidia-xconfig/distinfo	(revision 314128)
+++ x11/nvidia-xconfig/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
-SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
+SHA256 (nvidia-xconfig-310.40.tar.bz2) = 8d0c6a08d93fbf8290509e5f3bb4e4650a28a914ea46d8811ffa61a8ccfc0fe1
+SIZE (nvidia-xconfig-310.40.tar.bz2) = 101175