[pkgsrc/trunk]: pkgsrc/sysutils/lsof When configuring on NetBSD:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e05a09eaaf4b
branches:  trunk
changeset: 392415:e05a09eaaf4b
user:      apb <apb%pkgsrc.org@localhost>
date:      Fri May 01 12:56:50 2009 +0000

description:
When configuring on NetBSD:
* Prefer /dev/ksyms, then getbootfile(), then fall back to /netbsd as the
  kernel name.
* Recognise NetBSD versions 5.0* and 5.99*
* When the NetBSD version is unrecognised, don't treat it like 1.6;
  treat it like either 1.2 (if it's really old) or 5.0 (if it's too new).
Bump PKGREVISION to 4

diffstat:

 sysutils/lsof/Makefile         |   4 +-
 sysutils/lsof/distinfo         |   4 +-
 sysutils/lsof/patches/patch-ag |  61 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 57 insertions(+), 12 deletions(-)

diffs (143 lines):

diff -r e801b94f9b59 -r e05a09eaaf4b sysutils/lsof/Makefile
--- a/sysutils/lsof/Makefile    Fri May 01 12:44:37 2009 +0000
+++ b/sysutils/lsof/Makefile    Fri May 01 12:56:50 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2008/05/29 16:52:59 tnn Exp $
+# $NetBSD: Makefile,v 1.99 2009/05/01 12:56:50 apb Exp $
 
 DISTNAME=              lsof_4.78
 PKGNAME=               ${DISTNAME:S/_/-/}.${OS_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            sysutils
 MASTER_SITES=          ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  \
                        ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
diff -r e801b94f9b59 -r e05a09eaaf4b sysutils/lsof/distinfo
--- a/sysutils/lsof/distinfo    Fri May 01 12:44:37 2009 +0000
+++ b/sysutils/lsof/distinfo    Fri May 01 12:56:50 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2008/05/17 23:53:29 christos Exp $
+$NetBSD: distinfo,v 1.75 2009/05/01 12:56:50 apb Exp $
 
 SHA1 (lsof_4.78.tar.bz2) = 0379fc9f38a931ce19e8386e662314d96fc2a099
 RMD160 (lsof_4.78.tar.bz2) = 50d71e500f1109cda717b73ce209c0e100a6dbe9
@@ -9,5 +9,5 @@
 SHA1 (patch-ad) = 4bd73dea4770c7f5a43be0d096c26e7d6728dd2c
 SHA1 (patch-ae) = 1d8c1c3baf9575631c23d3ced7b12fab1df95cd6
 SHA1 (patch-af) = 7481b1d10b12b7c6216858db30b25a3b985e4d3d
-SHA1 (patch-ag) = febdf5429228a921496d89bb6e589e22ee21e728
+SHA1 (patch-ag) = 2f14b7954976e3b3d43034e13bf31d14ca65e4e3
 SHA1 (patch-ah) = 0ed8ca9cc34d85dc01b135e70077c922d26d8831
diff -r e801b94f9b59 -r e05a09eaaf4b sysutils/lsof/patches/patch-ag
--- a/sysutils/lsof/patches/patch-ag    Fri May 01 12:44:37 2009 +0000
+++ b/sysutils/lsof/patches/patch-ag    Fri May 01 12:56:50 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2007/12/28 16:15:40 adam Exp $
+$NetBSD: patch-ag,v 1.5 2009/05/01 12:56:50 apb Exp $
 
 --- Configure.orig     2007-04-24 21:00:22.000000000 +0200
 +++ Configure
@@ -10,7 +10,19 @@
  #     $LSOF_N_UNIXV       *BSD system's kernel file
  #     $LSOF_PL            patch level
  #     $LSOF_RANLIB        randomizing command for the lsof library
-@@ -2447,6 +2448,19 @@ return(0); }
+@@ -2391,6 +2392,11 @@ return(0); }
+       # Validate the NetBSD version.
+ 
+       case $LSOF_VSTR in      # {
++      0*|1.[01]*)
++      LSOF_VERS="1006000"
++      echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
++      echo "!!!WARNING!!!  Configuring for NetBSD 1.2"
++      ;;
+       1.2*)
+       LSOF_VERS="1002000"
+       ;;
+@@ -2447,10 +2453,36 @@ return(0); }
        echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
        echo "!!!WARNING!!!  Configuring for NetBSD 3.0"
        ;;
@@ -27,19 +39,52 @@
 +      echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
 +      echo "!!!WARNING!!!  Configuring for NetBSD 4.0"
 +      ;;
++      5.0*)
++      LSOF_TSTBIGF=" "
++      LSOF_VERS="5000000"
++      ;;
++      5.99.*)
++      LSOF_TSTBIGF=" "
++      LSOF_VERS="5099000"
++      ;;
++      5*)
++      LSOF_VERS="5000000"
++      echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
++      echo "!!!WARNING!!!  Configuring for NetBSD 5.0"
++      ;;
        *)
++      LSOF_VERS="5000000"
        echo "Unknown NetBSD release: $LSOF_VSTR"
-       echo Assuming NetBSD 1.6
-@@ -2464,6 +2478,8 @@ return(0); }
+-      echo Assuming NetBSD 1.6
+-      LSOF_VERS="1006000"
++      echo "!!!WARNING!!!  Configuring for NetBSD 5.0"
+       ;;
+       esac    # }
+     fi        # }
+@@ -2464,6 +2496,10 @@ return(0); }
        ;;
      3000000|3099000)
        ;;
 +    4000000|4099000)
 +      ;;
++    5000000|5099000)
++      ;;
      *)
        echo "Unknown NetBSD version: $LSOF_VERS"
        rm -f $LSOF_HLP
-@@ -2871,6 +2887,7 @@ return(0); }
+@@ -2472,7 +2508,10 @@ return(0); }
+     esac      # }
+     LSOF_CFGF="-DNETBSDV=$LSOF_VERS"
+     LSOF_TMP1="-DN_UNIXV=/netbsd"
+-    if test -r ${LSOF_INCLUDE}/util.h # {
++    if test -r /dev/ksyms             # {
++    then
++      LSOF_TMP1="-DN_UNIXV=/dev/ksyms"
++    elif test -r ${LSOF_INCLUDE}/util.h       # } {
+     then
+       grep -q getbootfile ${LSOF_INCLUDE}/util.h
+       if test $? -eq 0        # {
+@@ -2871,6 +2910,7 @@ return(0); }
      fi        # }
      LSOF_TMP2="sys/vnode.h"
      LSOF_NBSD_PTYFS=0
@@ -47,7 +92,7 @@
      if test -r ${LSOF_INCLUDE}/$LSOF_TMP2     # {
      then
        LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
-@@ -2948,6 +2965,24 @@ return(0); }
+@@ -2948,6 +2988,24 @@ return(0); }
          fi    # }
        fi      # }
        fi      # }
@@ -72,7 +117,7 @@
        if test "X$NETBSD_UVM" = "X"    # {
        then
        grep -q UVM $LSOF_TMP3
-@@ -3233,6 +3268,28 @@ return(0); }
+@@ -3233,6 +3291,28 @@ return(0); }
        LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include"
        fi      # }
      fi        # }
@@ -101,7 +146,7 @@
      LSOF_CFGL="$LSOF_CFGL -lkvm"
      LSOF_DIALECT_DIR=n+obsd
      ;;
-@@ -4833,7 +4890,7 @@ fi       # }
+@@ -4833,7 +4913,7 @@ fi       # }
  echo "" >> $LSOF_MKFC
  if test "X$LSOF_DEBUG" = "X"  # {
  then