pkg/44333: digger compilation fix on DragonFlyBSD

[zakne0ne%gmail.com@localhost]

>Number:         44333
>Category:       pkg
>Synopsis:       digger compilation fix on DragonFlyBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 06 15:35:00 +0000 2011
>Originator:     Ilia
>Release:        DragonFly 2.9.1
>Organization:
>Environment:
DragonFly 2.9-DEVELOPMENT DragonFly v2.9.1.370.g78775c-DEVELOPMENT #0: Sun Jan 
2 12:34:32 2011    root@:/usr/obj/usr/src/sys/GENERIC i386
>Description:
GNU make not found; failing back to regular (BSD?) make.
cc -O2 -I/usr/pkg/include -DUSE_BPF=\"net/bpf.h\" -o p0f p0f.c p0f-query.c 
crc32.c -lpcap
In file included from p0f.c:40:
/usr/include/net/bpf.h:83: error: redefinition of 'struct bpf_program'
/usr/include/net/bpf.h:107: error: redefinition of 'struct bpf_version'
In file included from p0f.c:40:
/usr/include/net/bpf.h:222: error: redefinition of 'struct bpf_insn'
*** Error code 1

>How-To-Repeat:

>Fix:
--- distb       2011-01-06 00:12:16 -0600
+++ distinfo    2011-01-06 00:13:29 -0600
@@ -4,4 +4,5 @@
 RMD160 (p0f-2.0.8.tgz) = 87d5b30d2d5e156b9fdcb026160155f413ce13d3
 Size (p0f-2.0.8.tgz) = 136877 bytes
 SHA1 (patch-aa) = f55e4b15edf6c1de1a799d09a2930f1fb3ece56b
+SHA1 (patch-ab) = 4415db6ebe281f9b00646305787c18740c076a84
 SHA1 (patch-ad) = 378d9480c88d9a447684323c4a59f3c2f6f10d74


$NetBSD$

--- p0f.c.orig  2011-01-06 06:06:21 +0000
+++ p0f.c
@@ -36,12 +36,7 @@
 #include <pcap.h>
 #include <signal.h>
 
-#ifdef USE_BPF
-#include USE_BPF
-#else
 #include <pcap-bpf.h>
-#endif /* ^USE_BPF */
-
 #include <time.h>
 #include <ctype.h>