[pkgsrc/trunk]: pkgsrc/sysutils/lsof We don't export struct lockf anymore, th...

[christos <christos%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1465f20ad6f8
branches:  trunk
changeset: 513864:1465f20ad6f8
user:      christos <christos%pkgsrc.org@localhost>
date:      Sun Jun 04 21:00:51 2006 +0000

description:
We don't export struct lockf anymore, thus we cannot print lock info.

diffstat:

 sysutils/lsof/distinfo         |   3 ++-
 sysutils/lsof/patches/patch-ad |  41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r c613adb64682 -r 1465f20ad6f8 sysutils/lsof/distinfo
--- a/sysutils/lsof/distinfo    Sun Jun 04 20:58:35 2006 +0000
+++ b/sysutils/lsof/distinfo    Sun Jun 04 21:00:51 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2005/11/09 08:06:32 tron Exp $
+$NetBSD: distinfo,v 1.61 2006/06/04 21:00:51 christos Exp $
 
 SHA1 (lsof_4.76.tar.bz2) = 75e1b81d8498a0dbe818e952ebada985c08ab2db
 RMD160 (lsof_4.76.tar.bz2) = deee519e0f43349252951495c53ef6c2b57a7f59
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 332eb1ac95d86023dde66d1b99b9335c8f54b81f
 SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
 SHA1 (patch-ac) = 2fd3810d79e2e534a06eef446562e9e3a95b2ffe
+SHA1 (patch-ad) = e543d447ea3946f0f7b856e20420cda89e31d14b
diff -r c613adb64682 -r 1465f20ad6f8 sysutils/lsof/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/lsof/patches/patch-ad    Sun Jun 04 21:00:51 2006 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-ad,v 1.11 2006/06/04 21:00:54 christos Exp $
+
+--- dialects/n+obsd/dnode.c.orig       2005-08-08 15:53:32.000000000 -0400
++++ dialects/n+obsd/dnode.c    2006-06-04 16:57:22.000000000 -0400
+@@ -38,6 +38,10 @@
+ 
+ #include "lsof.h"
+ 
++#if __NetBSD_Version__ > 399001800
++#define NOLOCKF
++#endif
++
+ 
+ #if   defined(HASFDESCFS) && HASFDESCFS==1
+ _PROTOTYPE(static int lkup_dev_tty,(dev_t *dr, INODETYPE *ir));
+@@ -183,7 +187,9 @@
+       unsigned char ns;
+       unsigned char rdevs;
+       char *ep, *ty;
++#ifndef NOLOCKF
+       struct lockf lf, *lff, *lfp;
++#endif
+       struct inode i;
+       struct mfsnode m;
+       struct nfsnode n;
+@@ -608,6 +614,7 @@
+ 
+           }
+ 
++#ifndef NOLOCKF
+           if ((lff = i.i_lockf)) {
+ 
+           /*
+@@ -656,6 +663,7 @@
+                   break;
+               } while ((lfp = lf.lf_next) && lfp != lff);
+           }
++#endif
+           break;
+       default:
+           if (v->v_type == VBAD || v->v_type == VNON)