Update to 4.43_W

4 files changed, 20 insertions, 29 deletions

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 8facb4b2854..d266285ea0f 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 1999/05/05 17:40:36 bad Exp $
+# $NetBSD: Makefile,v 1.19 1999/06/02 16:14:53 christos Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
-DISTNAME=		lsof_4.42_W
-PKGNAME=		lsof-4.42
+DISTNAME=		lsof_4.43_W
+PKGNAME=		lsof-4.43
 WRKSRC=			${WRKDIR}/${SRCBALL_NAME}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/  \
diff --git a/sysutils/lsof/files/md5 b/sysutils/lsof/files/md5
index 40d064b2798..aa8325bc2a0 100644
--- a/sysutils/lsof/files/md5
+++ b/sysutils/lsof/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.12 1999/05/05 17:40:37 bad Exp $
+$NetBSD: md5,v 1.13 1999/06/02 16:14:53 christos Exp $
 
-MD5 (lsof_4.42_W.tar.gz) = 30b4bf27f46f397d7be5dd0bc1cf1753
+MD5 (lsof_4.43_W.tar.gz) = 4d5263b853c882a33f626be0a47c937d
diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa
index e0226bded2c..146a21dedf1 100644
--- a/sysutils/lsof/patches/patch-aa
+++ b/sysutils/lsof/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.8 1999/05/05 17:32:45 bad Exp $
+$NetBSD: patch-aa,v 1.9 1999/06/02 16:14:53 christos Exp $
 
---- Configure.orig	Sat Feb 27 16:40:33 1999
-+++ Configure	Wed May  5 18:46:07 1999
-@@ -1482,6 +1482,9 @@
-       1.3*)
+--- Configure.orig	Tue May 11 07:40:20 1999
++++ Configure	Mon May  3 11:53:20 1999
+@@ -1575,6 +1575,9 @@
+       1.4*)
  	LSOF_VERS="1030"
  	;;
 +      1.4*)
@@ -12,16 +12,7 @@ $NetBSD: patch-aa,v 1.8 1999/05/05 17:32:45 bad Exp $
        *)
  	echo Unknown NetBSD release: `uname -r`
  	echo Assuming NetBSD 1.0
-@@ -1493,7 +1496,7 @@
-     # Test for legal NetBSD version.
- 
-     case $LSOF_VERS in	# {
--    1000|1010|1020|1030)
-+    1000|1010|1020|1030|1040)
-       ;;
-     *)
-       echo "Unsupported NetBSD version: $LSOF_VERS"
-@@ -1575,7 +1578,13 @@
+@@ -1668,7 +1671,13 @@
  	if test $? -eq 0	# {
  	then
  	  NETBSD_UVM="Y"
@@ -34,9 +25,9 @@ $NetBSD: patch-aa,v 1.8 1999/05/05 17:32:45 bad Exp $
 +	  esac				# }
 +	fi		# }
        fi	# }
-     fi	# }
-     rm -rf dialects/n+obsd/uvm_include
-@@ -2921,7 +2930,7 @@
+       if test "X$NETBSD_UVM" = "X"	# {
+       then
+@@ -3037,7 +3046,7 @@
    then
      echo "AR=	$LSOF_AR" >> ${LSOF_LIB}/$LSOF_LIBMKF
    fi	# }
diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac
index 89923ff9a7b..e5a596ef115 100644
--- a/sysutils/lsof/patches/patch-ac
+++ b/sysutils/lsof/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 1999/05/20 10:32:37 kleink Exp $
+$NetBSD: patch-ac,v 1.3 1999/06/02 16:14:53 christos Exp $
 
---- dialects/n+obsd/dproc.c.orig	Tue Nov 24 02:11:24 1998
-+++ dialects/n+obsd/dproc.c	Thu May 20 10:45:27 1999
+--- dialects/n+obsd/dproc.c.orig	Sun May  9 15:56:13 1999
++++ dialects/n+obsd/dproc.c	Mon May  3 12:03:10 1999
 @@ -150,6 +150,9 @@
  gather_proc_info()
  {
@@ -10,9 +10,9 @@ $NetBSD: patch-ac,v 1.2 1999/05/20 10:32:37 kleink Exp $
 +	struct cwdinfo cwdi;
 +#endif
  	int i, nf;
- 	static int nofb = 0;
+ 	MALLOC_S nb;
  	static struct file **ofb = NULL;
-@@ -208,23 +211,53 @@
+@@ -215,23 +218,53 @@
  		(UID_ARG)uid, p->P_COMM, (int)pss, (int)sf);
  	    Plf = (struct lfile *)NULL;
  	    Kpa = (KA_T)p->P_ADDR;
@@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.2 1999/05/20 10:32:37 kleink Exp $
  		if (Lf->sf)
  		    link_lfile();
  	    }
-@@ -394,11 +427,11 @@
+@@ -422,11 +455,11 @@
  	int i, j;
  	KA_T ka;
  	int n = 0;