Update to lsof_4.41_W

4 files changed, 64 insertions, 32 deletions

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 010bd1572e2..ac554c104b6 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 1999/02/18 23:09:45 frueauf Exp $
+# $NetBSD: Makefile,v 1.14 1999/03/28 17:29:53 christos Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
-DISTNAME=		lsof_4.40_W
-PKGNAME=		lsof-4.40
+DISTNAME=		lsof_4.41_W
+PKGNAME=		lsof-4.41
 WRKSRC=			${WRKDIR}/${SRCBALL_NAME}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/  \
@@ -12,14 +12,9 @@ MASTER_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/  \
 			ftp://ftp.web.ad.jp/pub/UNIX/tools/lsof/  \
 			ftp://ftp.sunet.se/pub/unix/admin/lsof/
 
-PATCH_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/patches/4.40/
-PATCHFILES=		arg.c.patch
-
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www-rcd.cc.purdue.edu/~abe/
 
-DIST_SUBDIR=		lsof
-
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 OPSYS!=			uname -s
diff --git a/sysutils/lsof/files/md5 b/sysutils/lsof/files/md5
index 80580355f49..2cb09230240 100644
--- a/sysutils/lsof/files/md5
+++ b/sysutils/lsof/files/md5
@@ -1,4 +1,5 @@
-$NetBSD: md5,v 1.9 1999/02/18 23:09:46 frueauf Exp $
+$NetBSD: md5,v 1.10 1999/03/28 17:29:53 christos Exp $
 
 MD5 (lsof/lsof_4.40_W.tar.gz) = 01cc0f15f47481fa7e247486a730f5ff
 MD5 (lsof/arg.c.patch) = 83fc82fe3c9917418934b964854b4590
+MD5 (lsof_4.41_W.tar.gz) = 4b57c6504bf1397fb64a21d5ff5e887d
diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa
index 593ca8a41d1..2d98b160a15 100644
--- a/sysutils/lsof/patches/patch-aa
+++ b/sysutils/lsof/patches/patch-aa
@@ -1,13 +1,19 @@
-$NetBSD: patch-aa,v 1.5 1999/02/17 05:34:33 erh Exp $
+$NetBSD: patch-aa,v 1.6 1999/03/28 17:29:53 christos Exp $
 
---- Configure.orig	Tue Sep 15 02:56:33 1998
-+++ Configure	Thu Sep 17 15:47:27 1998
-@@ -1463,7 +1463,7 @@
-     then
-       if test -r /etc/mk.conf	# {
-       then
--        grep -q "^UVM[ 	]*=" /etc/mk.conf
-+        grep -q "^UVM[ 	]*[\?|\+]*=" /etc/mk.conf
-         if test $? -eq 0	# {
+--- Configure.orig	Sat Feb 27 10:40:33 1999
++++ Configure	Sun Mar 28 11:53:00 1999
+@@ -1575,7 +1575,13 @@
+ 	if test $? -eq 0	# {
  	then
  	  NETBSD_UVM="Y"
+-	fi	# }
++	else
++	  NETBSD_VM_FAULT=`nm /netbsd | grep 'vm_fault$' | cut -d " " -f 3`
++	  case $NETBSD_VM_FAULT in	# {
++	  *uvm_fault)
++	    NETBSD_UVM="Y";;
++	  esac				# }
++	fi		# }
+       fi	# }
+     fi	# }
+     rm -rf dialects/n+obsd/uvm_include
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
index 315e1c50163..50b847d995e 100644
--- a/sysutils/lsof/patches/patch-ab
+++ b/sysutils/lsof/patches/patch-ab
@@ -1,14 +1,44 @@
-$NetBSD: patch-ab,v 1.5 1999/02/18 23:09:46 frueauf Exp $
+$NetBSD: patch-ab,v 1.6 1999/03/28 17:29:53 christos Exp $
 
---- dialects/n+obsd/dlsof.h-orig	Fri May 22 14:18:33 1998
-+++ dialects/n+obsd/dlsof.h	Thu Feb 18 23:59:27 1999
-@@ -52,7 +52,9 @@
- #include <sys/mount.h>
- #include <rpc/types.h>
- #include <sys/protosw.h>
-+#define _KERNEL
- #include <sys/socket.h>
-+#undef _KERNEL
- #include <sys/socketvar.h>
- #include <sys/un.h>
- #include <sys/unpcb.h>
+--- dialects/n+obsd/dlsof.h.orig	Sat Feb 27 15:10:54 1999
++++ dialects/n+obsd/dlsof.h	Sun Mar 28 12:17:22 1999
+@@ -141,9 +141,6 @@
+ #include <nfs/nfsnode.h>
+ #include <sys/proc.h>
+ #include <kvm.h>
+-#undef	TRUE
+-#undef	FALSE
+-#include <sys/sysctl.h>
+ #define	P_ADDR		kp_eproc.e_paddr
+ #define	P_COMM		kp_proc.p_comm
+ #define	P_FD		kp_proc.p_fd
+@@ -178,16 +175,28 @@
+ #undef	KERNEL
+ #undef	_KERNEL
+ 
++#include <vm/vm.h>
++
+ # if	defined(UVM)
++#  
++# ifndef FALSE
+ #define	FALSE	0
+ #define	TRUE	1
++# endif
+ #include <uvm/uvm.h>
+ # endif	/* defined(UVM) */
+ 
+-#include <vm/vm.h>
++# ifndef FALSE
++#define	FALSE	0
++#define TRUE	1
++# endif
+ #include <vm/vm_map.h>
+ #include <vm/vm_object.h>
+ #include <vm/vm_pager.h>
++
++#undef	TRUE
++#undef	FALSE
++#include <sys/sysctl.h>
+ 
+ # if	defined(OPENBSDV)
+ #include <sys/pipe.h>