CVS commit: pkgsrc/sysutils/lsof

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Jun 22 20:48:04 UTC 2017

Modified Files:
        pkgsrc/sysutils/lsof: distinfo
        pkgsrc/sysutils/lsof/patches: patch-ae patch-ag

Log Message:
NetBSD>=8.99.1 needs __EXPOSE_MOUNT defined


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/lsof/patches/patch-ae
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/lsof/patches/patch-ag

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/lsof/distinfo
diff -u pkgsrc/sysutils/lsof/distinfo:1.87 pkgsrc/sysutils/lsof/distinfo:1.88
--- pkgsrc/sysutils/lsof/distinfo:1.87  Sat Feb 11 15:25:38 2017
+++ pkgsrc/sysutils/lsof/distinfo       Thu Jun 22 20:48:04 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2017/02/11 15:25:38 rodent Exp $
+$NetBSD: distinfo,v 1.88 2017/06/22 20:48:04 tnn Exp $
 
 SHA1 (lsof_4.89.tar.bz2) = ea8fb2588c9732f1b22d73ffab17dd055590df2c
 RMD160 (lsof_4.89.tar.bz2) = 233ff3b91e386f4152900035e6572c4eaed38adc
@@ -8,8 +8,8 @@ SHA1 (patch-aa) = 4469a5fed540e3c5635b60
 SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
 SHA1 (patch-ad) = 4bd73dea4770c7f5a43be0d096c26e7d6728dd2c
-SHA1 (patch-ae) = 1d8c1c3baf9575631c23d3ced7b12fab1df95cd6
+SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
 SHA1 (patch-af) = b52c15a507960ecf33a61a3cbd608a92ebac1188
-SHA1 (patch-ag) = 6f3236ff8d84c79c830e521c9e7c5a5760adb04e
+SHA1 (patch-ag) = bd146026dff5a383b1a53e1bc9cf68302f742575
 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09

Index: pkgsrc/sysutils/lsof/patches/patch-ae
diff -u pkgsrc/sysutils/lsof/patches/patch-ae:1.11 pkgsrc/sysutils/lsof/patches/patch-ae:1.12
--- pkgsrc/sysutils/lsof/patches/patch-ae:1.11  Tue Aug 14 19:59:18 2007
+++ pkgsrc/sysutils/lsof/patches/patch-ae       Thu Jun 22 20:48:04 2017
@@ -1,14 +1,17 @@
-$NetBSD: patch-ae,v 1.11 2007/08/14 19:59:18 veego Exp $
+$NetBSD: patch-ae,v 1.12 2017/06/22 20:48:04 tnn Exp $
 
---- dialects/n+obsd/dmnt.c.orig        2005-08-08 21:53:31.000000000 +0200
-+++ dialects/n+obsd/dmnt.c     2007-08-11 14:43:05.000000000 +0200
-@@ -45,6 +45,15 @@
+--- dialects/n+obsd/dmnt.c.orig        2005-08-08 19:53:31.000000000 +0000
++++ dialects/n+obsd/dmnt.c
+@@ -45,6 +45,18 @@ static char *rcsid = "$Id: dmnt.c,v 1.12
  #include <sys/statvfs.h>
  #endif  /* defined(NETBSDV) && defined(HASSTATVFS) */
  
 +#if defined(NETBSDV)
 +#include <sys/param.h>
 +
++#if __NetBSD_Version__ >= 899000100
++#define __EXPOSE_MOUNT
++#endif
 +#if __NetBSD_Version__ >= 399002400
 +#include <sys/types.h>
 +#include <sys/mount.h>
@@ -18,7 +21,7 @@ $NetBSD: patch-ae,v 1.11 2007/08/14 19:5
  #include "lsof.h"
  
  
-@@ -94,7 +103,12 @@
+@@ -94,7 +106,12 @@ readmnt()
        for (; n; n--, mb++) {
            if (mb->f_fstypename[0] == '\0')
                continue;

Index: pkgsrc/sysutils/lsof/patches/patch-ag
diff -u pkgsrc/sysutils/lsof/patches/patch-ag:1.8 pkgsrc/sysutils/lsof/patches/patch-ag:1.9
--- pkgsrc/sysutils/lsof/patches/patch-ag:1.8   Tue Dec 29 12:42:57 2015
+++ pkgsrc/sysutils/lsof/patches/patch-ag       Thu Jun 22 20:48:04 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.8 2015/12/29 12:42:57 bsiegert Exp $
+$NetBSD: patch-ag,v 1.9 2017/06/22 20:48:04 tnn Exp $
 
---- Configure.orig     2014-10-13 22:31:13.000000000 +0000
+--- Configure.orig     2015-07-07 20:17:04.000000000 +0000
 +++ Configure
-@@ -2966,32 +2966,62 @@ return(0); }
+@@ -3013,32 +3013,66 @@ return(0); }
        echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
        echo "!!!WARNING!!!  Configuring for NetBSD 3.0"
        ;;
@@ -48,6 +48,10 @@ $NetBSD: patch-ag,v 1.8 2015/12/29 12:42
 +      LSOF_TSTBIGF=" "
 +      LSOF_VERS="7099000"
 +      ;;
++      8.99.*)
++      LSOF_TSTBIGF=" "
++      LSOF_VERS="8099000"
++      ;;
        *)
        echo "Unknown NetBSD release: $LSOF_VSTR"
 -      echo Assuming NetBSD 1.6
@@ -83,7 +87,7 @@ $NetBSD: patch-ag,v 1.8 2015/12/29 12:42
      then
        grep -q getbootfile ${LSOF_INCLUDE}/util.h
        if test $? -eq 0        # {
-@@ -3390,6 +3420,7 @@ return(0); }
+@@ -3437,6 +3471,7 @@ return(0); }
      fi        # }
      LSOF_TMP2="sys/vnode.h"
      LSOF_NBSD_PTYFS=0
@@ -91,7 +95,7 @@ $NetBSD: patch-ag,v 1.8 2015/12/29 12:42
      if test -r ${LSOF_INCLUDE}/$LSOF_TMP2     # {
      then
        LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
-@@ -3467,7 +3498,25 @@ return(0); }
+@@ -3514,7 +3549,25 @@ return(0); }
          fi    # }
        fi      # }
        fi      # }
@@ -118,7 +122,7 @@ $NetBSD: patch-ag,v 1.8 2015/12/29 12:42
        then
        grep -q UVM $LSOF_TMP3
        if test $? -ne 0        # {
-@@ -3752,6 +3801,28 @@ return(0); }
+@@ -3799,6 +3852,28 @@ return(0); }
        LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include"
        fi      # }
      fi        # }
@@ -147,7 +151,7 @@ $NetBSD: patch-ag,v 1.8 2015/12/29 12:42
      LSOF_CFGL="$LSOF_CFGL -lkvm"
      LSOF_DIALECT_DIR=n+obsd
      ;;
-@@ -5488,7 +5559,7 @@ fi       # }
+@@ -5535,7 +5610,7 @@ fi       # }
  echo "" >> $LSOF_MKFC
  if test "X$LSOF_DEBUG" = "X"  # {
  then