From owner-svn-ports-all@FreeBSD.ORG  Wed May 21 10:32:47 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 330E089E;
 Wed, 21 May 2014 10:32:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1FD022976;
 Wed, 21 May 2014 10:32:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LAWk5e039873;
 Wed, 21 May 2014 10:32:46 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4LAWkkg039871;
 Wed, 21 May 2014 10:32:46 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201405211032.s4LAWkkg039871@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 21 May 2014 10:32:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354739 - in head/x11/nvidia-driver: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 May 2014 10:32:47 -0000

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: