Fix lsof build on NetBSD-8.99.2

Address /proc/#/ctl removal fallout.

3 files changed, 54 insertions, 20 deletions

diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 6a812bce1ec..77807543421 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2017/06/22 20:48:04 tnn Exp $
+$NetBSD: distinfo,v 1.89 2017/08/30 10:41:24 kamil Exp $
 
 SHA1 (lsof_4.89.tar.bz2) = ea8fb2588c9732f1b22d73ffab17dd055590df2c
 RMD160 (lsof_4.89.tar.bz2) = 233ff3b91e386f4152900035e6572c4eaed38adc
@@ -7,9 +7,9 @@ Size (lsof_4.89.tar.bz2) = 784560 bytes
 SHA1 (patch-aa) = 4469a5fed540e3c5635b6082efedc477ea96a382
 SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
-SHA1 (patch-ad) = 4bd73dea4770c7f5a43be0d096c26e7d6728dd2c
+SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
 SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
-SHA1 (patch-af) = b52c15a507960ecf33a61a3cbd608a92ebac1188
+SHA1 (patch-af) = ae3b8806794e0c9647f3370de6c79fcd1705698b
 SHA1 (patch-ag) = bd146026dff5a383b1a53e1bc9cf68302f742575
 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09
diff --git a/sysutils/lsof/patches/patch-ad b/sysutils/lsof/patches/patch-ad
index 6420209598c..f4b0a13f107 100644
--- a/sysutils/lsof/patches/patch-ad
+++ b/sysutils/lsof/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
+$NetBSD: patch-ad,v 1.16 2017/08/30 10:41:24 kamil Exp $
 
---- dialects/n+obsd/dnode.c.orig	2007-04-24 12:22:06.000000000 -0400
-+++ dialects/n+obsd/dnode.c	2008-05-17 18:49:56.000000000 -0400
-@@ -38,6 +38,9 @@
+--- dialects/n+obsd/dnode.c.orig	2007-04-24 16:22:06.000000000 +0000
++++ dialects/n+obsd/dnode.c
+@@ -38,6 +38,9 @@ static char *rcsid = "$Id: dnode.c,v 1.3
  
  #include "lsof.h"
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  
  #if	defined(HAS_DINODE_U)
  #define	DINODE_U	dinode_u
-@@ -194,12 +197,17 @@
+@@ -194,12 +197,17 @@ process_node(va)
  	unsigned char ns;
  	unsigned char rdevs;
  	char *ep, *ty;
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  	enum vtype type;
  	struct vnode *v, vb;
  	struct l_vfs *vfs;
-@@ -276,6 +284,11 @@
+@@ -276,6 +284,11 @@ process_node(va)
  
  #if	defined(HASPTYFS)
  	struct ptyfsnode pt;
@@ -43,7 +43,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  	struct specinfo si;
  #endif	/* defined(HASPTYFS) */
  
