merge madwifi r2591 for rxantenna selection

[openwrt.git] / package / ipset / Makefile

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index b5b9c78..bcc8084 100644 (file)
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -1,30 +1,43 @@
+# 
+# Copyright (C) 2006 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
 # $Id$
 #
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ipset

-PKG_VERSION:=2.2.3
-PKG_RELEASE:=1
+PKG_VERSION:=2.2.9a
+PKG_RELEASE:=2

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/ipset-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20061009.tar.bz2

 PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_SOURCE_URL:=http://ipset.netfilter.org

-PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
-PKG_CAT:=bzcat
+PKG_MD5SUM:=74ce3226b30cdd386630250bdc3488ef

 
 

-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk

 
 define Package/ipset
 
 define Package/ipset

-SECTION:=base
-CATEGORY:=Network
-TITLE:=Netfilter ip sets administration utility
-DESCRIPTION:=Netfilter ip sets administration utility
-URL:=http://ipset.netfilter.org/
+  SECTION:=net
+  CATEGORY:=Network
+  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) \
 endef
 
 define Package/ipset/install
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               DESTDIR=$(1) PREFIX=/usr install
+               DESTDIR="$(1)" \
+               PREFIX="/usr" \
+               install

        rm -rf $(1)/usr/man
 endef
 
        rm -rf $(1)/usr/man
 endef