-#
-# Copyright (C) 2007 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.
#
-# This Makefile is a skeleton
-#
-# $Id: $
include $(TOPDIR)/rules.mk
PKG_NAME:=nufw
-PKG_VERSION:=2.2.15
+PKG_VERSION:=2.2.21
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.nufw.org/download/nufw/
-PKG_MD5SUM:=ef9d335c2db263d85541379db7871f65
+PKG_MD5SUM:=7eb500e7ddb3db622dc6c5d43b495c9a
+
+PKG_FIXUP:=libtool
+PKG_REMOVE_FILES:=autogen.sh aclocal.m4
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
define Package/nufw/Default
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+glib2 +libgnutls +libsasl2 +libintl +libiconv +libnetfilter-queue
+ DEPENDS:=+glib2 +libgnutls +libsasl2 +libnetfilter-queue $(ICONV_DEPENDS) $(INTL_DEPENDS)
TITLE:=nufw
URL:=http://www.nufw.org/
endef
--with-libgcrypt-prefix="$(STAGING_DIR)/usr/" \
--with-libsasl-prefix="$(STAGING_DIR)/usr/"
+define Build/Configure
+ (cd $(PKG_BUILD_DIR) ; test -x ./autogen.sh && ./autogen.sh || true)
+ $(call Build/Configure/Default)
+endef
+
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
- CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libintl/include/ \
- -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include \
- -I$(STAGING_DIR)/usr/lib/libiconv/include" \
- LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib \
- -L$(STAGING_DIR)/usr/lib/libintl/lib \
- -L$(STAGING_DIR)/usr/lib/libiconv/lib \
+ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
+ -I$(INTL_PREFIX)/include \
+ -I$(ICONV_PREFIX)/include" \
+ LDFLAGS="$(TARGET_LDFLAGS) \
+ -L$(INTL_PREFIX)/lib \
+ -L$(ICONV_PREFIX)/lib \
-Wl,-rpath-link,$(STAGING_DIR)/usr/lib -liconv \
-lgnutls -lnetfilter_queue -lpthread" \
DESTDIR="$(PKG_INSTALL_DIR)" \