X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a09f176b957773f112bd8dd4a6cb262b38eeb051..99d53e81cb6e1d1cd251ca30cf3f61361985fd3d:/package/ipset/Makefile

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 7f7900af4..a69cbd347 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -1,34 +1,45 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 #
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ipset
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.3.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=e760bc3ba45420118086428af4fd3b61
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20070828.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:=9e17798dfd8ed87c63a1f3498f9fe64d
+
+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)" \
+		KERNEL_DIR="$(LINUX_DIR)" \
+		PREFIX="/usr" \
+	)
+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" \
+		install
+	rm -rf $(1)/usr/man
+endef
 
+$(eval $(call BuildPackage,ipset))