upgrade to 4.78

4 files changed, 35 insertions, 33 deletions

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 05e830c8057..6c2cf412787 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2007/03/18 12:19:49 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2007/05/06 21:41:30 christos Exp $
 #
 
-DISTNAME=		lsof_4.77
+DISTNAME=		lsof_4.78
 PKGNAME=		${DISTNAME:S/_/-/}.${OS_VERSION}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  \
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index ca8cb5714db..f9ed19080b5 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.64 2007/03/14 11:36:25 markd Exp $
+$NetBSD: distinfo,v 1.65 2007/05/06 21:41:30 christos Exp $
 
-SHA1 (lsof_4.77.tar.bz2) = 603c35a7ade01edf5efcea45abe4b5857aa66a58
-RMD160 (lsof_4.77.tar.bz2) = e71ecec2e3281197846658b5ac774ae80b59de3d
-Size (lsof_4.77.tar.bz2) = 708416 bytes
+SHA1 (lsof_4.78.tar.bz2) = 0379fc9f38a931ce19e8386e662314d96fc2a099
+RMD160 (lsof_4.78.tar.bz2) = 50d71e500f1109cda717b73ce209c0e100a6dbe9
+Size (lsof_4.78.tar.bz2) = 756729 bytes
 SHA1 (patch-aa) = 332eb1ac95d86023dde66d1b99b9335c8f54b81f
 SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
-SHA1 (patch-ad) = e543d447ea3946f0f7b856e20420cda89e31d14b
+SHA1 (patch-ad) = bbdd2c4c997233f7743a0c99ffcc6ce29679a8a9
 SHA1 (patch-ae) = ba3804e89101fb504edd33983f35904559a63dbf
-SHA1 (patch-af) = 5ea8f1f34ded91a0553c9a8faef5ce87eeebdcf3
diff --git a/sysutils/lsof/patches/patch-ad b/sysutils/lsof/patches/patch-ad
index 288c77b520c..066209feeb1 100644
--- a/sysutils/lsof/patches/patch-ad
+++ b/sysutils/lsof/patches/patch-ad
@@ -1,19 +1,18 @@
-$NetBSD: patch-ad,v 1.11 2006/06/04 21:00:54 christos Exp $
+$NetBSD: patch-ad,v 1.12 2007/05/06 21:41:30 christos Exp $
 
---- dialects/n+obsd/dnode.c.orig	2005-08-08 15:53:32.000000000 -0400
-+++ dialects/n+obsd/dnode.c	2006-06-04 16:57:22.000000000 -0400
-@@ -38,6 +38,10 @@
+--- dialects/n+obsd/dnode.c.orig	2007-04-24 12:22:06.000000000 -0400
++++ dialects/n+obsd/dnode.c	2007-05-06 16:43:51.000000000 -0400
+@@ -38,6 +38,9 @@
  
  #include "lsof.h"
  
 +#if __NetBSD_Version__ > 399001800
 +#define NOLOCKF
 +#endif
-+
  
- #if	defined(HASFDESCFS) && HASFDESCFS==1
- _PROTOTYPE(static int lkup_dev_tty,(dev_t *dr, INODETYPE *ir));
-@@ -183,7 +187,9 @@
+ #if	defined(HAS_DINODE_U)
+ #define	DINODE_U	dinode_u
+@@ -194,7 +197,9 @@
  	unsigned char ns;
  	unsigned char rdevs;
  	char *ep, *ty;
@@ -23,7 +22,7 @@ $NetBSD: patch-ad,v 1.11 2006/06/04 21:00:54 christos Exp $
  	struct inode i;
  	struct mfsnode m;
  	struct nfsnode n;
-@@ -608,6 +614,7 @@
+@@ -619,6 +624,7 @@
  
  	    }
  
@@ -31,7 +30,7 @@ $NetBSD: patch-ad,v 1.11 2006/06/04 21:00:54 christos Exp $
  	    if ((lff = i.i_lockf)) {
  
  	    /*
-@@ -656,6 +663,7 @@
+@@ -667,6 +673,7 @@
  		    break;
  		} while ((lfp = lf.lf_next) && lfp != lff);
  	    }
diff --git a/sysutils/lsof/patches/patch-af b/sysutils/lsof/patches/patch-af
index 3f24518e0da..61c56008e6c 100644
--- a/sysutils/lsof/patches/patch-af
+++ b/sysutils/lsof/patches/patch-af
@@ -1,16 +1,20 @@
-$NetBSD: patch-af,v 1.6 2007/03/14 11:36:26 markd Exp $
+$NetBSD: patch-af,v 1.7 2007/05/06 21:41:30 christos Exp $
 
-Official lsof patch to fix build with newer Solaris 10s.
-
-*** /tmp/T0dLaqXT	Tue Jul 18 23:11:15 2006
---- dialects/sun/machine.h	Mon Jul 10 19:59:17 2006
-***************
-*** 76,81 ****
---- 76,82 ----
-  
-  # if	solaris>=80000
-  #include <sys/wait.h>
-+ #include <sys/types32.h>
-  #define	_KERNEL	1
-  #include <netinet/in.h>
-  #undef	_KERNEL
+--- dialects/n+obsd/dlsof.h.orig	2006-03-28 16:54:15.000000000 -0500
++++ dialects/n+obsd/dlsof.h	2007-05-06 17:37:00.000000000 -0400
+@@ -161,6 +161,7 @@
+ #include <sys/socketvar.h>
+ #include <sys/un.h>
+ #include <sys/unpcb.h>
++#include <net/route.h>
+ #include <netinet/in.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+@@ -170,7 +171,6 @@
+ #include <netinet6/in6_pcb.h>
+ # endif	/* defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6) */
+ 
+-#include <net/route.h>
+ #include <netinet/in_pcb.h>
+ #include <netinet/ip_var.h>
+ #include <netinet/tcp.h>