diff options
| author | atatat <atatat@pkgsrc.org> | 2002-09-13 16:55:14 +0000 |
|---|---|---|
| committer | atatat <atatat@pkgsrc.org> | 2002-09-13 16:55:14 +0000 |
| commit | c03973bbc080d2ea680b0395db8a4f85cd7eacd0 (patch) | |
| tree | cf3982a5a201eea3623562076dc59fa445f9b92a /sysutils | |
| parent | 451b0fa225a96d1892195bb542ab5cda39697c27 (diff) | |
| download | pkgsrc-c03973bbc080d2ea680b0395db8a4f85cd7eacd0.tar.gz | |
Clean up the fix for the missing bufq_state so that builds on older
current systems, on 1.6, and on previous releases should all work now.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/lsof/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/lsof/patches/patch-ab | 35 |
2 files changed, 24 insertions, 15 deletions
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index 0676b9a8c8f..a8697e4695c 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2002/09/13 15:53:09 tron Exp $ +$NetBSD: distinfo,v 1.20 2002/09/13 16:55:14 atatat Exp $ SHA1 (lsof_4.64.tar.gz) = eacd1d259d136b27f284928574529da0e35fe6b9 Size (lsof_4.64.tar.gz) = 942463 bytes SHA1 (patch-aa) = 1946122860ad68f1c5e07f6ae82a147eb51e01c5 -SHA1 (patch-ab) = 3a288b5f936df588c864fcda463d427abe80d279 +SHA1 (patch-ab) = 9b72f810ca0abe5894657ee8fe14d441b585fa95 diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab index 03f827ddcbb..527ec7652a1 100644 --- a/sysutils/lsof/patches/patch-ab +++ b/sysutils/lsof/patches/patch-ab @@ -1,19 +1,28 @@ -$NetBSD: patch-ab,v 1.14 2002/09/13 15:53:10 tron Exp $ +$NetBSD: patch-ab,v 1.15 2002/09/13 16:55:15 atatat Exp $ ---- dialects/n+obsd/dlsof.h.orig Mon Jun 17 03:44:15 2002 -+++ dialects/n+obsd/dlsof.h Thu Sep 12 21:08:10 2002 -@@ -46,6 +46,10 @@ - #include <string.h> - #include <unistd.h> +Make 4.64 build under 1.5 and handle the change to ufs/mfs/mfsnode.h +that involves struct bufq_state not being exposed to userland any +more. + +--- dialects/n+obsd/dlsof.h.orig Sun Jun 16 21:44:15 2002 ++++ dialects/n+obsd/dlsof.h +@@ -54,7 +54,15 @@ + #include <sys/mbuf.h> + # if defined(NETBSDV) ++# if __NetBSD_Version__>=106060000 +#define _KERNEL -+#include <sys/buf.h> -+#undef _KERNEL -+ - # if defined(HASGETBOOTFILE) - #include <util.h> - # endif /* defined(HASGETBOOTFILE) */ -@@ -209,9 +213,9 @@ ++struct buf; /* to satisfy a function prototype in buf.h */ ++# endif ++#include <sys/ucred.h> + #include <sys/buf.h> ++# if __NetBSD_Version__>=106060000 ++#undef _KERNEL ++# endif + # endif /* defined(NETBSDV) */ + + #define NFS +@@ -209,9 +216,9 @@ struct sockproto { # if defined(HASNULLFS) #define _KERNEL |