Add kqueue support to lsof. Bump PKGREVISION to 1, making this

4.66nb1.  This patch will be included in the next lsof release.

6 files changed, 80 insertions, 2 deletions

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 7f6ebc258ab..a46a2433003 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2002/12/22 20:04:30 atatat Exp $
+# $NetBSD: Makefile,v 1.58 2003/02/03 01:03:14 atatat Exp $
 #
 
 DISTNAME=		lsof_4.66
 PKGNAME=		${DISTNAME:S/_/-/}
+PKGREVISION=		1
 TMPWRK=			${WRKDIR}/${DISTNAME}
 WRKSRC=			${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
 CATEGORIES=		sysutils
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index f9451508c0b..bb3ca005405 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.23 2002/12/22 20:09:00 atatat Exp $
+$NetBSD: distinfo,v 1.24 2003/02/03 01:03:14 atatat Exp $
 
 SHA1 (lsof_4.66.tar.gz) = 7bf3b88ed059d01a01034fcd93db74d8e63b7c8f
 Size (lsof_4.66.tar.gz) = 954609 bytes
 SHA1 (patch-aa) = 36790019394b4088c226222d4aefaec50430bcf3
+SHA1 (patch-ab) = e0ff5138fadd27aedf513b0b73f6bc0936e4c175
+SHA1 (patch-ac) = 77a9c74666ed7b8005f3c5490280d744d115639d
+SHA1 (patch-ad) = fe930fa4552d09b315ceca1afb4eefc3223ede01
+SHA1 (patch-ae) = 1d3eb8da10f60071d41b1cc42e129c163ada9c67
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
new file mode 100644
index 00000000000..0976178362e
--- /dev/null
+++ b/sysutils/lsof/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.17 2003/02/03 01:03:14 atatat Exp $
+
+kqueue support, part 1 of 4
+
+--- dialects/n+obsd/dlsof.h.orig	2002-10-08 16:21:56.000000000 -0400
++++ dialects/n+obsd/dlsof.h
+@@ -244,6 +244,12 @@ struct vop_advlock_args;
+ #undef	KERNEL
+ #undef	_KERNEL
+ 
++# if	defined(NETBSDV) && \
++	(__NetBSD_Version__ >= 106100000) && \
++	defined(DTYPE_KQUEUE)
++#define	HASKQUEUE
++# endif	/* defined(NETBSDV) && ... */
++
+ # if	defined(UVM)
+ #  if	defined(OPENBSDV)
+ #define	_UVM_UVM_FAULT_I_H_	1		/* avoid OpenBSD's
diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac
new file mode 100644
index 00000000000..d579b8da709
--- /dev/null
+++ b/sysutils/lsof/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.6 2003/02/03 01:03:15 atatat Exp $
+
+kqueue support, part 2 of 4
+
+--- dialects/n+obsd/dnode.c.orig	2002-10-08 16:22:13.000000000 -0400
++++ dialects/n+obsd/dnode.c
+@@ -1141,3 +1141,14 @@ process_pipe(pa)
+ 	    enter_nm(Namech);
+ }
+ #endif	/* defined(HAS_SYS_PIPEH) */
++
++#if	defined(HASKQUEUE)
++void
++process_kqueue(ka)
++	KA_T ka;
++{
++
++	(void) snpf(Lf->type, sizeof(Lf->type), "KQUEUE");
++	enter_dev_ch(print_kptr(ka, (char *)NULL, 0));
++}
++#endif	/* defined(HASKQUEUE) */
diff --git a/sysutils/lsof/patches/patch-ad b/sysutils/lsof/patches/patch-ad
new file mode 100644
index 00000000000..48c49affa4a
--- /dev/null
+++ b/sysutils/lsof/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2003/02/03 01:03:15 atatat Exp $
+
+kqueue support, part 3 of 4
+
+--- dialects/n+obsd/dproto.h.orig	2002-04-19 16:53:35.000000000 -0400
++++ dialects/n+obsd/dproto.h
+@@ -53,3 +53,7 @@ _PROTOTYPE(extern int read_iso_node,(str
+ #endif	/* defined(HAS9660FS) */
+ 
+ _PROTOTYPE(extern void process_socket,(KA_T sa));
++
++#if	defined(HASKQUEUE)
++_PROTOTYPE(extern void process_kqueue,(KA_T q));
++#endif	/* defined(HASKQUEUE) */
diff --git a/sysutils/lsof/patches/patch-ae b/sysutils/lsof/patches/patch-ae
new file mode 100644
index 00000000000..14e76577ae9
--- /dev/null
+++ b/sysutils/lsof/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2003/02/03 01:03:15 atatat Exp $
+
+kqueue support, part 4 of 4
+
+--- lib/prfp.c.orig	2000-08-02 08:53:07.000000000 -0400
++++ lib/prfp.c
+@@ -159,6 +159,12 @@ process_file(fp)
+ 		return;
+ #endif	/* defined(HASPRIVFILETYPE) */
+ 
++#if	defined(DTYPE_KQUEUE)
++	    case DTYPE_KQUEUE:
++		process_kqueue((KA_T)f.f_data);
++		return;
++#endif	/* defined(DTYPE_KQUEUE) */
++
+ 	    default:
+ 		if (f.f_type || f.f_ops) {
+ 		    (void) snpf(Namech, Namechl,