Date: Mon, 23 Jul 2018 12:58:00 +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: r475170 - head/x11/nvidia-driver Message-ID: <201807231258.w6NCw0eC073900@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Jul 23 12:58:00 2018 New Revision: 475170 URL: https://svnweb.freebsd.org/changeset/ports/475170 Log: Cleanup patch code that does nothing useful these days (changes are long integrated upstream). Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Mon Jul 23 12:55:47 2018 (r475169) +++ head/x11/nvidia-driver/Makefile Mon Jul 23 12:58:00 2018 (r475170) @@ -119,18 +119,9 @@ post-patch: .SILENT ${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \ { x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \ ${WRKSRC}/src/${NVSRC}/nvidia_linux.c -# Adjust `vm_object' locking after FreeBSD src r248084 and bogus memset() call - ${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \ - { x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h - ${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/ ; \ - /memset/s/sizeof\(ci/sizeof(*ci/' \ - ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -# Adjust kmem(9) calls after FreeBSD src r254025 -.if ${NVVERSION} < 331.067 - ${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \ +# Fix bogus memset() call + ${REINPLACE_CMD} -e '/memset/s/sizeof(ci/sizeof(*ci/' \ ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -.endif # Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232 ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ ${WRKSRC}/src/${NVSRC}/nv-freebsd.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807231258.w6NCw0eC073900>