Changes 2008.05.01:

* Bug fixes and improvements

10 files changed, 88 insertions, 173 deletions

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 8cbb1ca6553..eec6a3fa090 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/07/04 20:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/10/28 11:06:38 adam Exp $
 
-DISTNAME=		kismet-2006-04-R1
-PKGNAME=		kismet-2006.04.01
-PKGREVISION=		2
+DISTNAME=		kismet-2008-05-R1
+PKGNAME=		kismet-2008.05.01
 CATEGORIES=		net
 MASTER_SITES=		http://www.kismetwireless.net/code/
 
@@ -10,10 +9,12 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.kismetwireless.net/
 COMMENT=		802.11 wireless network detector, sniffer and IDS
 
-GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_NCURSES=		yes # needs libpanel
 USE_TOOLS+=		gmake perl:run
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
 REPLACE_PERL+=		scripts/gpsmap-helper-earthamaps
 LIBS.NetBSD+=		-lm
 
@@ -42,8 +43,6 @@ CONF_FILES+=		${EGDIR}/kismet_ui.conf.default		\
 				${PKG_SYSCONFDIR}/kismet_ui.conf
 OWN_DIRS_PERMS+=	${VARBASE}/log/kismet ${KISMET_USER} ${KISMET_GROUP} 0700
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-
 SUBST_CLASSES+=		user
 SUBST_MESSAGE.user=	Fixing user name.
 SUBST_STAGE.user=	pre-configure
@@ -63,9 +62,9 @@ post-install:
 
 .include "options.mk"
 
-.include "../../devel/glib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kismet/distinfo b/net/kismet/distinfo
index 455bde7cc04..a1f1d68e1ab 100644
--- a/net/kismet/distinfo
+++ b/net/kismet/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.4 2007/02/19 18:22:58 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/10/28 11:06:38 adam Exp $
 
-SHA1 (kismet-2006-04-R1.tar.gz) = e48ce08e96328bfdac98152df6b5759c27ed9169
-RMD160 (kismet-2006-04-R1.tar.gz) = b709256198820d5ac650ce40dea637716427a8b7
-Size (kismet-2006-04-R1.tar.gz) = 1005068 bytes
-SHA1 (patch-aa) = 5284efe0cb7e2a10c21d5235dae3a1faffff4809
-SHA1 (patch-ab) = a77adf2212909b18f7afb65cdfb19539ee3b2f0b
-SHA1 (patch-ac) = cb02c5d97b22a49e8c59ae2d62537a6cbdd899da
-SHA1 (patch-ad) = 6442e2f571cb266560eaa8dc5e6500ff1b9db4fb
-SHA1 (patch-ae) = d99c33d5db327c33024f316133c1da8c602ab508
-SHA1 (patch-af) = 960246131eda2d8b4a70711b751b1fce9609d2fa
-SHA1 (patch-ag) = 92f302f26abaa1882277c56af4a8c072d4f7db7d
-SHA1 (patch-ah) = 4b7368576edd66df1783d52c0136c7a21dec138d
+SHA1 (kismet-2008-05-R1.tar.gz) = 8355aeb0374a39549dfdc0c73160125eadd7c6e2
+RMD160 (kismet-2008-05-R1.tar.gz) = 5613207b45f85fa72d146009434df984f721ccdc
+Size (kismet-2008-05-R1.tar.gz) = 655362 bytes
+SHA1 (patch-aa) = 84bd0905299e75eb885a299c65752825e85b3234
+SHA1 (patch-ac) = 5e267a8915872f6c1d5d58bd0a6c15223292c4ca
+SHA1 (patch-ae) = eaaf5c5498a38d7b2a6121defdf879622f430003
+SHA1 (patch-af) = e4e176998e78a657178b3e14e614adf27b517eb6
+SHA1 (patch-ag) = 2fbf1fbf9d43cd74599c86e178c810bf93b6e04c
+SHA1 (patch-ah) = 67dfa5a2aedb1b651671863177baace4a65c6f26
diff --git a/net/kismet/patches/patch-aa b/net/kismet/patches/patch-aa
index 2d9798aaf96..dc6963c6a73 100644
--- a/net/kismet/patches/patch-aa
+++ b/net/kismet/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2007/02/19 18:22:59 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2008/10/28 11:06:38 adam Exp $
 
