From d40b06572fb1fa4ea24ffdd9c9e2b17ef1529eca Mon Sep 17 00:00:00 2001
From: atatat <atatat>
Date: Tue, 17 May 2005 04:45:08 +0000
Subject: Upgrade to lsof version 4.75, thereby getting rid of most of the
 accumulated patches.  Changes related to or affecting NetBSD (or pkgsrc) from
 the 00DIST file:

4.75            May 16, 2005
                ...
                Improved the BSDI, FreeBSD, NetBSD, OpenBSD and Solaris
                kvm_open() and kvm_openfiles() error messages.

                Enabled support for NetBSD 2.99.12.

Also, add the "uname -r" value to the lsof package version.  This
means that lintpkgsrc will report the lsof package as being out of
date if you update your kernel without updating lsof.  It's entirely
likely that lsof will continue to work, but it might not (and it will
warn you anyway), but it's nice to know that it might be good to
rebuild it.
---
 sysutils/lsof/Makefile         |  6 ++---
 sysutils/lsof/distinfo         | 10 ++++-----
 sysutils/lsof/patches/patch-ab | 50 ------------------------------------------
 sysutils/lsof/patches/patch-ac | 17 --------------
 4 files changed, 7 insertions(+), 76 deletions(-)
 delete mode 100644 sysutils/lsof/patches/patch-ab
 delete mode 100644 sysutils/lsof/patches/patch-ac

(limited to 'sysutils')

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index c4ead6c2d30..b05c4052857 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2005/05/16 03:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2005/05/17 04:45:08 atatat Exp $
 #
 
-DISTNAME=		lsof_4.74
-PKGNAME=		${DISTNAME:S/_/-/}
+DISTNAME=		lsof_4.75
+PKGNAME=		${DISTNAME:S/_/-/}.${OS_VERSION}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  \
 			ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 14affb30a4b..dbac0d349ab 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.54 2005/03/26 20:36:01 kristerw Exp $
+$NetBSD: distinfo,v 1.55 2005/05/17 04:45:08 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 (lsof_4.75.tar.bz2) = b5c8e05c81a6ddc53ac5d397bfd58c18be3d8f15
+RMD160 (lsof_4.75.tar.bz2) = dd5ccdafe1009a9e5c5b20294e0b8fddb6d8687b
+Size (lsof_4.75.tar.bz2) = 700801 bytes
 SHA1 (patch-aa) = 332eb1ac95d86023dde66d1b99b9335c8f54b81f
-SHA1 (patch-ab) = cb9b8e17ebee109a98e4ac8e131146d7475702a4
-SHA1 (patch-ac) = e75fbe948f364814589ec255ac40e6e680637eee
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
deleted file mode 100644
index 577a1bf4439..00000000000
--- a/sysutils/lsof/patches/patch-ab
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ab,v 1.35 2005/03/23 04:35:56 atatat Exp $
-
-Fix build on 3.0 branch and 3.99.x current.
-
---- Configure.orig	2005-01-17 08:24:32.000000000 -0500
-+++ Configure
-@@ -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
-@@ -2366,7 +2379,11 @@ return(0); }
-     # Test for legal NetBSD version.
- 
-     case $LSOF_VERS in	# {
--    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"
diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac
deleted file mode 100644
index a1c68ff8e96..00000000000
--- a/sysutils/lsof/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.23 2005/03/26 20:36:01 kristerw Exp $
-
---- dialects/darwin/get-hdr-loc.sh.orig	Sat Mar 26 21:23:20 2005
-+++ dialects/darwin/get-hdr-loc.sh	Sat Mar 26 21:24:29 2005
-@@ -50,11 +50,9 @@
-     echo "" 1>&2
-     echo "(See 00FAQ for download instructions.)" 1>&2
-     echo "" 1>&2
--    echo "Now you must specify the path to the place to which they were" 1>&2
--    echo "downloaded." 1>&2
--    echo "" 1>&2
-     echo "-------------------------------------------------------------" 1>&2
-   fi	# }
-+  exit 1
- 
-   END=0
-   while test $END = 0	# {
-- 
cgit v1.2.3