svn commit: r354739 - in head/x11/nvidia-driver: . files

[Marius Strobl]

Author: marius
Date: Wed May 21 10:32:46 2014
New Revision: 354739
URL: http://svnweb.freebsd.org/changeset/ports/354739
QAT: https://qat.redports.org/buildarchive/r354739/

Log:
  Fix two issues with r354638:
  - Use MACHINE_CPUARCH rather than MACHINE_ARCH. While the former technically
    is more correct it unfortunately doesn't exist in stable/8, yet, and using
    the latter actually doesn't make a difference for i386.
  - Allow to build nvidia-driver on OSVERSION > 1000052 with the LINUX option
    enabled.
  
  Reported by:	swills

Modified:
  head/x11/nvidia-driver/Makefile
  head/x11/nvidia-driver/files/extra-patch-src-Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Wed May 21 10:17:54 2014	(r354738)
+++ head/x11/nvidia-driver/Makefile	Wed May 21 10:32:46 2014	(r354739)
@@ -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

Modified: head/x11/nvidia-driver/files/extra-patch-src-Makefile
==============================================================================
--- head/x11/nvidia-driver/files/extra-patch-src-Makefile	Wed May 21 10:17:54 2014	(r354738)
+++ head/x11/nvidia-driver/files/extra-patch-src-Makefile	Wed May 21 10:32:46 2014	(r354739)
@@ -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: