From owner-svn-ports-head@freebsd.org  Fri Jan 27 10:10:56 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23DE9CC2DC6;
 Fri, 27 Jan 2017 10:10:56 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CDAC01271;
 Fri, 27 Jan 2017 10:10:55 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0RAAsc3025158;
 Fri, 27 Jan 2017 10:10:54 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0RAAsDd025157;
 Fri, 27 Jan 2017 10:10:54 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201701271010.v0RAAsDd025157@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 27 Jan 2017 10:10:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r432548 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jan 2017 10:10:56 -0000

Author: danfe
Date: Fri Jan 27 10:10:54 2017
New Revision: 432548
URL: https://svnweb.freebsd.org/changeset/ports/432548

Log:
  Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232.
  This is to unbreak the build on recent -CURRENT, where deprecation warning
  was added in r312758 (FreeBSD src aka base).  While here, wrap one overly
  long line.
  
  PR:	216478

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Fri Jan 27 10:08:14 2017	(r432547)
+++ head/x11/nvidia-driver/Makefile	Fri Jan 27 10:10:54 2017	(r432548)
@@ -127,6 +127,15 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
+# Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232
+.if ${OSVERSION} > 1100013 || ${OSVERSION} > 1001510 && ${OSVERSION} < 1100000
+	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
+		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
+.  if ${NVVERSION} >= 358.009
+	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
+		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
+.  endif
+.endif
 # Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src SVN r273377
 .if ${OSVERSION} > 1100039 || ${OSVERSION} > 1001501 && ${OSVERSION} < 1100000
 	${REINPLACE_CMD} -e '/SYSCTL_ADD_PROC/,/;/ \
@@ -135,7 +144,8 @@ post-patch: .SILENT
 .endif
 # Replace d_thread_t (compat shim to support FreeBSD 4) with `struct thread'
 	${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \
-		${WRKSRC}/src/${NVSRC}/nvidia_ctl.c ${WRKSRC}/src/${NVSRC}/nvidia_dev.c \
+		${WRKSRC}/src/${NVSRC}/nvidia_ctl.c \
+		${WRKSRC}/src/${NVSRC}/nvidia_dev.c \
 		${WRKSRC}/src/${NVSRC}/nvidia_linux.c
 .if ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \