From owner-svn-ports-all@FreeBSD.ORG  Fri Sep  6 05:07:15 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 91308A9F;
 Fri,  6 Sep 2013 05:07:15 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7D47C25E3;
 Fri,  6 Sep 2013 05:07:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8657F6P095528;
 Fri, 6 Sep 2013 05:07:15 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8657FZ1095525;
 Fri, 6 Sep 2013 05:07:15 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201309060507.r8657FZ1095525@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 6 Sep 2013 05:07:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326460 - head/x11/nvidia-driver
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.14
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: Fri, 06 Sep 2013 05:07:15 -0000

Author: danfe
Date: Fri Sep  6 05:07:15 2013
New Revision: 326460
URL: http://svnweb.freebsd.org/changeset/ports/326460

Log:
  Unbreak the build on recent -CURRENT (after cap_rights_t type was changed
  from uint64_t to a structure in r255219).
  
  PR:	ports/181840

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Fri Sep  6 04:30:35 2013	(r326459)
+++ head/x11/nvidia-driver/Makefile	Fri Sep  6 05:07:15 2013	(r326460)
@@ -154,6 +154,12 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \
 		${WRKSRC}/src/nvidia_subr.c
 .endif
+# Adopt to cap_rights_t type change in FreeBSD src SVN r255219
+.if ${OSVERSION} > 1000051
+	${REINPLACE_CMD} -e 's/u_long cmd;/& cap_rights_t rights;/ ; \
+		s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \
+			${WRKSRC}/src/nvidia_linux.c
+.endif
 # Fix stack buffer overflow in nvidia_sysctl_bus_type()
 .if ${NVVERSION} < 3192300
 	${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \