packages: fold the IPv6 menu into Network

[lede-routing/.git] / net / bird / Makefile

diff --git a/net/bird/Makefile b/net/bird/Makefile
index f18f7deff157d2bc0d65755f12841f7b32e0460a..6565f0106453571153a3c48c481200c8592d560f 100644 (file)
--- a/net/bird/Makefile
+++ b/net/bird/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,26 +7,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bird
-PKG_VERSION:=1.2.4
+PKG_VERSION:=1.3.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=8db90b12200ebb20f5aa93a2de9937c6
+PKG_MD5SUM:=c400b008ef834d9e7288dcdbe41b7c15
 PKG_BUILD_DEPENDS:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bird/Default
-  SECTION:=net
-  CATEGORY:=Network
   TITLE:=The BIRD Internet Routing Daemon
   URL:=http://bird.network.cz/
+  DEPENDS:=
 endef
 
 define Package/birdc/Default
-  SECTION:=net
-  CATEGORY:=Network
   TITLE:=The BIRD command-line client
   URL:=http://bird.network.cz/
   DEPENDS:= +libreadline +libncurses
@@ -62,22 +59,32 @@ endef
 
 define Package/bird4
 $(call Package/bird/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
   TITLE+= (IPv4)
 endef
 
 define Package/birdc4
 $(call Package/birdc/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
   TITLE+= (IPv4)
   DEPENDS+= +bird4
 endef
 
 define Package/bird6
 $(call Package/bird/Default)
+  SECTION:=net
+  CATEGORY:=Network
   TITLE+= (IPv6)
 endef
 
 define Package/birdc6
 $(call Package/birdc/Default)
+  SECTION:=net
+  CATEGORY:=Network
   TITLE+= (IPv6)
   DEPENDS+= +bird6
 endef
@@ -132,6 +139,10 @@ define Package/bird$(2)/install
 
 endef
 
+define Package/bird$(2)/conffiles
+/etc/bird$(2).conf
+endef
+
 define Package/birdc$(2)/install
        $(INSTALL_DIR) $$(1)/usr/sbin
        $(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/