From 02e0a5f795e5397eeefc951b918865c794186b2a Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 21 Jun 2009 13:24:02 +0000
Subject: [PATCH] update to 4.82, and recognise OpenBSD 4.6. from Brad.

---
 sysutils/lsof/Makefile                |  6 +--
 sysutils/lsof/distinfo                | 10 ++---
 sysutils/lsof/patches/patch-Configure | 53 ++++++++++++++++++++-------
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index cb3423282b8..424f63bd879 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.65 2009/02/15 23:46:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.66 2009/06/21 13:24:02 sthen Exp $
 
 COMMENT=	list information about open files
 
-VERSION=	4.81
+VERSION=	4.82
 DISTNAME=	lsof_${VERSION}
-PKGNAME=	${DISTNAME:S/_/-/}p0
+PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
 		ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 69b90ce09d6..44741ff5735 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,5 +1,5 @@
-MD5 (lsof_4.81.tar.gz) = mcBdYORf1yf4eDRqBKsnVQ==
-RMD160 (lsof_4.81.tar.gz) = Flqh/6GtZxhlkiEvBeIwyJRa5p8=
-SHA1 (lsof_4.81.tar.gz) = fVhU5TrLdzbETOweo6oxB7VsdJg=
-SHA256 (lsof_4.81.tar.gz) = eejWs6Moz3dzsn/r9MkCMC+YuoyZpMPxyCUlXjB/tI0=
-SIZE (lsof_4.81.tar.gz) = 1078849
+MD5 (lsof_4.82.tar.gz) = 1prDl6VLLgS5vcqzK5oLjQ==
+RMD160 (lsof_4.82.tar.gz) = U2xS7MvLXUFDh2QqKf8Pv4X3FjA=
+SHA1 (lsof_4.82.tar.gz) = /fpvSGZDMlvhxrjnmiJEWjDqfHA=
+SHA256 (lsof_4.82.tar.gz) = TGFrlhhtjR6It6FRYJxiKuEMTlmqs5tyitcn12hCpZI=
+SIZE (lsof_4.82.tar.gz) = 1100201
diff --git a/sysutils/lsof/patches/patch-Configure b/sysutils/lsof/patches/patch-Configure
index a003304e44c..70f2722452e 100644
--- a/sysutils/lsof/patches/patch-Configure
+++ b/sysutils/lsof/patches/patch-Configure
@@ -1,14 +1,31 @@
-$OpenBSD: patch-Configure,v 1.25 2009/02/15 23:46:08 sthen Exp $
---- Configure.orig	Tue Oct 21 12:21:45 2008
-+++ Configure	Sun Feb 15 18:34:42 2009
-@@ -3687,6 +3687,36 @@ return(0); }
- 	echo "!!!WARNING!!!  Unsupported OpenBSD 3.x version: $LSOF_VSTR"
- 	echo "!!!WARNING!!!  Configuring for OpenBSD 3.9"
+$OpenBSD: patch-Configure,v 1.26 2009/06/21 13:24:02 sthen Exp $
+--- Configure.orig	Wed Mar 25 15:24:01 2009
++++ Configure	Sat Jun 20 20:39:42 2009
+@@ -3694,12 +3694,6 @@ return(0); }
+ 	LSOF_TSTBIGF=" "
+ 	LSOF_VERS=2090
  	;;
+-      2*)
+-	LSOF_TSTBIGF=" "
+-	LSOF_VERS=2090
+-	echo "!!!WARNING!!!  Unsupported OpenBSD 2.x version: $LSOF_VSTR"
+-	echo "!!!WARNING!!!  Configuring for OpenBSD 2.9"
+-	;;
+       3.0*)
+ 	LSOF_TSTBIGF=" "
+ 	LSOF_VERS=3000
+@@ -3740,16 +3734,44 @@ return(0); }
+ 	LSOF_TSTBIGF=" "
+ 	LSOF_VERS=3090
+ 	;;
+-      3*)
 +      4.0*)
-+	LSOF_TSTBIGF=" "
+ 	LSOF_TSTBIGF=" "
+-	LSOF_VERS=3090
+-	echo "!!!WARNING!!!  Unsupported OpenBSD 3.x version: $LSOF_VSTR"
+-	echo "!!!WARNING!!!  Configuring for OpenBSD 3.9"
 +	LSOF_VERS=4000
-+	;;
+ 	;;
 +      4.1*)
 +	LSOF_TSTBIGF=" "
 +	LSOF_VERS=4010
@@ -29,21 +46,31 @@ $OpenBSD: patch-Configure,v 1.25 2009/02/15 23:46:08 sthen Exp $
 +	LSOF_TSTBIGF=" "
 +	LSOF_VERS=4050
 +	;;
++      4.6*)
++	LSOF_TSTBIGF=" "
++	LSOF_VERS=4060
++	;;
 +      4*)
 +	LSOF_TSTBIGF=" "
-+	LSOF_VERS=4050
++	LSOF_VERS=4060
 +	echo "!!!WARNING!!!  Unsupported OpenBSD 4.x version: $LSOF_VSTR"
-+	echo "!!!WARNING!!!  Configuring for OpenBSD 4.5"
++	echo "!!!WARNING!!!  Configuring for OpenBSD 4.6"
 +	;;
        *)
  	echo "Unknown OpenBSD release: $LSOF_VSTR"
- 	echo Assuming OpenBSD 3.9
-@@ -3698,7 +3728,7 @@ return(0); }
+-	echo Assuming OpenBSD 3.9
+-	LSOF_VERS=3090
++	echo Assuming OpenBSD 4.6
++	LSOF_VERS=4060
+ 	;;
+       esac	# }
+     fi	# }
+@@ -3757,7 +3779,7 @@ return(0); }
      # Test for legal OpenBSD version.
  
      case $LSOF_VERS in	# {
 -    1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080|3090)
-+    1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080|3090|4000|4010|4020|4030|4040|4050)
++    1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080|3090|4000|4010|4020|4030|4040|4050|4060)
        ;;
      *)
        echo "Unknown OpenBSD version: $LSOF_VERS"