diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2018-09-30 14:18:44 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2018-09-30 14:18:44 +0000 |
| commit | e07e1e0087e84ef1801d71d989f27ad468336b9f (patch) | |
| tree | 8fddc53b70ea9f69d442c5662e39399df525a610 /x11/nvidia-driver/Makefile | |
| parent | 99d5330d1e151813e1d529e503f7891acfbc29e2 (diff) | |
Notes
Diffstat (limited to 'x11/nvidia-driver/Makefile')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 13f839777ea0..71eda17c42df 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -10,9 +10,9 @@ # slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304'). PORTNAME= nvidia-driver -DISTVERSION?= 390.77 +DISTVERSION?= 390.87 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -113,11 +113,6 @@ MAKE_ENV+= WITHOUT_LINUX=yes .endif post-patch: .SILENT -# KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318 -.if ${OSVERSION} >= 1200079 - ${REINPLACE_CMD} -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' ${WRKSRC}/src/${NVSRC}/nvidia_subr.c - ${REINPLACE_CMD} -e 's/kmem_free(kmem_arena, /kmem_free(/' ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -.endif # We should support -CURRENT: kill the check ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h # Adjust Linux headers #include's after FreeBSD src r246085 @@ -134,6 +129,13 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c .endif +# KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318 +.if ${OSVERSION} >= 1200079 + ${REINPLACE_CMD} \ + -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \ + -e 's/kmem_free(kmem_arena, /kmem_free(/' \ + ${WRKSRC}/src/${NVSRC}/nvidia_subr.c +.endif # Respect WITHOUT_LINUX setting ${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& !defined(WITHOUT_LINUX)/' \ ${WRKSRC}/lib/Makefile |