Date: Mon, 6 Jan 2020 20:42:08 +0000 (UTC) From: Larry Rosenman <ler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522273 - in head/sysutils/lsof: . files Message-ID: <202001062042.006Kg81F048249@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ler Date: Mon Jan 6 20:42:08 2020 New Revision: 522273 URL: https://svnweb.freebsd.org/changeset/ports/522273 Log: sysutils/lsof: fix build following base r356337. I took the patch from 243122 as it was more correct. PR: 243122, 243083 Submitted by: cy, yasu@utahime.org Added: head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c (contents, props changed) Modified: head/sysutils/lsof/Makefile Modified: head/sysutils/lsof/Makefile ============================================================================== --- head/sysutils/lsof/Makefile Mon Jan 6 20:25:36 2020 (r522272) +++ head/sysutils/lsof/Makefile Mon Jan 6 20:42:08 2020 (r522273) @@ -3,7 +3,7 @@ PORTNAME= lsof DISTVERSION= 4.93.2 -PORTREVISION= 6 +PORTREVISION= 8 PORTEPOCH= 8 CATEGORIES= sysutils Added: head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c Mon Jan 6 20:42:08 2020 (r522273) @@ -0,0 +1,17 @@ +--- dialects/freebsd/dnode2.c.orig 2019-05-08 00:32:25.000000000 -0700 ++++ dialects/freebsd/dnode2.c 2020-01-05 20:22:25.621138000 -0800 +@@ -49,7 +49,13 @@ + * + * Note: clang's complaint about VOP_FSYNC can't be avoided. + */ +-#define VOP_UNLOCK(vp, f) ((void)0) ++#include <sys/param.h> ++#if __FreeBSD_version >= 1300074 ++#define VOP_UNLOCK_FLAGS(vp, f) ((void)0) ++#define VOP_UNLOCK(vp) ((void)0) ++#else ++#define VOP_UNLOCK(vp, f) ((void)0) ++#endif + # endif /* defined(__clang__) */ + + #define KLD_MODULE /* for ARM: prevent "ARM_NARCH is 0 " error */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001062042.006Kg81F048249>