X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fkismet%2FMakefile;h=c051b67c9c62a7cae72da55683d608b9345fe7a9;hb=905fb22f1230d3ac443f8a102530722a63bad23c;hp=eb490e661f0b4e5cb594c2d0bbe16090ecd2b0f8;hpb=25e391427bdeed478139419ae0ddda3d2a003899;p=packages.git

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index eb490e661..c051b67c9 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -1,35 +1,36 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 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-01-R1a
-PKG_RELEASE:=1
+PKG_VERSION:=2010-07-R1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.kismetwireless.net/code
-PKG_MD5SUM:=5921166366d3f695eeef26121c56a674
+PKG_MD5SUM:=85e59186eb529889118b5635f35cf57d
 
-PKG_BUILD_DEPENDS:=libnotimpl libpcap libncurses uclibcxx
+PKG_BUILD_DEPENDS:=libpcap libncurses libpcre
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kismet/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Kismet
-  DEPENDS:= +uclibcxx
+  DEPENDS:= $(CXX_DEPENDS) +libnl
   URL:=http://www.kismetwireless.net/
+  SUBMENU:=wireless
 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
 
@@ -40,10 +41,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
@@ -53,7 +51,7 @@ endef
 
 define Package/kismet-drone
 $(call Package/kismet/Default)
-  DEPENDS+= +libpcap
+  DEPENDS+= +libpcap +libpcre +libcap
   TITLE+= drone
 endef
 
@@ -68,13 +66,11 @@ endef
 
 define Package/kismet-server
 $(call Package/kismet/Default)
-  DEPENDS+= +libpcap
+  DEPENDS+= +libpcap +libpcre +libcap
   TITLE+= server
 endef
 
 define Package/kismet-server/conffiles
-/etc/kismet/ap_manuf
-/etc/kismet/client_manuf
 /etc/kismet/kismet.conf
 endef
 
@@ -84,20 +80,16 @@ $(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" \
-	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="-nodefaultlibs -luClibc++ -lm -lnotimpl" \
+	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"  \
+	LIBS="-lm" \
+	CLIENTCLIBS="-lm"
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LD="\$$$$(CC)" \
+		LD="$(TARGET_CXX)" \
 		all
 endef
 
@@ -109,26 +101,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