7 files changed, 34 insertions, 107 deletions
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 726d1eabe25..c2f27aa2050 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.24 1999/11/14 17:51:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.25 2000/02/19 03:58:23 wiz Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
-DISTNAME=		lsof_4.46_W
-PKGNAME=		lsof-4.46
+DISTNAME=		lsof_4.49B.n+obsd
+PKGNAME=		lsof-4.49.2
 WRKSRC=			${WRKDIR}/${SRCBALL_NAME}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/  \
+			ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/NEW/ \
 			ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/  \
 			ftp://ftp.auscert.org.au/pub/mirrors/vic.cc.purdue.edu/lsof/  \
 			ftp://ftp.web.ad.jp/pub/UNIX/tools/lsof/  \
@@ -30,19 +31,20 @@ MAKE_ENV+=		CPPFLAGS=
 .endif
 
 post-extract:
-	@(cd ${WRKDIR} ; \
-	EXPMD5=`${GREP} MD5 README.${SRCBALL_NAME} | ${SED} 's/^[ ]*//'` ; \
-	CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \
-	if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
-		${ECHO} "Expected and calculated MD5 signatures don't agree." ; \
-		${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
-		${FALSE} ; \
-	fi ; \
-	if [ "X${EXTRACT_USING_PAX}" = "X" ]; then \
-		${GTAR} -xf ${SRCBALL_NAME}.tar; \
-	else \
-		${PAX} -r < ${SRCBALL_NAME}.tar; \
-	fi)
+# commented out for the pre-release 4.49.2, which doesn't support it
+#	@(cd ${WRKDIR} ; \
+#	EXPMD5=`${GREP} MD5 README.${SRCBALL_NAME} | ${SED} 's/^[ ]*//'` ; \
+#	CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \
+#	if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
+#		${ECHO} "Expected and calculated MD5 signatures don't agree." ; \
+#		${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
+#		${FALSE} ; \
+#	fi ; \
+#	if [ "X${EXTRACT_USING_PAX}" = "X" ]; then \
+#		${GTAR} -xf ${SRCBALL_NAME}.tar; \
+#	else \
+#		${PAX} -r < ${SRCBALL_NAME}.tar; \
+#	fi)
 	@( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 )
 
 do-install:
diff --git a/sysutils/lsof/files/md5 b/sysutils/lsof/files/md5
index 50605d825d2..aba0ea8a348 100644
--- a/sysutils/lsof/files/md5
+++ b/sysutils/lsof/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.16 1999/11/14 17:51:25 frueauf Exp $
+$NetBSD: md5,v 1.17 2000/02/19 03:58:25 wiz Exp $
 
-MD5 (lsof_4.46_W.tar.gz) = f57bee13c84365ee99cc0bf9ee03534a
+MD5 (lsof_4.49B.n+obsd.tar.gz) = 03d88c3fda4b98f144b5e02715d19c53
diff --git a/sysutils/lsof/files/patch-sum b/sysutils/lsof/files/patch-sum
index 19b84b3a4ca..8bc30de501e 100644
--- a/sysutils/lsof/files/patch-sum
+++ b/sysutils/lsof/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:09 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/19 03:58:25 wiz Exp $
 
-MD5 (patch-aa) = 8c448eb7fd03b4aca221e545087c61f2
-MD5 (patch-ab) = 1f657b8c2435208dca3cd5602a38893f
-MD5 (patch-ac) = 1b1d95ffdc0b649ec33c93e504d6b405
+MD5 (patch-aa) = 8ffa59c6cd4a7dc301d1905fa192a8ef
diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa
index f96cf703391..fd4b0e61a94 100644
--- a/sysutils/lsof/patches/patch-aa
+++ b/sysutils/lsof/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.11 1999/07/07 18:13:56 agc Exp $
+$NetBSD: patch-aa,v 1.12 2000/02/19 03:58:25 wiz Exp $
 
-On Solaris, don't try to use ranlib...
-
---- Configure.orig	Tue May 11 07:40:20 1999
-+++ Configure	Mon May  3 11:53:20 1999
-@@ -3037,7 +3046,7 @@
-   then
-     echo "AR=	$LSOF_AR" >> ${LSOF_LIB}/$LSOF_LIBMKF
-   fi	# }
--  if test "X$LSOF_RANLIB" != "X"	# {
-+  if test "X$LSOF_TGT" = "Xsolaris" -o "X$LSOF_RANLIB" != "X"	# {
-   then
-     echo "RANLIB=	$LSOF_RANLIB" >> ${LSOF_LIB}/$LSOF_LIBMKF
-   fi	# }
+--- ./dialects/n+obsd/dlsof.h.orig	Tue Feb  1 15:31:27 2000
++++ ./dialects/n+obsd/dlsof.h	Sat Feb 19 04:13:09 2000
+@@ -76,7 +76,7 @@
+ #include <netinet/ip.h>
+ 
+ # if	defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6)
+-#include <netinet6/ip6.h>
++#include <netinet/ip6.h>
+ #include <netinet6/in6_pcb.h>
+ # endif	/* defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6) */
+ 
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
deleted file mode 100644
index fc40c262097..00000000000
--- a/sysutils/lsof/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.7 1999/05/05 17:40:37 bad Exp $
-
---- dialects/n+obsd/dlsof.h.orig	Mon Mar 29 14:15:29 1999
-+++ dialects/n+obsd/dlsof.h	Wed May  5 19:20:17 1999
-@@ -176,16 +176,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>
diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac
deleted file mode 100644
index 37b251ec8b8..00000000000
--- a/sysutils/lsof/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1999/06/25 02:41:15 hubertf Exp $
-
---- dialects/n+obsd/dproc.c.orig	Tue Jun 22 23:04:06 1999
-+++ dialects/n+obsd/dproc.c	Fri Jun 25 04:13:10 1999
-@@ -150,6 +150,9 @@
- gather_proc_info()
- {
- 	struct filedesc fd;
-+#if __NetBSD_Version__ >= 104010000
-+	struct cwdinfo cwdi;
-+#endif
- 	int i, nf;
- 	MALLOC_S nb;
- 	static struct file **ofb = NULL;
-@@ -231,6 +234,20 @@
- 		(UID_ARG)uid, p->P_COMM, (int)pss, (int)sf);
- 	    Plf = (struct lfile *)NULL;
- 	    Kpa = (KA_T)p->P_ADDR;
-+#if __NetBSD_Version__ >= 104010000
-+       /*
-+        * Save current working directory framework information.
-+        */
-+           (void)memset(&cwdi, 0, sizeof(cwdi));
-+           if (p->kp_proc.p_cwdi) {
-+               if (kvm_read(Kd, (u_long)p->kp_proc.p_cwdi, &cwdi, sizeof(cwdi))
-+                   != sizeof(cwdi)) {
-+                       fprintf(stderr, "%s: cannot read cwdinfo: %s\n", Pn,
-+                           kvm_geterr(Kd));
-+                       Exit(1);
-+               }
-+           }
-+#endif
- 	/*
- 	 * Save current working directory information.
- 	 */
diff --git a/sysutils/lsof/pkg/DESCR b/sysutils/lsof/pkg/DESCR
index a046d9198e6..a81b7178b45 100644
--- a/sysutils/lsof/pkg/DESCR
+++ b/sysutils/lsof/pkg/DESCR
@@ -3,5 +3,3 @@ running processes.  An open file may be a regular file, a directory, a block
 special file, a character special file, an executing text reference, a
 library, a stream or a network file (Internet socket, NFS file or Unix domain
 socket).
-
--- David	(obrien@cs.ucdavis.edu)