From 933a893cea8d6c95eadbd20fb65a0d09ee293ff9 Mon Sep 17 00:00:00 2001
From: atatat <atatat@pkgsrc.org>
Date: Wed, 23 Mar 2005 04:35:56 +0000
Subject: This should also fix the lsof build on 3.0_BETA.  Similar changes
 will appear in the next release of lsof.  This patch is adapted from a
 pre-release by the author.

---
 sysutils/lsof/distinfo         |  4 ++--
 sysutils/lsof/patches/patch-ab | 40 ++++++++++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 1c0062e467d..ad94b7ce39d 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.51 2005/03/19 19:47:33 atatat Exp $
+$NetBSD: distinfo,v 1.52 2005/03/23 04:35:56 atatat Exp $
 
 SHA1 (lsof_4.74.tar.bz2) = eed401b9d32bc009be48359ffb3bcdea119570d6
 RMD160 (lsof_4.74.tar.bz2) = f167101e8a248f7f2ed1dd95631ede47cbb26a85
 Size (lsof_4.74.tar.bz2) = 732392 bytes
 SHA1 (patch-aa) = 332eb1ac95d86023dde66d1b99b9335c8f54b81f
-SHA1 (patch-ab) = 551821b8cc371bc22d4142ddcf5a5731444f74ee
+SHA1 (patch-ab) = bc026d4b9e09ce3b3f459791671dfac24b8e4815
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
index 219512247fe..577a1bf4439 100644
--- a/sysutils/lsof/patches/patch-ab
+++ b/sysutils/lsof/patches/patch-ab
@@ -1,26 +1,50 @@
-$NetBSD: patch-ab,v 1.34 2005/03/19 19:47:33 atatat Exp $
+$NetBSD: patch-ab,v 1.35 2005/03/23 04:35:56 atatat Exp $
 
-Fix build on 3.99.x current.
+Fix build on 3.0 branch and 3.99.x current.
 
 --- Configure.orig	2005-01-17 08:24:32.000000000 -0500
 +++ Configure
-@@ -2355,6 +2355,10 @@ return(0); }
+@@ -2346,15 +2346,28 @@ return(0); }
+ 	LSOF_TSTBIGF=" "
+ 	LSOF_VERS="2099010"
+ 	;;
+-      2.99.11)
++      2.99.*)
+ 	LSOF_TSTBIGF=" "
+-	LSOF_VERS="2099011"
++	LSOF_VERS="2099010"
+ 	;;
+       2*)
+ 	LSOF_VERS="2000000"
  	echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
  	echo "!!!WARNING!!!  Configuring for NetBSD 2.0"
  	;;
++      3.0*)
++	LSOF_TSTBIGF=" "
++	LSOF_VERS="3000000"
++	;;
 +      3.99.*)
 +	LSOF_TSTBIGF=" "
 +	LSOF_VERS="3099000"
++	;;
++      3*)
++	LSOF_VERS="3000000"
++	echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
++	echo "!!!WARNING!!!  Configuring for NetBSD 3.0"
 +	;;
        *)
  	echo "Unknown NetBSD release: $LSOF_VSTR"
  	echo Assuming NetBSD 1.6
-@@ -2368,6 +2372,8 @@ return(0); }
+@@ -2366,7 +2379,11 @@ return(0); }
+     # Test for legal NetBSD version.
+ 
      case $LSOF_VERS in	# {
-     1002000|1003000|1004000|1005000|1006000|2000000|2099009|2099010|2099011)
-       ;;
-+    3099000)
+-    1002000|1003000|1004000|1005000|1006000|2000000|2099009|2099010|2099011)
++    1002000|1003000|1004000|1005000|1006000)
 +      ;;
++    2000000|2099009|2099010)
++      ;;
++    3000000|3099000)
+       ;;
      *)
        echo "Unknown NetBSD version: $LSOF_VERS"
-       rm -f $LSOF_HLP
-- 
cgit v1.2.3