Index: head/sysutils/lsof/Makefile =================================================================== --- head/sysutils/lsof/Makefile (revision 522544) +++ head/sysutils/lsof/Makefile (revision 522545) @@ -1,45 +1,45 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= lsof DISTVERSION= 4.93.2 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 8 CATEGORIES= sysutils MAINTAINER= ler@FreeBSD.org COMMENT= Lists information about open files (similar to fstat(1)) LICENSE= lsof LICENSE_NAME= lsof LICENSE_FILE= ${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= shebangfix tar:bzip2 HAS_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= lsof-org SHEBANG_FILES= scripts/sort_res.perl5 .include CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -n freebsd CONFIGURE_ENV= LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys" .if !exists(${SRC_BASE}/sys/kern/kern_lockf.c) IGNORE+= requires kernel sources .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lsof ${STAGEDIR}${PREFIX}/sbin (cd ${WRKSRC} && ${SED} 's/\\$$/\\DUMMY/' Lsof.8 | mandoc -T man | ${SED} 's/DUMMY$$//' > ${WRKSRC}/lsof.8) ${INSTALL_MAN} ${WRKSRC}/lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8 @${MKDIR} ${STAGEDIR}${PREFIX}/share/lsof ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/share/lsof @${CHMOD} 0444 ${STAGEDIR}${PREFIX}/share/lsof/00* .include Index: head/sysutils/lsof/files/patch-dialects_freebsd_dnode.c =================================================================== --- head/sysutils/lsof/files/patch-dialects_freebsd_dnode.c (revision 522544) +++ head/sysutils/lsof/files/patch-dialects_freebsd_dnode.c (revision 522545) @@ -1,12 +1,21 @@ ---- dialects/freebsd/dnode.c.orig 2019-12-19 21:29:42 UTC +--- dialects/freebsd/dnode.c.orig 2019-05-08 07:32:25 UTC +++ dialects/freebsd/dnode.c @@ -58,9 +58,7 @@ _PROTOTYPE(static int lkup_dev_tty,(dev_t *dr, INODETY #if defined(HAS_TMPFS) -#define _KERNEL #include -#undef _KERNEL #endif /* defined(HAS_TMPFS) */ _PROTOTYPE(static void get_lock_state,(KA_T f)); +@@ -562,7 +560,7 @@ process_overlaid_node: + * Get the pseudo vnode tag type for FreeBSD >= 5. + */ + vtag = VT_UNKNOWN; +- if (v->v_tag && !kread((KA_T)v->v_tag, (char *)&vtbuf, sizeof(vtbuf))) ++ if (!kread((KA_T)v->v_lock.lock_object.lo_name, (char *)&vtbuf, sizeof(vtbuf))) + { + vtbuf[sizeof(vtbuf) - 1] = '\0'; + vtbp = vtbuf; Index: head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c =================================================================== --- head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c (revision 522544) +++ head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c (revision 522545) @@ -1,17 +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 @@ +--- dialects/freebsd/dnode2.c.orig 2019-05-08 07:32:25 UTC ++++ dialects/freebsd/dnode2.c +@@ -49,7 +49,13 @@ static char *rcsid = "$Id: dnode2.c,v 1.7 2018/02/14 1 * * Note: clang's complaint about VOP_FSYNC can't be avoided. */ -#define VOP_UNLOCK(vp, f) ((void)0) +#include +#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 */