diff options
| author | obache <obache> | 2009-01-13 14:08:07 +0000 |
|---|---|---|
| committer | obache <obache> | 2009-01-13 14:08:07 +0000 |
| commit | 92490ac9c645fa3bb01a1d9bb5e6b5000f3b897c (patch) | |
| tree | 1f7c18ff444ef40ae1137423f5d1c4f0f0501c62 /net | |
| parent | 6671078433c41194cc5e880d7d60bb1bba3f97a2 (diff) | |
| download | pkgsrc-92490ac9c645fa3bb01a1d9bb5e6b5000f3b897c.tar.gz | |
Fixes build failure on NetBSD-4 with pkgsrc libpcap, reported in PR 40380.
Diffstat (limited to 'net')
| -rw-r--r-- | net/kismet/Makefile | 6 | ||||
| -rw-r--r-- | net/kismet/distinfo | 4 | ||||
| -rw-r--r-- | net/kismet/patches/patch-ag | 21 |
3 files changed, 24 insertions, 7 deletions
diff --git a/net/kismet/Makefile b/net/kismet/Makefile index eec6a3fa090..75faa93e380 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2008/10/28 11:06:38 adam Exp $ +# $NetBSD: Makefile,v 1.9 2009/01/13 14:08:07 obache Exp $ DISTNAME= kismet-2008-05-R1 PKGNAME= kismet-2008.05.01 @@ -62,6 +62,10 @@ post-install: .include "options.mk" +.if exists(/usr/include/net/bpf.h) +CFLAGS+= -DHAVE_NET_BPF_H +.endif + .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" diff --git a/net/kismet/distinfo b/net/kismet/distinfo index a1f1d68e1ab..78616d8b57f 100644 --- a/net/kismet/distinfo +++ b/net/kismet/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2008/10/28 11:06:38 adam Exp $ +$NetBSD: distinfo,v 1.6 2009/01/13 14:08:07 obache Exp $ SHA1 (kismet-2008-05-R1.tar.gz) = 8355aeb0374a39549dfdc0c73160125eadd7c6e2 RMD160 (kismet-2008-05-R1.tar.gz) = 5613207b45f85fa72d146009434df984f721ccdc @@ -7,5 +7,5 @@ SHA1 (patch-aa) = 84bd0905299e75eb885a299c65752825e85b3234 SHA1 (patch-ac) = 5e267a8915872f6c1d5d58bd0a6c15223292c4ca SHA1 (patch-ae) = eaaf5c5498a38d7b2a6121defdf879622f430003 SHA1 (patch-af) = e4e176998e78a657178b3e14e614adf27b517eb6 -SHA1 (patch-ag) = 2fbf1fbf9d43cd74599c86e178c810bf93b6e04c +SHA1 (patch-ag) = cb1e1eaf07ae40128fbe9760c95cfdecc200d22c SHA1 (patch-ah) = 67dfa5a2aedb1b651671863177baace4a65c6f26 diff --git a/net/kismet/patches/patch-ag b/net/kismet/patches/patch-ag index 29f6a4379c7..f20dfb41ae3 100644 --- a/net/kismet/patches/patch-ag +++ b/net/kismet/patches/patch-ag @@ -1,8 +1,21 @@ -$NetBSD: patch-ag,v 1.2 2008/10/28 11:06:38 adam Exp $ +$NetBSD: patch-ag,v 1.3 2009/01/13 14:08:07 obache Exp $ ---- pcapsource.h.orig 2008-05-19 11:51:54.000000000 +0200 +--- pcapsource.h.orig 2008-05-19 09:51:54.000000000 +0000 +++ pcapsource.h -@@ -395,7 +395,7 @@ public: +@@ -34,8 +34,11 @@ + + extern "C" { + #ifndef HAVE_PCAPPCAP_H ++#ifdef HAVE_NET_BPF_H ++#include <net/bpf.h> ++#define PCAP_DONT_INCLUDE_PCAP_BPF_H ++#endif + #include <pcap.h> +-//#include <net/bpf.h> + #else + #include <pcap/pcap.h> + #include <pcap/net/bpf.h> +@@ -395,7 +398,7 @@ public: }; #endif @@ -11,7 +24,7 @@ $NetBSD: patch-ag,v 1.2 2008/10/28 11:06:38 adam Exp $ class RadiotapBSD { public: RadiotapBSD(const char *ifname); -@@ -584,7 +584,7 @@ int chancontrol_openbsd_prism2(const cha +@@ -584,7 +587,7 @@ int chancontrol_openbsd_prism2(const cha void *in_ext); #endif |