lsof: fix build on -current

2 files changed, 20 insertions, 10 deletions

diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index b66701a6ecc..5529b18b78e 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2018/12/08 17:12:37 triaxx Exp $
+$NetBSD: distinfo,v 1.91 2019/01/06 16:36:00 tnn Exp $
 
 SHA1 (lsof_4.91.tar.bz2) = da6f9883d00f200671f6e47cf838bb9b6b9c6f01
 RMD160 (lsof_4.91.tar.bz2) = 5f7be9a860f30b66e247e0405657a69dd044e245
@@ -9,7 +9,7 @@ SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
 SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
 SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
-SHA1 (patch-af) = ae3b8806794e0c9647f3370de6c79fcd1705698b
+SHA1 (patch-af) = 2e5dced3772fe33412f4cf782d21fab1c4373b38
 SHA1 (patch-ag) = bd146026dff5a383b1a53e1bc9cf68302f742575
 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09
diff --git a/sysutils/lsof/patches/patch-af b/sysutils/lsof/patches/patch-af
index 15453b856b5..d88adc54230 100644
--- a/sysutils/lsof/patches/patch-af
+++ b/sysutils/lsof/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
+$NetBSD: patch-af,v 1.16 2019/01/06 16:36:00 tnn Exp $
 
 --- dialects/n+obsd/dlsof.h.orig	2006-03-28 21:54:15.000000000 +0000
 +++ dialects/n+obsd/dlsof.h
@@ -24,7 +24,17 @@ $NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
  #include <sys/socket.h>
  
  # if	defined(HASMSDOSFS)
-@@ -161,6 +161,7 @@ struct nameidata;	/* to satisfy a functi
+@@ -147,6 +147,9 @@ struct uio;	/* dummy for function protot
+ 		   || (defined(NETBSDV) && __NetBSD_Version__<106060000) */
+ 
+ #define	_KERNEL
++#ifndef	VFS_PROTOS
++#define	VFS_PROTOS(x)
++#endif
+ struct nameidata;	/* to satisfy a function prototype in msdosfsmount.h */
+ #include <msdosfs/msdosfsmount.h>
+ #undef	_KERNEL
+@@ -161,6 +164,7 @@ struct nameidata;	/* to satisfy a functi
  #include <sys/socketvar.h>
  #include <sys/un.h>
  #include <sys/unpcb.h>
@@ -32,7 +42,7 @@ $NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
  #include <netinet/ip.h>
-@@ -170,7 +171,6 @@ struct nameidata;	/* to satisfy a functi
+@@ -170,7 +174,6 @@ struct nameidata;	/* to satisfy a functi
  #include <netinet6/in6_pcb.h>
  # endif	/* defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6) */
  
@@ -40,7 +50,7 @@ $NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
  #include <netinet/in_pcb.h>
  #include <netinet/ip_var.h>
  #include <netinet/tcp.h>
-@@ -264,6 +264,9 @@ struct sockproto {
+@@ -264,6 +267,9 @@ struct sockproto {
  
  #undef KERNEL
  #include <ufs/mfs/mfsnode.h>
@@ -50,7 +60,7 @@ $NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
  
  # if	defined(HASNFSPROTO)
  #include <nfs/rpcv2.h>
-@@ -370,7 +373,6 @@ struct sockproto {
+@@ -370,7 +376,6 @@ struct sockproto {
  #define	Pregs		PFSregs
  #define	Pfile		PFSfile
  #define	Pfpregs		PFSfpregs
@@ -58,7 +68,7 @@ $NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
  #define	Pstatus		PFSstatus
  #define	Pnote		PFSnote
  #define	Pnotepg		PFSnotepg
-@@ -382,6 +384,9 @@ struct sockproto {
+@@ -382,6 +387,9 @@ struct sockproto {
  #define	Pmap		PFSmap
  #define	Pmaps		PFSmaps
  #    endif	/* NETBSDV>=1006000 */
@@ -68,7 +78,7 @@ $NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
  #   endif	/* defined(NetBSDV) */
  #  endif	/* defined(HASPROCFS_PFSROOT) */
  #include <machine/reg.h>
-@@ -489,7 +494,12 @@ extern KA_T Kpa;
+@@ -489,7 +497,12 @@ extern KA_T Kpa;
  struct l_vfs {
  	KA_T addr;			/* kernel address */
  	fsid_t	fsid;			/* file system ID */
@@ -81,7 +91,7 @@ $NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
  	char *dir;			/* mounted directory */
  	char *fsname;			/* file system name */
  	struct l_vfs *next;		/* forward link */
-@@ -581,4 +591,12 @@ struct sfile {
+@@ -581,4 +594,12 @@ struct sfile {
  #  endif	/* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */