kismet: moved to github

[packages.git] / net / stun / Makefile

diff --git a/net/stun/Makefile b/net/stun/Makefile
index 34f7df5..7461fab 100644 (file)
--- a/net/stun/Makefile
+++ b/net/stun/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2008-2009 OpenWrt.org
+#
+# Copyright (C) 2008-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stund
 PKG_VERSION:=0.96
-PKG_RELEASE:=2
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_Aug13.tgz
 PKG_SOURCE_URL:=@SF/stun
@@ -17,12 +17,13 @@ PKG_MD5SUM:=3273abb1a6f299f4e611b658304faefa
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/stun/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+uclibcxx
+  DEPENDS:=$(CXX_DEPENDS)
   URL:=http://sourceforge.net/projects/stun
 endef
 
@@ -57,9 +58,9 @@ define Build/Compile
                CXX="$(TARGET_CXX)" \
                CFLAGS="$(TARGET_CFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-               CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ $(TARGET_CPPFLAGS)" \
-               LDFLAGS="$$$$LDFLAGS $(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ $(LIBGCC_S)" \
+               CXXFLAGS="$(TARGET_CFLAGS) -fno-rtti"  \
+               CPPFLAGS="$$$$CPPFLAGS $(TARGET_CPPFLAGS)" \
+               LDFLAGS="$$$$LDFLAGS $(TARGET_LDFLAGS)" \
                all
 endef
 
@@ -68,13 +69,17 @@ define Package/stund/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/server $(1)/usr/sbin/stund
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/stund.init $(1)/etc/init.d/
+       $(INSTALL_BIN) ./files/stund.init $(1)/etc/init.d/stund
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DATA) ./files/stund.config $(1)/etc/config/stund
 endef
 
+define Package/stund/conffiles
+/etc/config/stund
+endef
+
 define Package/stun-client/install
-       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/client $(1)/usr/sbin/stun-client
 endef