nftables: add CONFLICT between versions

[openwrt/staging/dedeckeh.git] / package / network / utils / nftables / Makefile

diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile
index 7830596e847c35bd0b1e19a519d81c57facd3956..8f0fddaa0ea400a0da4ca03413d76c9dae45c25a 100644 (file)
--- a/package/network/utils/nftables/Makefile
+++ b/package/network/utils/nftables/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nftables
-PKG_VERSION:=0.9.6
+PKG_VERSION:=1.0.2
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
-PKG_HASH:=68d6fdfe8ab02303e6b1f13968a4022da5b0120110eaee3233d806857937b66e
+PKG_HASH:=0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0
 
@@ -45,6 +45,7 @@ define Package/nftables-nojson
   TITLE+= no JSON support
   VARIANT:=nojson
   DEFAULT_VARIANT:=1
+  CONFLICTS:=nftables-json
 endef
 
 define Package/nftables-json
@@ -61,6 +62,15 @@ endif
 TARGET_CFLAGS += -flto
 TARGET_LDFLAGS += -flto
 
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/nftables $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnftables.pc \
+               $(1)/usr/lib/pkgconfig/
+endef
+
 define Package/nftables/install/Default
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/nft $(1)/usr/sbin/