-@@ -414,7 +427,7 @@
+@@ -414,7 +427,7 @@ process_overlaid_node:
  	 */
  	    if (!v->v_data
  	    ||  kread((KA_T)v->v_data, (char *)&kn, sizeof(kn))) {
@@ -52,7 +52,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  		    (void) snpf(Namech, Namechl,
  			"can't read kernfs_node at: %s",
  			print_kptr((KA_T)v->v_data, (char *)NULL, 0));
-@@ -449,7 +462,7 @@
+@@ -449,7 +462,7 @@ process_overlaid_node:
  	 * size are fixed; otherwise, safely stat() the file to get the
  	 * inode number and size.
  	 */
@@ -61,7 +61,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  		(void) snpf(Namech, Namechl, "%s", _PATH_KERNFS);
  		ksb.st_ino = (ino_t)2;
  		ksb.st_size = DEV_BSIZE;
-@@ -471,6 +484,19 @@
+@@ -471,6 +484,19 @@ process_overlaid_node:
  	    nty = MFSNODE;
  	    break;
  
@@ -81,7 +81,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  #if	defined(HASMSDOSFS)
  	case VT_MSDOSFS:
  	    if (!v->v_data
-@@ -619,6 +645,7 @@
+@@ -619,6 +645,7 @@ process_overlaid_node:
  
  	    }
  
@@ -89,7 +89,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  	    if ((lff = i.i_lockf)) {
  
  	    /*
-@@ -667,6 +694,7 @@
+@@ -667,6 +694,7 @@ process_overlaid_node:
  		    break;
  		} while ((lfp = lf.lf_next) && lfp != lff);
  	    }
@@ -97,7 +97,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  	    break;
  	default:
  	    if (v->v_type == VBAD || v->v_type == VNON)
-@@ -900,6 +928,13 @@
+@@ -900,6 +928,13 @@ process_overlaid_node:
  	    break;
  #endif	/* defined(HASPTYFS) */
  
@@ -111,7 +111,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  	}
  
  /*
-@@ -1019,6 +1054,13 @@
+@@ -1019,6 +1054,13 @@ process_overlaid_node:
  			Lf->sz_def = 1;
  			break;
  
@@ -125,7 +125,7 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  #if	defined(HASEXT2FS)
  		    case EXT2NODE:
  # if	defined(HASI_E2FS_PTR)
-@@ -1221,6 +1263,9 @@
+@@ -1221,6 +1263,9 @@ process_overlaid_node:
  	    Lf->dev_def = Lf->rdev_def = 0;
  	    (void) snpf(Namech, Namechl, "%#x", m.mfs_baseoff);
  	    enter_dev_ch("memory");
@@ -135,3 +135,19 @@ $NetBSD: patch-ad,v 1.15 2008/05/17 23:53:29 christos Exp $
  	}
  
  #if	defined(HASPROCFS)
+@@ -1262,11 +1307,15 @@ process_overlaid_node:
+ 		(void) snpf(ep, sz, "/%d/fpregs", p.pfs_pid);
+ 		ty = "PFPR";
+ 		break;
++
++# if	defined(Pctl)
+ 	    case Pctl:
+ 		ep = endnm(&sz);
+ 		(void) snpf(ep, sz, "/%d/ctl", p.pfs_pid);
+ 		ty = "PCTL";
+ 		break;
++# endif	/* defined(Pctl) */
++
+ 	    case Pstatus:
+ 		ep = endnm(&sz);
+ 		(void) snpf(ep, sz, "/%d/status", p.pfs_pid);
diff --git a/sysutils/lsof/patches/patch-af b/sysutils/lsof/patches/patch-af
index c602f56b683..15453b856b5 100644
--- a/sysutils/lsof/patches/patch-af
+++ b/sysutils/lsof/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.14 2009/05/17 20:40:46 seb Exp $
+$NetBSD: patch-af,v 1.15 2017/08/30 10:41:24 kamil Exp $
 
 --- dialects/n+obsd/dlsof.h.orig	2006-03-28 21:54:15.000000000 +0000
 +++ dialects/n+obsd/dlsof.h
@@ -50,7 +50,25 @@ $NetBSD: patch-af,v 1.14 2009/05/17 20:40:46 seb Exp $
  
  # if	defined(HASNFSPROTO)
  #include <nfs/rpcv2.h>
-@@ -489,7 +492,12 @@ extern KA_T Kpa;
+@@ -370,7 +373,6 @@ struct sockproto {
+ #define	Pregs		PFSregs
+ #define	Pfile		PFSfile
+ #define	Pfpregs		PFSfpregs
+-#define	Pctl		PFSctl
+ #define	Pstatus		PFSstatus
+ #define	Pnote		PFSnote
+ #define	Pnotepg		PFSnotepg
+@@ -382,6 +384,9 @@ struct sockproto {
+ #define	Pmap		PFSmap
+ #define	Pmaps		PFSmaps
+ #    endif	/* NETBSDV>=1006000 */
++#    if	NETBSDV<8099000
++#define	Pctl		PFSctl
++#    endif	/* NETBSDV<8099000 */
+ #   endif	/* defined(NetBSDV) */
+ #  endif	/* defined(HASPROCFS_PFSROOT) */
+ #include <machine/reg.h>
+@@ -489,7 +494,12 @@ extern KA_T Kpa;
  struct l_vfs {
  	KA_T addr;			/* kernel address */
  	fsid_t	fsid;			/* file system ID */
@@ -63,7 +81,7 @@ $NetBSD: patch-af,v 1.14 2009/05/17 20:40:46 seb Exp $
  	char *dir;			/* mounted directory */
  	char *fsname;			/* file system name */
  	struct l_vfs *next;		/* forward link */
-@@ -581,4 +589,12 @@ struct sfile {
+@@ -581,4 +591,12 @@ struct sfile {
  #  endif	/* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */