[net] Telephony: Moved most (all?) SIP and other telephony applications to the Telephony submenu. STUN however has been left in the main menu as it has other uses.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26048 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-12 00:25:24 +00:00 · 2011-03-12 00:25:24 +00:00 · 97ed1565ae
commit 97ed1565ae
parent d5a2b0c7b5
12 changed files with 26 additions and 14 deletions
--- a/net/asterisk-1.8.x/Makefile
+++ b/net/asterisk-1.8.x/Makefile
@ -20,7 +20,7 @@ PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk

 define Package/asterisk18/Default
-  SUBMENU:=asterisk18 (Complete Open Source PBX), v1.8.x
+  SUBMENU:=Telephony
  SECTION:=net
  CATEGORY:=Network
  URL:=http://www.asterisk.org/
@ -37,7 +37,8 @@ endef

 define Package/asterisk18
 $(call Package/asterisk18/Default)
-  TITLE:=Complete open source PBX
+  TITLE:=Complete open source PBX, v1.8x
+  MENU:=1
  DEPENDS:= +libopenssl +libncurses +libpopt +libpthread +zlib @!TARGET_avr32
 endef

@ -48,7 +49,7 @@ endef
 define Package/asterisk18-sounds
 $(call Package/asterisk18/Default)
  TITLE:=Sound files
-  DEPENDS:= +asterisk18
+  DEPENDS:= asterisk18
 endef

 define Package/asterisk18-sounds/description
@ -60,7 +61,7 @@ endef
 define Package/asterisk18-voicemail
 $(call Package/asterisk18/Default)
  TITLE:=Voicemail support
-  DEPENDS:= +asterisk18
+  DEPENDS:= asterisk18
 endef

 define Package/asterisk18-voicemail/description
@ -71,7 +72,7 @@ endef
 define Package/asterisk18-app-meetme
 $(call Package/asterisk18/Default)
  TITLE:=conferencing support
-  DEPENDS:= +asterisk18 +dahdi-tools-libtonezone +kmod-dahdi-linux
+  DEPENDS:= asterisk18 +dahdi-tools-libtonezone +kmod-dahdi-linux
 endef

 define Package/asterisk18-app-meetme/description
@ -83,7 +84,7 @@ endef
 define Package/asterisk18-chan-iax2
 $(call Package/asterisk18/Default)
  TITLE:=IAX support
-  DEPENDS:= +asterisk18
+  DEPENDS:= asterisk18
 endef

 define Package/asterisk18-chan-iax2/description
@ -95,7 +96,7 @@ endef
 define Package/asterisk18-cdr
 $(call Package/asterisk18/Default)
  TITLE:=CDR support
-  DEPENDS:= +asterisk18
+  DEPENDS:= asterisk18
 endef

 define Package/asterisk18-cdr/description
@ -107,7 +108,7 @@ endef
 define Package/asterisk18-res-musiconhold
 $(call Package/asterisk18/Default)
  TITLE:=MOH support
-  DEPENDS:= +asterisk18
+  DEPENDS:= asterisk18
 endef

 define Package/asterisk18-res-musiconhold/description
@ -119,7 +120,7 @@ endef
 define Package/asterisk18-chan-gtalk
 $(call Package/asterisk18/Default)
  TITLE:=GTalk support
-  DEPENDS:= +asterisk18 +libiksemel
+  DEPENDS:= asterisk18 +libiksemel
 endef

 define Package/asterisk18-chan-gtalk/description
@ -131,7 +132,7 @@ endef
 define Package/asterisk18-chan-mobile
 $(call Package/asterisk18/Default)
  TITLE:=Mobile channel support
-  DEPENDS:= +asterisk18 +bluez-libs
+  DEPENDS:= asterisk18 +bluez-libs
 endef

 define Package/asterisk18-chan-mobile/description
@ -142,7 +143,7 @@ endef
 define Package/asterisk18-chan-mgcp
 $(call Package/asterisk18/Default)
  TITLE:=MGCP channel support
