diff options
| author | danfe <danfe@FreeBSD.org> | 2017-01-27 18:10:54 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2017-01-27 18:10:54 +0800 |
| commit | 039d2b0eab366bc2d64cd2b256e2a716171f6a8b (patch) | |
| tree | ad37e09fd03f3bd7a8b43be262e68982c7b9f037 /x11 | |
| parent | 108c1168509f7f50f721c5c1b90a80e5f9cb3535 (diff) | |
| download | freebsd-ports-gnome-039d2b0eab366bc2d64cd2b256e2a716171f6a8b.tar.gz freebsd-ports-gnome-039d2b0eab366bc2d64cd2b256e2a716171f6a8b.tar.zst freebsd-ports-gnome-039d2b0eab366bc2d64cd2b256e2a716171f6a8b.zip | |
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
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 749197af3145..04d03167d009 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -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/' \ |