Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile	(revision 317438)
+++ x11/nvidia-driver/Makefile	(working copy)
@@ -11,9 +11,8 @@
 # or `x11/nvidia-driver-304' slave ports.
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	310.44
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 # MASTER_SITE_SUBDIR it set later because it depends on NVVERSION
@@ -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?=	319.17
Index: x11/nvidia-driver/distinfo
===================================================================
--- x11/nvidia-driver/distinfo	(revision 317438)
+++ x11/nvidia-driver/distinfo	(working copy)
@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = bd4f780907e3208b233e0f911e9ee2a6cfe163efd33bc29c06ecc249041c961b
-SIZE (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = 33558256
-SHA256 (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 3f425b5f86d3cd764188e6e3f8c63cb4245734e11ba3b3d3ecc66786bbc279e6
-SIZE (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 32589992
+SHA256 (NVIDIA-FreeBSD-x86_64-319.17.tar.gz) = fc618f46a532cb387b000e74573a5235a2fdc05f01917fb033690eda0b6ac61b
+SIZE (NVIDIA-FreeBSD-x86_64-319.17.tar.gz) = 34424474
+SHA256 (NVIDIA-FreeBSD-x86-319.17.tar.gz) = c5e2ab023a8a32a7ca174e54afdfa173a55668e0638a843d77c7dbc19174ae99
+SIZE (NVIDIA-FreeBSD-x86-319.17.tar.gz) = 34029600
 SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
 SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
 SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
Index: x11/nvidia-settings/Makefile
===================================================================
--- x11/nvidia-settings/Makefile	(revision 317438)
+++ 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,10 @@
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	vdpau:${PORTSDIR}/multimedia/libvdpau
+
+.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 317438)
+++ 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-319.17.tar.bz2) = 49712c56590df4521d6eb988a8eab0a8f754b9f6c62a51c23c53d8a40df0b87d
+SIZE (nvidia-settings-319.17.tar.bz2) = 1536915
Index: x11/nvidia-xconfig/Makefile
===================================================================
--- x11/nvidia-xconfig/Makefile	(revision 317438)
+++ 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 317438)
+++ 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-319.17.tar.bz2) = 14d2b3c89ee95de290ea648e1c131b73310a9f03c31e718eaba438077cf46946
+SIZE (nvidia-xconfig-319.17.tar.bz2) = 102015