opennhrp: update to 0.11.3, add missing dependencies

SVN-Revision: 19181

diff --git a/net/opennhrp/Makefile b/net/opennhrp/Makefile
index 3d7f46bedea3935c7f8b45f10e5378a1d7caf131..73f86cfa856b3faa76a0856fc8a3beb9f3406f82 100644 (file)
--- a/net/opennhrp/Makefile
+++ b/net/opennhrp/Makefile
@@ -1,22 +1,30 @@
+#
+# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009 Jakob Pfeiffer
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opennhrp
-PKG_VERSION:=0.11.2
+PKG_VERSION:=0.11.3
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=@SF/opennhrp
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=3aace509ac79acbde3bb3e44e88798d5
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=@SF/opennhrp
+PKG_MD5SUM:=6f6f8571ccc0a9f97e52c6240fe9002a
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/opennhrp
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libcares +ipsec-tools
+  DEPENDS:=+libcares +ipsec-tools +ip +kmod-gre
   TITLE:=NBMA Next Hop Resolution Protocol
   URL:=http://opennhrp.sourceforge.net/
 endef
@@ -24,16 +32,21 @@ endef
 define Package/opennhrp/description
   OpenNHRP implements NBMA Next Hop Resolution Protocol (as defined in RFC 2332).
   It makes it possible to create dynamic multipoint VPN Linux router using NHRP,
-  GRE and IPsec. It aims to be Cisco DMVPN compatible. 
+  GRE and IPsec. It aims to be Cisco DMVPN compatible.
+endef
+
+define Package/opennhrp/conffiles
+/etc/opennhrp/opennhrp.conf
 endef
 
 define Package/opennhrp/install
-       $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/opennhrp $(1)/etc/init.d
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/nhrp/opennhrp $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/nhrp/opennhrpctl $(1)/usr/sbin/
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/etc/opennhrp.conf $(1)/etc/opennhrp/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/etc/opennhrp-script* $(1)/etc/opennhrp/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/etc/racoon-ph1down.sh $(1)/etc/opennhrp/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/opennhrp{,ctl} $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/opennhrp
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/opennhrp/opennhrp.conf $(1)/etc/opennhrp/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/opennhrp-script $(1)/etc/opennhrp/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/opennhrp/racoon-ph1down.sh $(1)/etc/opennhrp/
+       $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/opennhrp.init $(1)/etc/init.d/opennhrp
 endef