[packages] kismet: Don't add host include paths

[openwrt/svn-archive/archive.git] / net / kismet / Makefile

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 048b3f72cf1b8221554796764292b034d1c681a2..d3ab3adfdb9657d5dd772fdd1d2461e2c4decf67 100644 (file)
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -1,22 +1,21 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kismet
-PKG_VERSION:=2007-10-R1
-PKG_RELEASE:=1
+PKG_VERSION:=2009-06-R1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.kismetwireless.net/code
-PKG_MD5SUM:=2100c667e69db0cde35fa2d06c8516e2
+PKG_MD5SUM:=8d77138020ace39f175a906dc0d3b267
 
-PKG_BUILD_DEPENDS:=libnotimpl libpcap libncurses uclibcxx
+PKG_BUILD_DEPENDS:=libpcap libncurses uclibcxx libpcre
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,7 +29,7 @@ define Package/kismet/Default
 endef
 
 define Package/kismet/Default/description
- An 802.11 layer2 wireless network detector, sniffer, and intrusion 
+ An 802.11 layer2 wireless network detector, sniffer, and intrusion
  detection system.
 endef
 
@@ -41,10 +40,7 @@ $(call Package/kismet/Default)
 endef
 
 define Package/kismet-client/conffiles
-/etc/kismet/ap_manuf
-/etc/kismet/client_manuf
 /etc/kismet/kismet.conf
-/etc/kismet/kismet_ui.conf
 endef
 
 define Package/kismet-client/description
@@ -54,7 +50,7 @@ endef
 
 define Package/kismet-drone
 $(call Package/kismet/Default)
-  DEPENDS+= +libpcap
+  DEPENDS+= +libpcap +libpcre
   TITLE+= drone
 endef
 
@@ -69,13 +65,11 @@ endef
 
 define Package/kismet-server
 $(call Package/kismet/Default)
-  DEPENDS+= +libpcap +dbus
+  DEPENDS+= +libpcap +libpcre
   TITLE+= server
 endef
 
 define Package/kismet-server/conffiles
-/etc/kismet/ap_manuf
-/etc/kismet/client_manuf
 /etc/kismet/kismet.conf
 endef
 
@@ -85,20 +79,18 @@ $(call Package/kismet/Default/description)
 endef
 
 CONFIGURE_ARGS += \
-       --enable-syspcap=yes \
-       --disable-setuid \
-       --disable-wsp100 \
-       --disable-gpsmap \
+       --sysconfdir=/etc/kismet \
 
 CONFIGURE_VARS += \
        CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
+       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
        LDFLAGS="$$$$LDFLAGS" \
-       LIBS="-nodefaultlibs -luClibc++ -lm -lnotimpl" \
+       LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
+       CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               LD="\$$$$(CC)" \
+               LD="$(TARGET_CXX)" \
                all
 endef
 
@@ -110,26 +102,21 @@ endef
 
 define Package/kismet-client/install
        $(INSTALL_DIR) $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/kismet_ui.conf $(1)/etc/kismet/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/
 endef
 
 define Package/kismet-drone/install
        $(INSTALL_DIR) $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/kismet_drone.conf $(1)/etc/kismet/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet_drone.conf $(1)/etc/kismet/
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/
 endef
 
 define Package/kismet-server/install
        $(INSTALL_DIR) $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/
-       $(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/
 endef