CVS commit: pkgsrc/sysutils/lsof

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Nov 11 00:49:34 UTC 2021

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

Log Message:
lsof: update to match NetBSD 8.x, 9.x, and 9.99.x


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/sysutils/lsof/Makefile
cvs rdiff -u -r1.98 -r1.99 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.10 -r1.11 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/Makefile
diff -u pkgsrc/sysutils/lsof/Makefile:1.139 pkgsrc/sysutils/lsof/Makefile:1.140
--- pkgsrc/sysutils/lsof/Makefile:1.139 Wed Sep 29 13:33:38 2021
+++ pkgsrc/sysutils/lsof/Makefile       Thu Nov 11 00:49:34 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.139 2021/09/29 13:33:38 tnn Exp $
+# $NetBSD: Makefile,v 1.140 2021/11/11 00:49:34 gutteridge Exp $
 
 DISTNAME=              lsof_4.91
 PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            sysutils
 MASTER_SITES=          ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/
 MASTER_SITES+=         ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/

Index: pkgsrc/sysutils/lsof/distinfo
diff -u pkgsrc/sysutils/lsof/distinfo:1.98 pkgsrc/sysutils/lsof/distinfo:1.99
--- pkgsrc/sysutils/lsof/distinfo:1.98  Tue Oct 26 11:19:49 2021
+++ pkgsrc/sysutils/lsof/distinfo       Thu Nov 11 00:49:34 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2021/10/26 11:19:49 nia Exp $
+$NetBSD: distinfo,v 1.99 2021/11/11 00:49:34 gutteridge Exp $
 
 BLAKE2s (lsof_4.91.tar.bz2) = 77109e036c36f7d1483e69f2aae2314830dc4d2bdc3bf88a4031832f17e6afef
 SHA512 (lsof_4.91.tar.bz2) = 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
@@ -9,6 +9,6 @@ SHA1 (patch-ac) = dac0fcdfee97d42c8f2368
 SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
 SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
 SHA1 (patch-af) = 300d8042078e1137deead7f82d7ab252bbdbbb43
-SHA1 (patch-ag) = ced30f63961268a6c76bcc1d22a2eb9e1f750480
+SHA1 (patch-ag) = 99ab1c616604e9775522dbc70bfd6a7294964d0a
 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09

Index: pkgsrc/sysutils/lsof/patches/patch-ag
diff -u pkgsrc/sysutils/lsof/patches/patch-ag:1.10 pkgsrc/sysutils/lsof/patches/patch-ag:1.11
--- pkgsrc/sysutils/lsof/patches/patch-ag:1.10  Thu Mar  5 20:49:22 2020
+++ pkgsrc/sysutils/lsof/patches/patch-ag       Thu Nov 11 00:49:34 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.10 2020/03/05 20:49:22 tnn Exp $
+$NetBSD: patch-ag,v 1.11 2021/11/11 00:49:34 gutteridge Exp $
 
 --- Configure.orig     2018-02-14 14:18:55.000000000 +0000
 +++ Configure
-@@ -3077,32 +3077,66 @@ return(0); }
+@@ -3077,32 +3077,78 @@ return(0); }
        echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
        echo "!!!WARNING!!!  Configuring for NetBSD 3.0"
        ;;
@@ -48,16 +48,28 @@ $NetBSD: patch-ag,v 1.10 2020/03/05 20:4
 +      LSOF_TSTBIGF=" "
 +      LSOF_VERS="7099000"
 +      ;;
++      8.[0123]*)
++      LSOF_TSTBIGF=" "
++      LSOF_VERS="8000000"
++      ;;
 +      8.99.*)
 +      LSOF_TSTBIGF=" "
 +      LSOF_VERS="8099000"
 +      ;;
++      9.[0123].*)
++      LSOF_TSTBIGF=" "
++      LSOF_VERS="9000000"
++      ;;
++      9.99.*)
++      LSOF_TSTBIGF=" "
++      LSOF_VERS="9099000"
++      ;;
        *)
        echo "Unknown NetBSD release: $LSOF_VSTR"
 -      echo Assuming NetBSD 1.6
 -      LSOF_VERS="1006000"
-+      echo Assuming NetBSD 7.0
-+      LSOF_VERS="7000000"
++      echo Assuming NetBSD 9.0
++      LSOF_VERS="9000000"
        ;;
        esac    # }
      fi        # }
@@ -87,7 +99,7 @@ $NetBSD: patch-ag,v 1.10 2020/03/05 20:4
      then
        grep -q getbootfile ${LSOF_INCLUDE}/util.h
        if test $? -eq 0        # {
-@@ -3501,6 +3535,7 @@ return(0); }
+@@ -3501,6 +3547,7 @@ return(0); }
      fi        # }
      LSOF_TMP2="sys/vnode.h"
      LSOF_NBSD_PTYFS=0
@@ -95,7 +107,7 @@ $NetBSD: patch-ag,v 1.10 2020/03/05 20:4
      if test -r ${LSOF_INCLUDE}/$LSOF_TMP2     # {
      then
        LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
-@@ -3578,16 +3613,29 @@ return(0); }
+@@ -3578,16 +3625,29 @@ return(0); }
          fi    # }
        fi      # }
        fi      # }
@@ -132,7 +144,7 @@ $NetBSD: patch-ag,v 1.10 2020/03/05 20:4
        fi      # }
        fi      # }
      fi        # }
-@@ -3863,6 +3911,28 @@ return(0); }
+@@ -3863,6 +3923,28 @@ return(0); }
        LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include"
        fi      # }
      fi        # }
@@ -161,7 +173,7 @@ $NetBSD: patch-ag,v 1.10 2020/03/05 20:4
      LSOF_CFGL="$LSOF_CFGL -lkvm"
      LSOF_DIALECT_DIR=n+obsd
      ;;
-@@ -5607,7 +5677,7 @@ fi       # }
+@@ -5607,7 +5689,7 @@ fi       # }
  echo "" >> $LSOF_MKFC
  if test "X$LSOF_DEBUG" = "X"  # {
  then