aboutsummaryrefslogtreecommitdiff
path: root/x11/nvidia-driver
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2014-05-21 10:32:46 +0000
committerMarius Strobl <marius@FreeBSD.org>2014-05-21 10:32:46 +0000
commitb4449fb54a5be9df28093a1ebb332b4b057c594e (patch)
tree8743fbe2a55f25fad3bf92e5a9d2e6ec964e5501 /x11/nvidia-driver
parentd04ca13badb6f37cddb2df89c5a5212fd447881f (diff)
downloadports-b4449fb54a5be9df28093a1ebb332b4b057c594e.tar.gz
ports-b4449fb54a5be9df28093a1ebb332b4b057c594e.zip
Notes
Diffstat (limited to 'x11/nvidia-driver')
-rw-r--r--x11/nvidia-driver/Makefile2
-rw-r--r--x11/nvidia-driver/files/extra-patch-src-Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 84b3e79c579f..892c06f9cf73 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -166,7 +166,7 @@ post-patch: .SILENT
${WRKSRC}/src/nvidia_subr.c
.endif
# Adopt to cap_rights_t type change in FreeBSD src SVN r255219
-.if ${OSVERSION} > 1000052
+.if ${OSVERSION} > 1000052 && ${NVVERSION} < 3316700
${REINPLACE_CMD} -e 's/u_long cmd;/& cap_rights_t rights;/ ; \
s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \
${WRKSRC}/src/nvidia_linux.c
diff --git a/x11/nvidia-driver/files/extra-patch-src-Makefile b/x11/nvidia-driver/files/extra-patch-src-Makefile
index 03d383c719e3..818a79ba30f5 100644
--- a/x11/nvidia-driver/files/extra-patch-src-Makefile
+++ b/x11/nvidia-driver/files/extra-patch-src-Makefile
@@ -5,7 +5,7 @@
@ln -s machine/stdarg.h stdarg.h
+SRCS+= opt_global.h
-+.if ${MACHINE_CPUARCH} == "i386" && !defined(KERNBUILDDIR)
++.if ${MACHINE_ARCH} == "i386" && !defined(KERNBUILDDIR)
+PAE!= sed -n '/define NV_SUPPORT_PAE/p' nv-freebsd.h
+.if !empty(PAE)
+opt_global.h: