5 files changed, 39 insertions, 3 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 4129b98b3cbc..4dd4a6a95b59 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -211,6 +211,7 @@
     SUBDIR += numlockx
     SUBDIR += nvidia-driver
     SUBDIR += nvidia-driver-173
+    SUBDIR += nvidia-driver-304
     SUBDIR += nvidia-driver-71
     SUBDIR += nvidia-driver-96
     SUBDIR += nvidia-settings
diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile
new file mode 100644
index 000000000000..0db4d6e56d8f
--- /dev/null
+++ b/x11/nvidia-driver-304/Makefile
@@ -0,0 +1,11 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+# $FreeBSD$
+
+DISTVERSION=	304.64
+# Explicitly set PORTREVISION as it can be overridden by the master port
+PORTREVISION=	0
+
+MASTERDIR=	${.CURDIR}/../nvidia-driver
+NO_LATEST_LINK=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index c065e948dbfe..3d3c59d7621d 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -8,7 +8,7 @@
 # slave ports.
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	304.64
+DISTVERSION?=	310.32
 # Always try to set PORTREVISION as can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 kld
@@ -32,7 +32,7 @@ USE_LDCONFIG=	yes
 # NVIDIA_ROOT is not set in src/Makefile, which results in bogus -I/src
 # passed to compiler and broken build on HEAD since r221320 when option
 # -Wmissing-include-dirs was added for kernel sources.  Until properly
-# fixed upstream across all versions (including legacy ones), use this
+# fixed upstream (across all versions, including legacy ones), use this
 # hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
 # since it is going away from `Mk/bsd.port.mk' as deprecated.
 MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
@@ -88,6 +88,9 @@ PLIST_SUB+=	LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
 CONFLICTS=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
 USE_LINUX=	yes
 PLIST_SUB+=	LINUX=""
+. if ${OSVERSION} > 1000026
+EXTRA_PATCHES+=	${FILESDIR}/r246085-patch-src-nvidia_linux.c
+. endif
 .else
 PLIST_SUB+=	LINUX="@comment "
 # Propagate WITHOUT_LINUX variable down to inner Makefiles
@@ -190,8 +193,11 @@ post-install: .SILENT
 	${REINPLACE_CMD} -E 's/libGLcore/libnvidia-glcore/ ; \
 		/usr.*(glcore|tls).*so\.1$$/d' ${TMPPLIST}
 .endif
-# Some applications need this symlink (see PR ports/72877)
+.if ${NVVERSION} >= 3101900
+	${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST}
+.else	# some applications need this symlink (see PR ports/72877)
 	${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
+.endif
 .if ${NVVERSION} >= 1952200
 . if ${OSVERSION} > 800090
 	${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index b277127025ec..8c456f1e9a60 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,3 +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-304.64.tar.gz) = 9887e4147fcb16141dcb6b153ff71a28c73cf2a4c16b60e4c6fcb8586a1c5400
 SIZE (NVIDIA-FreeBSD-x86_64-304.64.tar.gz) = 34247065
 SHA256 (NVIDIA-FreeBSD-x86-304.64.tar.gz) = e129d0d0e8d256d6328cddc4c18edb96c1e444c354f7c806ece4192621a1c1b5
diff --git a/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c b/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c
new file mode 100644
index 000000000000..a219613312e3
--- /dev/null
+++ b/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c
@@ -0,0 +1,14 @@
+--- src/nvidia_linux.c.orig	2012-10-30 13:54:06.000000000 -0400
++++ src/nvidia_linux.c	2013-02-13 19:48:17.000000000 -0500
+@@ -21,9 +21,11 @@
+ #if defined(NVCPU_X86)
+ #include "machine/../linux/linux.h"
+ #include "machine/../linux/linux_proto.h"
++#include "machine/../../compat/linux/linux_ioctl.h"
+ #elif defined(NVCPU_X86_64)
+ #include "machine/../linux32/linux.h"
+ #include "machine/../linux32/linux32_proto.h"
++#include "machine/../../compat/linux/linux_ioctl.h"
+ #endif
+ 
+ int linux_ioctl_nvidia(d_thread_t *, struct linux_ioctl_args *);