packages: fold the IPv6 menu into Network

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36635

diff --git a/ipv6/6tunnel/Makefile b/ipv6/6tunnel/Makefile
index f864cd90500ade63573003424bf771416e6d3ba3..64809ad4ccef56ef3be2797a31b8847cad7234c4 100644 (file)
--- 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 3278371e389ad0efb3b6bb836c2957eac7b06dcc..95af352242e915d054da641c028e2db2674fad4b 100644 (file)
--- 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 <kerneis@pps.univ-paris-diderot.fr>

diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile
index b6f3fa3a376b9a475ed1b603fea5e00fdade86b4..0590ad0d8cfc27b9362e5e8ebfc28e1199080a25 100644 (file)
--- 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 056814a6dc5c7c94efaab24636f87a16257528c6..a82f024fc9df99b777249fe68739dd3100ea7ef2 100644 (file)
--- 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 4b104b81e282ddf5727fa7a5e67572b7b4cd97df..e6f88329f3b7aa22a5c84b19fd0535692d75f9f5 100644 (file)
--- 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 a505e404b8cd6b10293a2910f1544a715f5fc279..0584d6456c8c2dae4ce689f0f6219aff900de81c 100644 (file)
--- 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 0397f8a79f0b7067a4eaaef5ede2da6ca853391e..57c0a93b8848adadc0959a860ba33e682847cabd 100644 (file)
--- 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 7c26ed52557e2d278fa2b0f5d2d02058fc4994e3..8dba320a919e423eb875a98c6dbfce138992e5b0 100644 (file)
--- 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 b62caa443e346c7c2a2d666feef08311494eb406..00d8d9a1b73616744029d153f56dcd3c539b3765 100644 (file)
--- 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 249e96ade66c9bf580ef99c0ceac034d4d482db0..78b7f17cb877e46fb24277197d181cbd773a84e3 100644 (file)
--- 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 8ffcacb69c9de7c937e0e67d751a286996a4608e..b7c3282c32bacdc5555a6a926e8b6e48c4f95f0f 100644 (file)
--- 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 <kerneis@pps.jussieu.fr>

diff --git a/ipv6/ptrtd/Makefile b/ipv6/ptrtd/Makefile
index 4e1aa6503c57113d84f3945780467eaebb0d879d..c784518927bfa616a84cd4a4b432634691a078fc 100644 (file)
--- 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 571d9dee05b139b76b6882afc0fe495b837cb9ab..61d47c498dfadbdfed8be36c9c71dad149fc4a17 100644 (file)
--- 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 7f5d530259f7ee302b21ee70d0b89bbdd4270d80..34a1a4f0072b14d160a00efe2c5b37a5d229c38b 100644 (file)
--- 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 e082b8981a3637eaef07d66aa55415c4288e8d7f..2eb9c15b01bdfe4ea68ac3610eb1558885b80072 100644 (file)
--- 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 5d043ae38161ea3abd4e57c7b398ac2ccb5256b4..5e1a5df1ee39c8a7dcba8eb78af025b9e73520bb 100644 (file)
--- 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 e67bc572a5a8e3dae49354cf0588e77744f8b882..0a1dad5775672a0355724c153e7db6916f1ed096 100644 (file)
--- 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 8133f27daf577b369034ee67d1fe677af82dd165..d465300b4f73d24ba46f6c1069967e317bf195d8 100644 (file)
--- 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 c8f341132b8e39ea4692a14148d4d21e299d54e2..d379b5e93d0a9e6cdccbef236935eee0ef0dcd02 100644 (file)
--- 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 d44d0a828adeb91f59a7c731d69d41a738cdd41b..3207fc49b319514235f5c055f9b7692ee9f641ae 100644 (file)
--- 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 9658b62ce92690520390042c7b57702c42b6b240..6565f0106453571153a3c48c481200c8592d560f 100644 (file)
--- 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