From 937f802cadef45b41772bbcca707dbe7bc796ad1 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 14 May 2013 15:02:57 +0000 Subject: [PATCH] packages: fold the IPv6 menu into Network Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/packages@36635 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ipv6/6tunnel/Makefile | 4 ++-- ipv6/ahcpd/Makefile | 4 ++-- ipv6/aiccu/Makefile | 4 ++-- ipv6/dhcp6/Makefile | 4 ++-- ipv6/dibbler/Makefile | 4 ++-- ipv6/gw6c/Makefile | 4 ++-- ipv6/ipv6calc/Makefile | 4 ++-- ipv6/miredo/Makefile | 4 ++-- ipv6/mrd6/Makefile | 4 ++-- ipv6/ndisc/Makefile | 4 ++-- ipv6/ndppd/Makefile | 4 ++-- ipv6/ptrtd/Makefile | 4 ++-- ipv6/radvd/Makefile | 4 ++-- ipv6/send/Makefile | 4 ++-- ipv6/shorewall6-lite/Makefile | 4 ++-- ipv6/tayga/Makefile | 4 ++-- ipv6/totd/Makefile | 4 ++-- ipv6/tspc/Makefile | 4 ++-- ipv6/tunslip6/Makefile | 4 ++-- ipv6/wide-dhcpv6/Makefile | 4 ++-- net/bird/Makefile | 8 ++++---- 21 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ipv6/6tunnel/Makefile b/ipv6/6tunnel/Makefile index f864cd905..64809ad4c 100644 --- a/ipv6/6tunnel/Makefile +++ b/ipv6/6tunnel/Makefile @@ -18,8 +18,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz include $(INCLUDE_DIR)/package.mk define Package/6tunnel - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+libpcap +kmod-sit TITLE:=IPv4 / IPv6 tunnel proxy URL:=http://toxygen.net/6tunnel/ diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile index 3278371e3..95af35224 100644 --- a/ipv6/ahcpd/Makefile +++ b/ipv6/ahcpd/Makefile @@ -19,8 +19,8 @@ PKG_MD5SUM:=a1a610bf20965aa522cd766bf3d5829a include $(INCLUDE_DIR)/package.mk define Package/ahcpd - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=Ad-Hoc Configuration Protocol daemon URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/ MAINTAINER:=Gabriel Kerneis diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile index b6f3fa3a3..0590ad0d8 100644 --- a/ipv6/aiccu/Makefile +++ b/ipv6/aiccu/Makefile @@ -20,8 +20,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/aiccu - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+libpthread +ip +kmod-sit +kmod-tun TITLE:=SixXS Automatic IPv6 Connectivity Client Utility URL:=http://www.sixxs.net/tools/aiccu/ diff --git a/ipv6/dhcp6/Makefile b/ipv6/dhcp6/Makefile index 056814a6d..a82f024fc 100644 --- a/ipv6/dhcp6/Makefile +++ b/ipv6/dhcp6/Makefile @@ -20,8 +20,8 @@ include $(INCLUDE_DIR)/package.mk PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) define Package/dhcp6/Default - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+libncurses TITLE:=IPv6 DHCP URL:=http://sourceforge.net/projects/dhcpv6-linux diff --git a/ipv6/dibbler/Makefile b/ipv6/dibbler/Makefile index 4b104b81e..e6f88329f 100644 --- a/ipv6/dibbler/Makefile +++ b/ipv6/dibbler/Makefile @@ -19,8 +19,8 @@ include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/dibbler/Default - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=$(CXX_DEPENDS) +libpthread TITLE:=Dibbler, a portable DHCPv6 implementation URL:=http://klub.com.pl/dhcpv6/ diff --git a/ipv6/gw6c/Makefile b/ipv6/gw6c/Makefile index a505e404b..0584d6456 100644 --- a/ipv6/gw6c/Makefile +++ b/ipv6/gw6c/Makefile @@ -17,8 +17,8 @@ include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/gw6c - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+libpthread +ip +kmod-tun +kmod-ipv6 $(CXX_DEPENDS) +radvd TITLE:=IPv6 tunnel client software URL:=http://www.go6.net diff --git a/ipv6/ipv6calc/Makefile b/ipv6/ipv6calc/Makefile index 0397f8a79..57c0a93b8 100644 --- a/ipv6/ipv6calc/Makefile +++ b/ipv6/ipv6calc/Makefile @@ -21,8 +21,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/ipv6calc/Default - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network URL:=http://www.deepspace6.net/projects/ipv6calc.html endef diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile index 7c26ed525..8dba320a9 100644 --- a/ipv6/miredo/Makefile +++ b/ipv6/miredo/Makefile @@ -22,8 +22,8 @@ include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/miredo/Default - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network SUBMENU:=miredo: Teredo (IPv6 tunneling over UDP through NAT) URL:=http://www.remlab.net/miredo/ endef diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile index b62caa443..00d8d9a1b 100644 --- a/ipv6/mrd6/Makefile +++ b/ipv6/mrd6/Makefile @@ -21,8 +21,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/mrd6 - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=IPv6 multicast routing daemon URL:=http://fivebits.net/proj/mrd6 DEPENDS:=+kmod-ipv6 +libstdcpp diff --git a/ipv6/ndisc/Makefile b/ipv6/ndisc/Makefile index 249e96ade..78b7f17cb 100644 --- a/ipv6/ndisc/Makefile +++ b/ipv6/ndisc/Makefile @@ -20,8 +20,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/ndisc - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network SUBMENU:=IPv6 discovery tools TITLE:=IPv6 discovery tools URL:=http://www.remlab.net/ndisc6/ diff --git a/ipv6/ndppd/Makefile b/ipv6/ndppd/Makefile index 8ffcacb69..b7c3282c3 100644 --- a/ipv6/ndppd/Makefile +++ b/ipv6/ndppd/Makefile @@ -26,8 +26,8 @@ include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/ndppd - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=NDP Proxy Daemon URL:=http://www.priv.nu/projects/ndppd/ MAINTAINER:=Gabriel Kerneis diff --git a/ipv6/ptrtd/Makefile b/ipv6/ptrtd/Makefile index 4e1aa6503..c78451892 100644 --- a/ipv6/ptrtd/Makefile +++ b/ipv6/ptrtd/Makefile @@ -18,8 +18,8 @@ PKG_MD5SUM:=bfe026445fdc4fe509a9c70ec4551744 include $(INCLUDE_DIR)/package.mk define Package/ptrtd - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+kmod-ipv6 +kmod-tun +ip TITLE:=Portable Transport Relay Translator Daemon URL:=http://v6web.litech.org/ptrtd/ diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile index 571d9dee0..61d47c498 100644 --- a/ipv6/radvd/Makefile +++ b/ipv6/radvd/Makefile @@ -21,8 +21,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/radvd/Default - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=IPv6 Routing Advertisement URL:=http://v6web.litech.org/radvd/ DEPENDS:=+kmod-ipv6 +libdaemon diff --git a/ipv6/send/Makefile b/ipv6/send/Makefile index 7f5d53025..34a1a4f00 100644 --- a/ipv6/send/Makefile +++ b/ipv6/send/Makefile @@ -21,8 +21,8 @@ PKG_BUILD_PARALLEL:=0 include $(INCLUDE_DIR)/package.mk define Package/send - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=Secure Neighbor Discovery implementation URL:=http://mobisend.org/debian-mobisend.html DEPENDS:=+kmod-ipv6 +ip6tables +libnetfilter-queue +libopenssl +libreadline +libncurses diff --git a/ipv6/shorewall6-lite/Makefile b/ipv6/shorewall6-lite/Makefile index e082b8981..2eb9c15b0 100644 --- a/ipv6/shorewall6-lite/Makefile +++ b/ipv6/shorewall6-lite/Makefile @@ -25,8 +25,8 @@ PKG_MD5SUM:=3ad7ba3790388bb562d3c937ba02fa31 include $(INCLUDE_DIR)/package.mk define Package/shorewall6-lite - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+ip +ip6tables TITLE:=Shorewall6 Lite URL:=http://www.shorewall.net/ diff --git a/ipv6/tayga/Makefile b/ipv6/tayga/Makefile index 5d043ae38..5e1a5df1e 100644 --- a/ipv6/tayga/Makefile +++ b/ipv6/tayga/Makefile @@ -16,8 +16,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/tayga-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk define Package/tayga - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+ip +kmod-ipv6 +kmod-tun TITLE:=Out-of-kernel stateless NAT64 implementation for Linux URL:=http://www.litech.org/tayga/ diff --git a/ipv6/totd/Makefile b/ipv6/totd/Makefile index e67bc572a..0a1dad577 100644 --- a/ipv6/totd/Makefile +++ b/ipv6/totd/Makefile @@ -18,8 +18,8 @@ PKG_MD5SUM:=7edaedae9f6aca5912dd6c123582cf08 include $(INCLUDE_DIR)/package.mk define Package/totd - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+kmod-ipv6 TITLE:=Small DNS proxy that supports IPv6/IPv4 record translation URL:=http://www.dillema.net/software/totd.html diff --git a/ipv6/tspc/Makefile b/ipv6/tspc/Makefile index 8133f27da..d465300b4 100644 --- a/ipv6/tspc/Makefile +++ b/ipv6/tspc/Makefile @@ -20,8 +20,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2 include $(INCLUDE_DIR)/package.mk define Package/tspc - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=Client for Hexago's (Freenet6's) IPv6 service URL:=http://www.hexago.com endef diff --git a/ipv6/tunslip6/Makefile b/ipv6/tunslip6/Makefile index c8f341132..d379b5e93 100644 --- a/ipv6/tunslip6/Makefile +++ b/ipv6/tunslip6/Makefile @@ -22,8 +22,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk define Package/tunslip6 - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+kmod-slip TITLE:=tunslip6 from Contiki OS URL:=http://www.contiki-os.org/ diff --git a/ipv6/wide-dhcpv6/Makefile b/ipv6/wide-dhcpv6/Makefile index d44d0a828..3207fc49b 100644 --- a/ipv6/wide-dhcpv6/Makefile +++ b/ipv6/wide-dhcpv6/Makefile @@ -18,8 +18,8 @@ PKG_MD5SUM:=1011e165850fe40d3e332dad2bfd30b3 include $(INCLUDE_DIR)/package.mk define Package/wide-dhcpv6/Default - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=WIDE-DHCPv6 SUBMENU:=wide-dhcpv6 DEPENDS:=+kmod-ipv6 diff --git a/net/bird/Makefile b/net/bird/Makefile index 9658b62ce..6565f0106 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -76,15 +76,15 @@ endef define Package/bird6 $(call Package/bird/Default) - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE+= (IPv6) endef define Package/birdc6 $(call Package/birdc/Default) - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE+= (IPv6) DEPENDS+= +bird6 endef -- 2.11.0