[LEDE-DEV] [PATCH 2/2] mail: imapfilter: update imapfilter

[Tomasz Duszynski]

Update makefile to fetch imapfilter sources from project's repository and
build latest release.

Signed-off-by: Tomasz Duszynski <tduszyns at gmail.com>
---
 mail/imapfilter/Makefile | 51 ++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 19ee723..1925fe7 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,19 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=imapfilter
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.6.6
 PKG_RELEASE:=1

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://imapfilter.hellug.gr/source/
-PKG_MD5SUM:=09c6ffb085a5a244dc9f3e798259f341
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/lefcha/imapfilter.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=075444786c53772395b69987da69f71716099f26
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk

@@ -21,8 +28,8 @@ define Package/imapfilter
   SECTION:=mail
   CATEGORY:=Mail
   DEPENDS:=+liblua +libopenssl +libpcre
-  TITLE:=IMAP server based email filtering
-  URL:=http://imapfilter.hellug.gr/
+  TITLE:=A mail filtering utility for processing IMAP mailboxes
+  URL:=http://github.com/lefcha/imapfilter
 endef

 define Package/imapfilter/description
@@ -37,33 +44,21 @@ define Package/imapfilter/description
 	extension language.
 endef

-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		./configure \
-			-d /usr \
-	);
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		INCDIRS="$(TARGET_CPPFLAGS)" \
-		LIBDIRS="$(TARGET_LDFLAGS)" \
-		MYCFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
-		MYLDFLAGS="-lcrypt"
-endef
-
-define Package/imapfilter/conffiles
-/etc/imapfilter/config.lua
+	$(call Build/Compile/Default, \
+		DESTDIR=$(PKG_INSTALL_DIR) \
+		PREFIX="/usr" \
+		all install \
+	)
 endef

 define Package/imapfilter/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/imapfilter $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/imapfilter
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/sample.config.lua $(1)/etc/imapfilter/config.lua
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/imapfilter $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/share/imapfilter
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/{account,auxiliary,common,mailbox,message,options,regex,set,deprecated}.lua $(1)/usr/share/imapfilter/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/imapfilter/*.lua $(1)/usr/share/imapfilter/
+	$(INSTALL_DIR) $(1)/usr/share/imapfilter/samples
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/samples/{config,extend}.lua $(1)/usr/share/imapfilter/samples/
 endef

 $(eval $(call BuildPackage,imapfilter))
--
2.8.3