miniupnpd: declare nftables variant as DEFAULT_VARIANT

Declare the nftables variant as the DEFAULT_VARIANT
as nftables firewall4 is the now default in OpenWrt.

Additionally,
 * toggle CONFLICTS placement to avoid circular dependency warning
 * use AUTORELEASE

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index deeac1ccdf2053ba3b8ba971f318117a9345169e..2a1372755e29a110ec4342aef0887b5a947bea7c 100644 (file)
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.2.3
-PKG_RELEASE:=2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -41,7 +41,6 @@ endef
 
 define Package/miniupnpd-iptables
   $(call Package/miniupnpd/Default)
-  CONFLICTS:=miniupnpd-nftables
   DEPENDS+= \
        +IPV6:ip6tables \
        +IPV6:libip6tc \
@@ -58,6 +57,8 @@ define Package/miniupnpd-nftables
        +libnftnl
   TITLE+= (nftables)
   VARIANT:=nftables
+  DEFAULT_VARIANT:=1
+  CONFLICTS:=miniupnpd-iptables
 endef
 
 define Package/miniupnpd/conffiles/Default