-  DEPENDS:= +asterisk18
+  DEPENDS:= asterisk18
 endef

 define Package/asterisk18-chan-mgcp/description
@ -153,7 +154,7 @@ endef
 define Package/asterisk18-curl
 $(call Package/asterisk18/Default)
  TITLE:=CURL support
-  DEPENDS:= +asterisk18 +libcurl
+  DEPENDS:= asterisk18 +libcurl
 endef

 define Package/asterisk18-curl/description
@ -165,7 +166,7 @@ endef
 define Package/asterisk18-mysql
 $(call Package/asterisk18/Default)
  TITLE:=MySQL support
-  DEPENDS:= +asterisk18 +libmysqlclient
+  DEPENDS:= asterisk18 +libmysqlclient
 endef

 define Package/asterisk18-mysql/description
@ -459,7 +460,7 @@ define Buildasterisk18ModuleTemplate
  define Package/asterisk18-$(subst _,-,$(1))
  $$(call Package/asterisk18/Default)
    TITLE:=$(2) support
-    DEPENDS:= +asterisk18
+    DEPENDS:= asterisk18
  endef

  define Package/asterisk18-$(subst _,-,$(1))/description
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@ -129,6 +129,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/freeswitch/Default
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  URL:=http://www.freeswitch.org/
 endef

--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@ -27,6 +27,7 @@ TARGET_CFLAGS += $(FPIC)
 define Package/kamailio/Default
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  URL:=http://www.kamailio.org/
 endef

--- a/net/mac-to-devinfo/Makefile
+++ b/net/mac-to-devinfo/Makefile
@ -32,6 +32,7 @@ endef
 define Package/smap-to-devinfo
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  DEPENDS:=mac-to-devinfo +smap +httping
  TITLE:=SIP Device Information from Scan
 endef
--- a/net/miax/Makefile
+++ b/net/miax/Makefile
@ -22,6 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/miax
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  DEPENDS:=+libpthread +bluez-libs
  TITLE:=A console iax (asterisk) client
  URL:=http://www.eja.it/?l=en&n=miax
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@ -22,6 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/openser
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  TITLE:=Configurable, free SIP server
  URL:=http://www.openser.org
  MENU:=1
--- a/net/opensips/Makefile
+++ b/net/opensips/Makefile
@ -27,6 +27,7 @@ TARGET_CFLAGS += $(FPIC)
 define Package/opensips/Default
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  URL:=http://www.opensips.org/
 endef

--- a/net/rtpproxy/Makefile
+++ b/net/rtpproxy/Makefile
@ -22,6 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/rtpproxy
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  DEPENDS:=+libpthread
  TITLE:=RTP (Realtime Transport Protocol) proxy
  URL:=http://www.rtpproxy.org/
--- a/net/sipp/Makefile
+++ b/net/sipp/Makefile
@ -20,6 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sipp
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  DEPENDS:= +libncurses +libpthread +uclibcxx
  TITLE:=test tool / traffic generator for the SIP protocol
  URL:=http://sipp.sourceforge.net/
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/siproxd
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  DEPENDS:=+libltdl +libosip2 +libpthread
  TITLE:=SIP (Session Initiation Protocol) proxy
  URL:=http://siproxd.sourceforge.net/
--- a/net/sipsak/Makefile
+++ b/net/sipsak/Makefile
@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sipsak
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  DEPENDS:=+libopenssl
  TITLE:=SIP (Session Initiation Protocol) stress and diagnostics utility
  URL:=http://www.sipsak.org/
--- a/net/smap/Makefile
+++ b/net/smap/Makefile
@ -25,6 +25,7 @@ LIBTOOL="$(STAGING_DIR)/host/bin/libtool"
 define Package/smap
  SECTION:=net
  CATEGORY:=Network
+  SUBMENU:=Telephony
  TITLE:=A SIP network discovery tool
  MAINTAINER:=Daniel Dickinson <openwrt@cshore.neomailbox.net>
  URL:=http://www.wormulon.net/smap/