libs/libnetfilter-queue: update to version 1.0.0

[packages.git] / libs / libnetfilter-queue / Makefile

diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile
index 56c11cc..9e2feb7 100644 (file)
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@@ -1,35 +1,41 @@
 #
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 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:=libnetfilter_queue
-PKG_VERSION:=0.0.13
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnetfilter_queue/
-PKG_MD5SUM:=660cbfd3dc8c10bf9b1803cd2b688256
+PKG_SOURCE_URL:= \
+       http://www.netfilter.org/projects/libnetfilter_queue/files/ \
+       ftp://ftp.netfilter.org/pub/libnetfilter_queue/ \
+       http://mirrors.evolva.ro/netfilter.org/libnetfilter_queue/
+PKG_MD5SUM:=af6a9ea350f63a13609bc3b47b5c395c
+
 PKG_FIXUP:=libtool
+PKG_REMOVE_FILES:=aclocal.m4 acinclude.m4 ltmain.sh
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libnetfilter-queue
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6 +libnfnetlink
-  TITLE:=libnetfilter_queue
-  URL:=http://www1.cs.columbia.edu/~angelos/libnetfilter_queue.html
+  DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nfnetlink-queue
+  TITLE:=API to packets queued by the kernel packet filter
+  URL:=http://www.netfilter.org/projects/libnetfilter_queue/
 endef
 
 define Package/libnetfilter-queue/description
-       libnetfilter_queue is a userspace library providing an API to packets
-       that have been queued by the kernel packet filter. It is is part of a system
-       that deprecates the old ip_queue / libipq mechanism.
+ libnetfilter_queue is a userspace library providing an API to packets
+ that have been queued by the kernel packet filter.
 endef
 
 TARGET_CFLAGS += $(FPIC)
@@ -39,15 +45,8 @@ CONFIGURE_ARGS += \
        --enable-shared \
 
 CONFIGURE_VARS += \
-       LIBNFNETLINK_CFLAGS="-I$(STAGING_DIR)/usr/include" \
-       LIBNFNETLINK_LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
+       LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
+       LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue
@@ -62,7 +61,7 @@ define Build/InstallDev
 
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_queue.pc \
                $(1)/usr/lib/pkgconfig/
 endef