Index: branches/2020Q1/sysutils/lsof/Makefile
===================================================================
--- branches/2020Q1/sysutils/lsof/Makefile	(revision 523727)
+++ branches/2020Q1/sysutils/lsof/Makefile	(revision 523728)
@@ -1,45 +1,65 @@
 # Created by: David O'Brien <obrien@FreeBSD.org>
 # $FreeBSD$
 
+# note: If someone has a fix for a particular ARCH please feel free
+#       to commit it.  I (ler) don't have access to all the ARCH's
+
 PORTNAME=	lsof
 DISTVERSION=	4.93.2
-PORTREVISION=	6
+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
 
+OPTIONS_DEFINE_powerpc64=	AIM BOOKE
+OPTIONS_DEFAULT_powerpc64=	AIM
+
+AIM_DESC=	Set for AIM hardware
+AIM_CFLAGS=	-DAIM
+BOOKE_DESC=	Set for BOOKE hardware
+BOOKE_CFLAGS=	-DBOOKE
+
+CFLAGS_powerpc=	-DAIM
+CFLAGS_powerpcspe=	-DBOOKE
+
 SHEBANG_FILES=	scripts/sort_res.perl5
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-n freebsd
 CONFIGURE_ENV=	LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys"
+
+# PPC64 needs -lzpool for reasons unknown.  If someone can
+# figure out why, I (ler) am all ears.
+.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
+CONFIGURE_ENV+=	LSOF_CFGL="-lzpool"
+. endif
 
 .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 <bsd.port.post.mk>
Index: branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode.c
===================================================================
--- branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode.c	(revision 523727)
+++ branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode.c	(revision 523728)
@@ -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 <fs/tmpfs/tmpfs.h>
 -#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: branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c
===================================================================
--- branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c	(nonexistent)
+++ branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c	(revision 523728)
@@ -0,0 +1,17 @@
+--- 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 <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 */

Property changes on: branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 523727)
+++ branches/2020Q1	(revision 523728)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r522273,522545,522582,523727