Re: CVS commit: wip/kismet

[Joerg Sonnenberger <joerg%britannica.bec.de@localhost>]

On Mon, Oct 03, 2005 at 08:53:53AM -0700, pancake ;) wrote:
> TODO: does it works on NetBSD ?
> -------------------------------

Can you test the attached diff? It runs at least on NetBSD :-)
Using the system or pkgsrc libpcap makes IMO a lot more sense.

Joerg

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/kismet/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile    3 Oct 2005 15:53:38 -0000       1.1.1.1
+++ Makefile    3 Oct 2005 16:57:14 -0000
@@ -16,12 +16,14 @@
 USE_LANGUAGES+=                c c++
 # On Debian I had to `ln -s /usr/lib/libstdc++.so.6 /usr/liblibstc++.so
 
+CONFIGURE_ARGS+=       --enable-syspcap
+
 pre-build:
        cd ${WRKSRC} && ${GMAKE} dep
 
-ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* OpenBSD-*-*
-# NetBSD ?
+ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* OpenBSD-*-* NetBSD-*-*
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/kismet/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    3 Oct 2005 15:53:38 -0000       1.1.1.1
+++ distinfo    3 Oct 2005 16:57:14 -0000
@@ -3,3 +3,5 @@
 SHA1 (kismet-2005-08-R1.tar.gz) = 802a019b4d2796b1a6fb58c812ff788a238bd79c
 RMD160 (kismet-2005-08-R1.tar.gz) = 1ee1b376d70821e7a4ccc5197ca299c0ebd6f250
 Size (kismet-2005-08-R1.tar.gz) = 986388 bytes
+SHA1 (patch-aa) = a9bfc8bce2dd85db2c6f4eb09b47968fcf3f31c8
+SHA1 (patch-ab) = 1c98cfb0c16e27095f5778db97984a57ddb03335
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-aa    3 Oct 2005 16:57:14 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- pcapsource.cc.orig 2005-10-03 18:24:32.000000000 +0200
++++ pcapsource.cc
+@@ -44,7 +44,11 @@ typedef unsigned long u64;
+ #include <net/if_media.h>
+ #include <netinet/in.h>
+ #include <netinet/if_ether.h>
++#if defined(SYS_NETBSD)
++#include <dev/ic/wi_ieee.h>
++#else
+ #include <dev/ic/if_wi_ieee.h>
++#endif
+ 
+ #ifdef HAVE_RADIOTAP
+ #include <net80211/ieee80211.h>
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab    3 Oct 2005 16:57:14 -0000
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- configure.orig     2005-10-03 18:40:48.000000000 +0200
++++ configure
+@@ -6941,6 +6941,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++          #include <sys/param.h>
+           #include <stdio.h>
+           #include <sys/socket.h>
+           #include <net/if.h>