Date: Fri, 27 Jan 2017 10:10:54 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432548 - head/x11/nvidia-driver Message-ID: <201701271010.v0RAAsDd025157@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701271010.v0RAAsDd025157>