---- configure.orig	2006-01-04 15:53:37.000000000 +0000
+--- configure.orig	2008-05-12 22:14:14.000000000 +0200
 +++ configure
-@@ -5689,7 +5689,7 @@ fi
+@@ -6255,7 +6255,7 @@ fi
  
  
  # Do we use uclibc++?
 -if test "$foundcxxl"x == "x"; then
 +if test "$foundcxxl"x = "x"; then
- 	echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
- echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
+ 	{ echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
+ echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6; }
  if test "${ac_cv_lib_stdcpp_main+set}" = set; then
-@@ -5757,7 +5757,7 @@ fi
+@@ -6317,7 +6317,7 @@ fi
  
  fi
  
@@ -20,32 +20,16 @@ $NetBSD: patch-aa,v 1.3 2007/02/19 18:22:59 joerg Exp $
  	{ { echo "$as_me:$LINENO: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&5
  echo "$as_me: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&2;}
     { (exit 1); exit 1; }; }
-@@ -7084,6 +7084,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- 	    #include <stdio.h>
-+	    #include <sys/param.h>
- 	    #include <sys/socket.h>
- 	    #include <net/if.h>
- 	    #include <net/if_media.h>
-@@ -8540,13 +8541,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" 
- 
- fi
- if test $ac_cv_header_pthread_h = yes; then
--  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+@@ -9614,7 +9614,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8625,7 +8626,7 @@ fi
+@@ -9690,7 +9690,7 @@ fi
  echo "$as_me: WARNING: *** GPSMap will be built without pthread support. ***" >&2;};
  		threadlib=""
  	else
