diff options
author | wiz <wiz@pkgsrc.org> | 2006-03-01 22:49:07 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2006-03-01 22:49:07 +0000 |
commit | 03dd4dd15a5d734bd46facc2ea29d0a88796b028 (patch) | |
tree | b021ece78e431d81e0fd1d84c88aa98842206692 | |
parent | 685774b08cf085155ea80e144b4598def6cb96e0 (diff) | |
download | pkgsrc-03dd4dd15a5d734bd46facc2ea29d0a88796b028.tar.gz |
Fix build on NetBSD statvfs systems.
-rw-r--r-- | net/tcpdpriv/distinfo | 6 | ||||
-rw-r--r-- | net/tcpdpriv/patches/patch-aa | 17 | ||||
-rw-r--r-- | net/tcpdpriv/patches/patch-ab | 14 |
3 files changed, 28 insertions, 9 deletions
diff --git a/net/tcpdpriv/distinfo b/net/tcpdpriv/distinfo index 7a289e7b53a..4fae03e9a70 100644 --- a/net/tcpdpriv/distinfo +++ b/net/tcpdpriv/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2006/01/25 17:22:54 joerg Exp $ +$NetBSD: distinfo,v 1.5 2006/03/01 22:49:07 wiz Exp $ SHA1 (tcpd-tools-0.8.tar.gz) = fe2abe15bbf9062833af9bec3745c751a8aa06df RMD160 (tcpd-tools-0.8.tar.gz) = 876842cbb37ca65d4b955718abd5ef5c14810dee Size (tcpd-tools-0.8.tar.gz) = 468856 bytes -SHA1 (patch-aa) = be90f2b82ef4512eb85be99b8055843964cba24a -SHA1 (patch-ab) = 6ca6c40f9f1e6c8c1ac00a41e49f2d5df59953f0 +SHA1 (patch-aa) = 65ce9d5e316db069873561712ac238cd3af5e689 +SHA1 (patch-ab) = 2c939882835b80d1fb11aa3bedc50eb80cefdf2e diff --git a/net/tcpdpriv/patches/patch-aa b/net/tcpdpriv/patches/patch-aa index 967a1487486..a502c1ae145 100644 --- a/net/tcpdpriv/patches/patch-aa +++ b/net/tcpdpriv/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2006/01/25 17:22:54 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2006/03/01 22:49:07 wiz Exp $ --- tcpdpriv.c.orig 2000-04-18 07:59:19.000000000 +0000 +++ tcpdpriv.c @@ -11,7 +11,18 @@ $NetBSD: patch-aa,v 1.2 2006/01/25 17:22:54 joerg Exp $ #include <net/slcompress.h> #if !defined(osf1) #include <net/slip.h> -@@ -2759,7 +2759,7 @@ usage(char *cmd) +@@ -111,6 +111,10 @@ + + #include <pcap.h> + ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ ++#define statfs statvfs ++#endif ++ + /* + * deal with systems in which bpf_int32 and bpf_u_int32 are not defined + */ +@@ -2759,7 +2763,7 @@ usage(char *cmd) int main(int argc, char *argv[], char *envp[]) { @@ -20,7 +31,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/25 17:22:54 joerg Exp $ char *copy_argv(register char **argv); char *read_infile(char *fname); char *rfile, *wfile; -@@ -2903,7 +2903,7 @@ main(int argc, char *argv[], char *envp[ +@@ -2903,7 +2907,7 @@ main(int argc, char *argv[], char *envp[ /* dump? */ if (dflag) { diff --git a/net/tcpdpriv/patches/patch-ab b/net/tcpdpriv/patches/patch-ab index e8702410a38..fb4b1a450a4 100644 --- a/net/tcpdpriv/patches/patch-ab +++ b/net/tcpdpriv/patches/patch-ab @@ -1,8 +1,16 @@ -$NetBSD: patch-ab,v 1.1 2006/01/25 17:22:54 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2006/03/01 22:49:07 wiz Exp $ ---- tcpdutil.c.orig 2006-01-25 17:16:26.000000000 +0000 +--- tcpdutil.c.orig 2000-04-18 08:08:34.000000000 +0000 +++ tcpdutil.c -@@ -141,7 +141,7 @@ read_infile(char *fname) +@@ -30,6 +30,7 @@ + #include <unistd.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <fcntl.h> + + #include <pcap.h> +@@ -141,7 +142,7 @@ read_infile(char *fname) void |