[pkgsrc/trunk]: pkgsrc/sysutils/lsof Fix build on NetBSD 3.1_STABLE, tested o...

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b7b9de642e6
branches:  trunk
changeset: 393166:4b7b9de642e6
user:      seb <seb%pkgsrc.org@localhost>
date:      Sun May 17 20:40:46 2009 +0000

description:
Fix build on NetBSD 3.1_STABLE, tested on i386 and sparc64.

Also built/tested ok on NetBSD/i386 4.0.1 and 5.0.

diffstat:

 sysutils/lsof/distinfo         |   4 ++--
 sysutils/lsof/patches/patch-af |  26 ++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r e6caea088f24 -r 4b7b9de642e6 sysutils/lsof/distinfo
--- a/sysutils/lsof/distinfo    Sun May 17 20:10:29 2009 +0000
+++ b/sysutils/lsof/distinfo    Sun May 17 20:40:46 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2009/05/01 12:56:50 apb Exp $
+$NetBSD: distinfo,v 1.76 2009/05/17 20:40:46 seb Exp $
 
 SHA1 (lsof_4.78.tar.bz2) = 0379fc9f38a931ce19e8386e662314d96fc2a099
 RMD160 (lsof_4.78.tar.bz2) = 50d71e500f1109cda717b73ce209c0e100a6dbe9
@@ -8,6 +8,6 @@
 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
 SHA1 (patch-ad) = 4bd73dea4770c7f5a43be0d096c26e7d6728dd2c
 SHA1 (patch-ae) = 1d8c1c3baf9575631c23d3ced7b12fab1df95cd6
-SHA1 (patch-af) = 7481b1d10b12b7c6216858db30b25a3b985e4d3d
+SHA1 (patch-af) = b52c15a507960ecf33a61a3cbd608a92ebac1188
 SHA1 (patch-ag) = 2f14b7954976e3b3d43034e13bf31d14ca65e4e3
 SHA1 (patch-ah) = 0ed8ca9cc34d85dc01b135e70077c922d26d8831
diff -r e6caea088f24 -r 4b7b9de642e6 sysutils/lsof/patches/patch-af
--- a/sysutils/lsof/patches/patch-af    Sun May 17 20:10:29 2009 +0000
+++ b/sysutils/lsof/patches/patch-af    Sun May 17 20:40:46 2009 +0000
@@ -1,7 +1,29 @@
-$NetBSD: patch-af,v 1.13 2007/12/17 11:13:41 tron Exp $
+$NetBSD: patch-af,v 1.14 2009/05/17 20:40:46 seb Exp $
 
---- dialects/n+obsd/dlsof.h.orig       2006-03-28 23:54:15.000000000 +0200
+--- dialects/n+obsd/dlsof.h.orig       2006-03-28 21:54:15.000000000 +0000
 +++ dialects/n+obsd/dlsof.h
+@@ -95,6 +95,10 @@ struct uio; /* dummy for function protot
+ # endif       /* (defined(OPENBSDV) && OPENBSDV<3030)
+          || (defined(NETBSDV) && __NetBSD_Version__>=106060000) */
+ 
++# if  defined(NETBSDV) && NETBSDV>=1003000
++#define       sockproto       NETBSD_sockproto
++# endif       /* defined(NETBSDV) && NETBSDV>=1003000 */
++
+ #include <sys/mount.h>
+ 
+ # if  (defined(OPENBSDV) && OPENBSDV>=3030) \
+@@ -106,10 +110,6 @@ struct uio;       /* dummy for function protot
+ #include <rpc/types.h>
+ #include <sys/protosw.h>
+ 
+-# if  defined(NETBSDV) && NETBSDV>=1003000
+-#define       sockproto       NETBSD_sockproto
+-# endif       /* defined(NETBSDV) && NETBSDV>=1003000 */
+-
+ #include <sys/socket.h>
+ 
+ # if  defined(HASMSDOSFS)
 @@ -161,6 +161,7 @@ struct nameidata;  /* to satisfy a functi
  #include <sys/socketvar.h>
  #include <sys/un.h>