diff --git a/net/kismet/patches/patch-ab b/net/kismet/patches/patch-ab
deleted file mode 100644
index 2a0dbea4b49..00000000000
--- a/net/kismet/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
-
---- libpcap-0.9.1-kis/pcap-int.h.orig	2005-08-16 01:22:47.000000000 +0000
-+++ libpcap-0.9.1-kis/pcap-int.h
-@@ -52,6 +52,14 @@ extern "C" {
- #endif
- 
- /*
-+ * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
-+ * Tru64 UNIX, and NetBSD pad to make everything line up on a nice boundary.
-+ */
-+#if defined(ultrix) || defined(__osf__) || defined(__NetBSD__)
-+#define       PCAP_FDDIPAD 3
-+#endif
-+
-+/*
-  * Savefile
-  */
- typedef enum {
-@@ -239,14 +247,6 @@ int	pcap_offline_read(pcap_t *, int, pca
- int	pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
- 
- 
--/*
-- * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
-- * Tru64 UNIX, and NetBSD pad to make everything line up on a nice boundary.
-- */
--#if defined(ultrix) || defined(__osf__) || defined(__NetBSD__)
--#define       PCAP_FDDIPAD 3
--#endif
--
- #ifndef HAVE_STRLCPY
- #define strlcpy(x, y, z) \
- 	(strncpy((x), (y), (z)), \
diff --git a/net/kismet/patches/patch-ac b/net/kismet/patches/patch-ac
index 926d5ee6e05..db5ae5f6297 100644
--- a/net/kismet/patches/patch-ac
+++ b/net/kismet/patches/patch-ac
@@ -1,19 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2008/10/28 11:06:38 adam Exp $
 
---- pcapsource.cc.orig	2006-04-02 15:13:00.000000000 +0000
+--- pcapsource.cc.orig	2008-05-21 17:56:43.000000000 +0200
 +++ pcapsource.cc
-@@ -44,7 +44,9 @@ typedef unsigned long u64;
- #include <net/if_media.h>
- #include <netinet/in.h>
- #include <netinet/if_ether.h>
-+#if defined(SYS_OPENBSD)
- #include <dev/ic/if_wi_ieee.h>
-+#endif
- 
- #ifdef HAVE_RADIOTAP
- #include <net80211/ieee80211.h>
-@@ -54,12 +56,15 @@ typedef unsigned long u64;
- 
+@@ -72,12 +72,15 @@ extern "C" {
+ }
  #endif
  
 -#ifdef SYS_FREEBSD
@@ -30,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
  #include <net80211/ieee80211_ioctl.h>
  #include <net80211/ieee80211_radiotap.h>
  #endif
-@@ -185,7 +190,7 @@ int PcapSource::DatalinkType() {
+@@ -247,7 +250,7 @@ int PcapSource::DatalinkType() {
      datalink_type = pcap_datalink(pd);
  
      // Blow up if we're not valid 802.11 headers
@@ -39,16 +29,16 @@ $NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
      if (datalink_type == DLT_EN10MB) {
          fprintf(stderr, "WARNING:  pcap reports link type of EN10MB but we'll fake "
                  "it on BSD.\n"
-@@ -983,7 +988,7 @@ int PcapSourceOpenBSDPrism::FetchChannel
+@@ -1167,7 +1170,7 @@ carrier_type PcapSourceWrt54g::IEEE80211
  }
  #endif
  
 -#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
 +#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
  int PcapSourceRadiotap::OpenSource() {
-     // XXX this is a hack to avoid duplicating code
-     int s = PcapSource::OpenSource();
-@@ -1097,7 +1102,7 @@ KisPacketSource *pcapsource_openbsdprism
+ 	// XXX this is a hack to avoid duplicating code
+ 	int s = PcapSource::OpenSource();
+@@ -1289,7 +1292,7 @@ KisPacketSource *pcapsource_openbsdprism
  }
  #endif
  
@@ -57,7 +47,7 @@ $NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
  KisPacketSource *pcapsource_radiotap_registrant(string in_name, string in_device,
                                                       char *in_err) {
      return new PcapSourceRadiotap(in_name, in_device);
-@@ -2698,7 +2703,7 @@ int chancontrol_openbsd_prism2(const cha
+@@ -2997,7 +3000,7 @@ int chancontrol_openbsd_prism2(const cha
  }
  #endif
  
@@ -66,7 +56,7 @@ $NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
  RadiotapBSD::RadiotapBSD(const char *name) : ifname(name) {
      s = -1;
  }
-@@ -2849,7 +2854,7 @@ bool RadiotapBSD::set80211(int type, int
+@@ -3148,7 +3151,7 @@ bool RadiotapBSD::set80211(int type, int
      return true;
  }
  
@@ -75,7 +65,7 @@ $NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
  
  bool RadiotapBSD::get80211(int type, int& val, int len, u_int8_t *data) {
      struct ieee80211req ireq;
-@@ -2898,7 +2903,7 @@ bool RadiotapBSD::getifflags(int& flags)
+@@ -3198,7 +3201,7 @@ bool RadiotapBSD::getifflags(int& flags)
      }
  #if defined(SYS_FREEBSD)
      flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16);
@@ -84,7 +74,7 @@ $NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
      flags = ifr.ifr_flags;
  #endif
      return true;
-@@ -2915,7 +2920,7 @@ bool RadiotapBSD::setifflags(int flags) 
+@@ -3215,7 +3218,7 @@ bool RadiotapBSD::setifflags(int flags) 
  #if defined(SYS_FREEBSD)
      ifr.ifr_flags = flags & 0xffff;
      ifr.ifr_flagshigh = flags >> 16;
@@ -93,7 +83,7 @@ $NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
      ifr.ifr_flags = flags;
  #endif
      if (ioctl(s, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) {
-@@ -2946,7 +2951,7 @@ bool RadiotapBSD::monitor_enable(int ini
+@@ -3246,7 +3249,7 @@ bool RadiotapBSD::monitor_enable(int ini
      }
  #if defined(SYS_FREEBSD)
      if (!setifflags(prev_flags | IFF_PPROMISC | IFF_UP)) {
diff --git a/net/kismet/patches/patch-ad b/net/kismet/patches/patch-ad
deleted file mode 100644
index 3a9414c65cb..00000000000
--- a/net/kismet/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
-
---- libpcap-0.9.1-kis/pcap-bpf.c.orig	2005-08-16 01:22:47.000000000 +0000
-+++ libpcap-0.9.1-kis/pcap-bpf.c
-@@ -729,7 +729,7 @@ pcap_open_live(const char *device, int s
- #endif
- #ifdef PCAP_FDDIPAD
- 	if (v == DLT_FDDI)
--		p->fddipad = PCAP_FDDIPAD:
-+		p->fddipad = PCAP_FDDIPAD;
- 	else
- 		p->fddipad = 0;
- #endif
diff --git a/net/kismet/patches/patch-ae b/net/kismet/patches/patch-ae
index 3bf761521dd..ab1a7e15f6e 100644
--- a/net/kismet/patches/patch-ae
+++ b/net/kismet/patches/patch-ae
@@ -1,25 +1,27 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
+$NetBSD: patch-ae,v 1.2 2008/10/28 11:06:38 adam Exp $
 
---- Makefile.in.orig	2005-08-16 01:22:51.000000000 +0000
+--- Makefile.in.orig	2008-05-29 21:18:26.000000000 +0200
 +++ Makefile.in
-@@ -130,58 +130,40 @@ checkuiconfig:
+@@ -139,52 +139,36 @@ checkuiconfig:
  	fi
  
  binuserinstall:
 -	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); 
 -	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
-+	$(BSD_INSTALL_PROGRAM) $(PS) $(BIN)/$(PS); 
-+	$(BSD_INSTALL_PROGRAM) $(DRONE) $(BIN)/$(DRONE);
++	${BSD_INSTALL_PROGRAM} $(PS) $(BIN)/$(PS); 
++	${BSD_INSTALL_PROGRAM} $(DRONE) $(BIN)/$(DRONE);
  
  binsuidinstall:
- 	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
- 	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
++	${BSD_INSTALL_PROGRAM} $(PS) $(BIN)/$(PS); 
++	${BSD_INSTALL_PROGRAM} $(DRONE) $(BIN)/$(DRONE);
  	
  commoninstall:
 -	mkdir -p $(ETC)
 -	mkdir -p $(BIN)
 -
--	install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet
 -	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
 -	# install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
 -	@if test "$(ZAURUS)" = "yes"; then \
@@ -37,19 +39,16 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
 -	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
 -	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5
 -	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
-+	$(BSD_INSTALL_PROGRAM_DIR) $(BIN)
-+	$(BSD_INSTALL_SCRIPT) scripts/kismet $(BIN)/kismet
-+	$(BSD_INSTALL_PROGRAM) $(NC) $(BIN)/$(NC)
-+#	@if test "$(ZAURUS)" = "yes"; then \
-+#		$(BSD_INSTALL_PROGRAM) $(BUZZER) $(BIN)/buzzme; \
-+#	fi
-+	$(BSD_INSTALL_MAN_DIR) $(MAN)/man1
-+	$(BSD_INSTALL_MAN) man/kismet.1 $(MAN)/man1/kismet.1
-+	$(BSD_INSTALL_MAN) man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
-+	$(BSD_INSTALL_MAN_DIR) $(MAN)/man5
-+	$(BSD_INSTALL_MAN) man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
-+	$(BSD_INSTALL_MAN) man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5
-+	$(BSD_INSTALL_MAN) man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
++	${BSD_INSTALL_PROGRAM} $(WRAP) $(BIN)/kismet
++	${BSD_INSTALL_PROGRAM} $(NC) $(BIN)/$(NC)
++	#@if test "$(ZAURUS)" = "yes"; then \
++	#	${BSD_INSTALL_PROGRAM} $(BUZZER) $(BIN)/buzzme; \
++	#fi
++	${BSD_INSTALL_MAN} man/kismet.1 $(MAN)/man1/kismet.1
++	${BSD_INSTALL_MAN} man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
++	${BSD_INSTALL_MAN} man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
++	${BSD_INSTALL_MAN} man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5
++	${BSD_INSTALL_MAN} man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
  
  	@if test "$(GPSLBUILD)" = "$(GPSL)"; then \
 -		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
@@ -58,8 +57,11 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
 -		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
 -		install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
 -		echo install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
--	fi
--
++		${BSD_INSTALL_PROGRAM} $(GPSL) $(BIN)/$(GPSL); \
++		${BSD_INSTALL_SCRIPT} scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
++		${BSD_INSTALL_MAN} man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
+ 	fi
+ 
 -	mkdir -p $(WAV)
 -	install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new_network.wav $(WAV)/new_network.wav
 -	install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/traffic.wav $(WAV)/traffic.wav
@@ -67,29 +69,19 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
 -	install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav
 -	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/ap_manuf $(ETC)/ap_manuf; 
 -	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/client_manuf $(ETC)/client_manuf; 
--
--	@if test -f $(BIN)/kismet_curses; then \
--		echo "Removing old kismet_curses binary.  The panels frontend is now kismet_client."; \
--		rm $(BIN)/kismet_curses; \
-+		$(BSD_INSTALL_PROGRAM) $(GPSL) $(BIN)/$(GPSL); \
-+		$(BSD_INSTALL_SCRIPT) scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
-+		$(BSD_INSTALL_MAN) man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
- 	fi
++	${BSD_INSTALL_DATA_DIR} $(WAV)
++	${BSD_INSTALL_DATA} wav/new_network.wav $(WAV)/new_network.wav
++	${BSD_INSTALL_DATA} wav/traffic.wav $(WAV)/traffic.wav
++	${BSD_INSTALL_DATA} wav/junk_traffic.wav $(WAV)/junk_traffic.wav
++	${BSD_INSTALL_DATA} wav/alert.wav $(WAV)/alert.wav
  
-+	$(BSD_INSTALL_DATA_DIR) $(WAV)
-+	$(BSD_INSTALL_DATA) wav/new_network.wav $(WAV)/new_network.wav
-+	$(BSD_INSTALL_DATA) wav/traffic.wav $(WAV)/traffic.wav
-+	$(BSD_INSTALL_DATA) wav/junk_traffic.wav $(WAV)/junk_traffic.wav
-+	$(BSD_INSTALL_DATA) wav/alert.wav $(WAV)/alert.wav
-+
- suidinstall: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURUSBUILD)
- 	$(MAKE) -e commoninstall
- 	$(MAKE) -e binsuidinstall
-@@ -215,30 +197,7 @@ suidinstall: $(PS) $(DRONE) $(NC) $(GPSL
+ 	@if test -f $(BIN)/kismet_curses; then \
+ 		echo "Removing old kismet_curses binary.  The panels frontend is now kismet_client."; \
+@@ -224,30 +208,7 @@ suidinstall: $(PS) $(DRONE) $(WRAP) $(NC
  	@echo "YOUR WIRELESS NETWORK CONNECTION.  IF YOU HAVE ANY UNTRUSTED USERS ON YOUR "
  	@echo "SYSTEM DO NOT INSTALL KISMET AS SUID ROOT."
  
--install: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURUSBUILD)
+-install: $(PS) $(DRONE) $(NC) $(WRAP) $(GPSLBUILD) $(ZAURUSBUILD)
 -	$(MAKE) -e commoninstall
 -	$(MAKE) -e binuserinstall
 -	@if test -f $(ETC)/kismet.conf; then \
@@ -113,7 +105,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
 -		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
 -		echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
 -	fi
-+install: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURUSBUILD) commoninstall binuserinstall
++install: $(PS) $(DRONE) $(NC) $(WRAP) $(GPSLBUILD) $(ZAURUSBUILD) commoninstall binuserinstall
  	@echo "Installed kismet into $(BIN)/."
  	@echo "If you have not done so already, read the README file and the FAQ file.  Additional"
  	@echo "documentation is in the docs/ directory.  You MUST edit $(ETC)/kismet.conf "
diff --git a/net/kismet/patches/patch-af b/net/kismet/patches/patch-af
index 32616c3ea6c..ee8e4346b23 100644
--- a/net/kismet/patches/patch-af
+++ b/net/kismet/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2006/10/09 18:48:35 joerg Exp $
+$NetBSD: patch-af,v 1.2 2008/10/28 11:06:38 adam Exp $
 
---- kis_packsources.cc.orig	2006-10-09 20:10:16.000000000 +0000
+--- kis_packsources.cc.orig	2008-05-20 10:47:13.000000000 +0200
 +++ kis_packsources.cc
-@@ -272,7 +272,7 @@ int RegisterKismetSources(Packetsourcetr
+@@ -345,7 +345,7 @@ int RegisterKismetSources(Packetsourcetr
      REG_EMPTY_CARD(sourcetracker, "prism2_openbsd");
  #endif
  
diff --git a/net/kismet/patches/patch-ag b/net/kismet/patches/patch-ag
index 69f768d2977..29f6a4379c7 100644
--- a/net/kismet/patches/patch-ag
+++ b/net/kismet/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2006/10/09 18:48:35 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2008/10/28 11:06:38 adam Exp $
 
---- pcapsource.h.orig	2006-10-09 20:20:31.000000000 +0000
+--- pcapsource.h.orig	2008-05-19 11:51:54.000000000 +0200
 +++ pcapsource.h
-@@ -280,7 +280,7 @@ public:
+@@ -395,7 +395,7 @@ public:
  };
  #endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.1 2006/10/09 18:48:35 joerg Exp $
  class RadiotapBSD {
  public:
      RadiotapBSD(const char *ifname);
-@@ -455,7 +455,7 @@ int chancontrol_openbsd_prism2(const cha
+@@ -584,7 +584,7 @@ int chancontrol_openbsd_prism2(const cha
                                 void *in_ext);
  #endif
  
diff --git a/net/kismet/patches/patch-ah b/net/kismet/patches/patch-ah
index 2abf402e6af..7944770e781 100644
--- a/net/kismet/patches/patch-ah
+++ b/net/kismet/patches/patch-ah
@@ -1,16 +1,15 @@
-$NetBSD: patch-ah,v 1.1 2006/10/14 01:27:44 rillig Exp $
+$NetBSD: patch-ah,v 1.2 2008/10/28 11:06:38 adam Exp $
 
---- configure.in.orig	2006-01-04 16:53:37.000000000 +0100
-+++ configure.in	2006-10-14 03:22:35.000000000 +0200
-@@ -261,13 +261,13 @@ AC_CHECK_LIB([uClibc++], [main], 
- 			 AC_MSG_WARN([uclibc++ not available on this system]))
+--- configure.in.orig	2008-05-12 22:14:14.000000000 +0200
++++ configure.in
+@@ -269,12 +269,12 @@ AC_CHECK_LIB([uClibc++], [main], 
+ 			 foundcxxl="uclibc" LIBS="$LIBS -luClibc++")
  
  # Do we use uclibc++?
 -if test "$foundcxxl"x == "x"; then
 +if test "$foundcxxl"x = "x"; then
  	AC_CHECK_LIB([stdc++], [main], 
- 				 foundcxxl="stdc++" LIBS="$LIBS -lstdc++",
- 				 AC_MSG_WARN([libstdc++ not available on this system]))
+ 				 foundcxxl="stdc++" LIBS="$LIBS -lstdc++ -lm",,"-lm")
  fi
  
 -if test "$foundcxxl"x == "x"; then