Update to lsof-4.33_W.

4 files changed, 15 insertions, 49 deletions

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index d937c180ee0..76a60fd22c7 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1998/05/03 22:37:18 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/11 16:25:31 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
-DISTNAME=		lsof_4.31_W
-PKGNAME=		lsof-4.31
+DISTNAME=		lsof_4.33_W
+PKGNAME=		lsof-4.33
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/  \
 			ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/  \
@@ -24,8 +24,6 @@ CONFIGURE_ARGS=		-n freebsd
 CONFIGURE_ARGS=		-n netbsd
 .endif
 
-MAKE_FLAGS=		UVM=${UVM}
-
 MAN1=			lsof.1
 
 SRCBALL_NAME=		${DISTNAME:S/_W$//}
diff --git a/sysutils/lsof/files/md5 b/sysutils/lsof/files/md5
index c5fdf31a10d..0d2203f2750 100644
--- a/sysutils/lsof/files/md5
+++ b/sysutils/lsof/files/md5
@@ -1 +1 @@
-MD5 (lsof_4.31_W.tar.gz) = 425f2709c032d69c52138a4b8cc6aae4
+MD5 (lsof_4.33_W.tar.gz) = cab0593c57700c4c590a79890d996dd9
diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa
index 7990d307610..3336bcf98e1 100644
--- a/sysutils/lsof/patches/patch-aa
+++ b/sysutils/lsof/patches/patch-aa
@@ -1,14 +1,11 @@
---- dialects/n+obsd/Makefile.orig	Tue Feb 17 01:51:59 1998
-+++ dialects/n+obsd/Makefile	Thu Apr  2 11:20:07 1998
-@@ -12,7 +12,11 @@
- L=/usr/include/local
- P=
- 
-+.if ${UVM} != ""
-+DEBUG=	-O -DUVM
-+.else
- DEBUG=	-O
-+.endif
- 
- CDEF=
- CDEFS=  ${CDEF} ${CFGF}
+--- Configure.orig	Fri May 22 20:58:12 1998
++++ Configure	Thu Jun 11 17:15:28 1998
+@@ -1527,7 +1527,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
+ 	then
+ 	  NETBSD_UVM="Y"
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
deleted file mode 100644
index 3e23befb9cd..00000000000
--- a/sysutils/lsof/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
---- dialects/n+obsd/dproc.c.orig	Fri Mar  6 14:24:46 1998
-+++ dialects/n+obsd/dproc.c	Thu Apr  2 10:25:22 1998
-@@ -37,6 +37,11 @@
- 
- #include "lsof.h"
- 
-+#if defined(UVM) /* this is an ugly hack, but <uvm/uvm.h> is not supposed */
-+		 /* to get included by userland programms                 */
-+#define UVM_ET_MAP              0x02    /* it is a vm_map */
-+#define UVM_ET_SUBMAP           0x04    /* it is a submap (MAP must be 1 too) */
-+#endif
- 
- _PROTOTYPE(static void enter_vn_text,(KA_T va, int *n));
- _PROTOTYPE(static void get_kernel_access,(void));
-@@ -365,8 +370,14 @@
- 		if (kread(ka, (char *)e, sizeof(vmme)))
- 		    return;
- 	    }
-+#if defined(UVM)	/* part 2 of the ugly UVM hack */
-+	    if ((e->etype & UVM_ET_MAP) != 0)
-+		continue;
-+#else
- 	    if (e->is_a_map || e->is_sub_map)
- 		continue;
-+#endif
-+
- 	/*
- 	 * Read the map entry's object and the object's shadow.
- 	 * Look for a PG_VNODE pager handle.