[scripts] metadata.pl: fix a bug where dependency flags (@ and +) from a dependency...

[openwrt.git] / package / ipset / Makefile

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 7f7900a..b7b4a31 100644 (file)
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -1,34 +1,48 @@
-# $Id$
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 #
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipset
-PKG_VERSION:=2.2.2
+PKG_VERSION:=3.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=e760bc3ba45420118086428af4fd3b61
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050720.tar.bz2
-PKG_BUILD_DIR:=$(BUILD_DIR)/ipset-$(PKG_VERSION)
-PKG_CAT:=bzcat
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,IPSET,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
-               CFLAGS="$(TARGET_CFLAGS) -Wall -I$(LINUX_DIR)/include -I." \
-               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr
-       touch $@
-
-$(IPKG_IPSET):
+PKG_MD5SUM:=0fd83af3efae5f72f5e5b55d07582941
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ipset
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=@!TARGET_etrax @LINUX_2_6
+  TITLE:=Netfilter ip sets administration utility
+  URL:=http://ipset.netfilter.org/
+endef
+
+define Build/Compile
+       $(call Build/Compile/Default, \
+               COPT_FLAGS="$(TARGET_CFLAGS)" \
+               LDFLAGS="-rdynamic -static-libgcc" \
+               KERNEL_DIR="$(LINUX_DIR)" \
+               PREFIX="/usr" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               binaries \
+       )
+endef
+
+define Package/ipset/install
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR=$(IDIR_IPSET) PREFIX=/usr install
-       rm -rf $(IDIR_IPSET)/usr/man
-       $(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR)
+               DESTDIR="$(1)" \
+               PREFIX="/usr" \
+               binaries_install
+       rm -rf $(1)/usr/man
+endef
 
+$(eval $(call BuildPackage,ipset))