CVS commit: pkgsrc/net/kismet

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Feb 17 17:10:06 UTC 2017

Modified Files:
        pkgsrc/net/kismet: distinfo options.mk
Added Files:
        pkgsrc/net/kismet/patches: patch-kismet__wrapper.cc

Log Message:
Add missing include. Use old ImageMagick for the gps option.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/kismet/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/kismet/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/kismet/patches/patch-kismet__wrapper.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/kismet/distinfo
diff -u pkgsrc/net/kismet/distinfo:1.10 pkgsrc/net/kismet/distinfo:1.11
--- pkgsrc/net/kismet/distinfo:1.10     Wed Nov  4 00:35:07 2015
+++ pkgsrc/net/kismet/distinfo  Fri Feb 17 17:10:05 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 00:35:07 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/02/17 17:10:05 joerg Exp $
 
 SHA1 (kismet-2008-05-R1.tar.gz) = 8355aeb0374a39549dfdc0c73160125eadd7c6e2
 RMD160 (kismet-2008-05-R1.tar.gz) = 5613207b45f85fa72d146009434df984f721ccdc
@@ -12,5 +12,6 @@ SHA1 (patch-ag) = cb1e1eaf07ae40128fbe97
 SHA1 (patch-ah) = 67dfa5a2aedb1b651671863177baace4a65c6f26
 SHA1 (patch-gpsdump.cc) = 2ef05923053bd887249427db286cbb5c485018f5
 SHA1 (patch-kismet__server.cc) = 611f22eb7746d7d210f01cc9ceb9bc28e998a866
+SHA1 (patch-kismet__wrapper.cc) = 4be9a35504706b33fbcc63f444310a8140a43627
 SHA1 (patch-macaddr.h) = c5841ecd5c9ddb2b008c88e78665740a0e23195b
 SHA1 (patch-panelfront.cc) = 5a09a92598c8ffb7851b74fe87577a997f69e4f6

Index: pkgsrc/net/kismet/options.mk
diff -u pkgsrc/net/kismet/options.mk:1.2 pkgsrc/net/kismet/options.mk:1.3
--- pkgsrc/net/kismet/options.mk:1.2    Mon Feb 19 18:22:58 2007
+++ pkgsrc/net/kismet/options.mk        Fri Feb 17 17:10:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/02/19 18:22:58 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2017/02/17 17:10:05 joerg Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kismet
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS=        gps
 PLIST_SRC+=            PLIST.gps
 DEPENDS+=              wget>=1.9.1:../../net/wget
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../graphics/ImageMagick6/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .endif

Added files:

Index: pkgsrc/net/kismet/patches/patch-kismet__wrapper.cc
diff -u /dev/null pkgsrc/net/kismet/patches/patch-kismet__wrapper.cc:1.1
--- /dev/null   Fri Feb 17 17:10:06 2017
+++ pkgsrc/net/kismet/patches/patch-kismet__wrapper.cc  Fri Feb 17 17:10:05 2017
@@ -0,0 +1,12 @@
+$NetBSD: patch-kismet__wrapper.cc,v 1.1 2017/02/17 17:10:05 joerg Exp $
+
+--- kismet_wrapper.cc.orig     2017-02-17 13:54:47.534806189 +0000
++++ kismet_wrapper.cc
+@@ -24,6 +24,7 @@
+ #include <vector>
+ #include <errno.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+