From: Markus Stenberg <fingon@iki.fi>
Date: Mon, 27 Jun 2016 21:25:51 +0000 (+0300)
Subject: Merge pull request #191 from lynxis/for-upstream
X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=500c4dc8e06cb88e7d28b51528283fa0f7314e32;hp=7ec8f06d6f34171630999328cc4179d003e6ef12

Merge pull request #191 from lynxis/for-upstream

replace kmod-ipv6 @IPV6
---

diff --git a/ahcpd/Makefile b/ahcpd/Makefile
index 96b8475..043c609 100644
--- a/ahcpd/Makefile
+++ b/ahcpd/Makefile
@@ -25,7 +25,7 @@ define Package/ahcpd
   TITLE:=Ad-Hoc Configuration Protocol daemon
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6 +ip +librt
+  DEPENDS:=@IPV6 +ip +librt
 endef
 
 define Package/ahcpd/description
diff --git a/alfred/Makefile b/alfred/Makefile
index f2ebe2c..8d651a5 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -28,7 +28,7 @@ define Package/alfred
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
-  DEPENDS:= +libc +kmod-ipv6 +librt \
+  DEPENDS:= +libc @IPV6 +librt \
 	  +ALFRED_NEEDS_lua:lua \
 	  +ALFRED_NEEDS_libgps:libgps
 endef
diff --git a/babeld/Makefile b/babeld/Makefile
index 88a7886..69fb1e9 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -25,7 +25,7 @@ define Package/babeld
   TITLE:=A loop-free distance-vector routing protocol
   URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+@IPV6
+  DEPENDS:=@IPV6
 endef
 
 define Package/babeld/description
diff --git a/hnetd/Makefile b/hnetd/Makefile
index ebba0e7..7fc8b9b 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -38,7 +38,7 @@ define Package/hnetd/Default
   TITLE:=HNCP Homenet daemon - $(2)
   URL:=https://github.com/sbyx/hnetd
   DEPENDS:=+odhcpd +odhcp6c +netifd $(3)
-  DEPENDS+=+@IPV6
+  DEPENDS+=@IPV6
   VARIANT:=$1
 endef
 
diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile
index d0c2f06..36faa8d 100644
--- a/minimalist-pcproxy/Makefile
+++ b/minimalist-pcproxy/Makefile
@@ -27,7 +27,7 @@ define Package/minimalist-pcproxy
   CATEGORY:=Network
   TITLE:=Lightweight PCP proxy
   URL:=https://github.com/fingon/minimalist-pcproxy
-  DEPENDS:=+libubox +@IPV6
+  DEPENDS:=+libubox @IPV6
 endef
 
 define Package/minimalist-pcproxy/description
diff --git a/ndppd/Makefile b/ndppd/Makefile
index ebc764c..b19edeb 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -32,7 +32,7 @@ define Package/ndppd
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
   MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
-  DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
+  DEPENDS:=@IPV6 $(CXX_DEPENDS)
 endef
 
 define Package/ndppd/description
diff --git a/pimbd/Makefile b/pimbd/Makefile
index 55aec74..9f97107 100644
--- a/pimbd/Makefile
+++ b/pimbd/Makefile
@@ -24,7 +24,7 @@ define Package/pimbd
   CATEGORY:=Network
   TITLE:=PIM BIDIR daemon
   URL:=https://github.com/Oryon/pimbd.git
-  DEPENDS+=+@IPV6
+  DEPENDS+=@IPV6
   DEPENDS+=netifd
 endef