From 4f0d508f2e3ad48bdc08a845d13b43e518607d9f Mon Sep 17 00:00:00 2001
From: VanStratum <arthur.van.stratum@gmail.com>
Date: Fri, 3 Jan 2020 18:40:36 +0100
Subject: [PATCH] imapfilter: implement changes suggested in #3836

Add service-setup script.
Change name of downloaded tgz.
Fix dependencies of the spk.
Add rule to compile on ppc platforms.
Remove beta status.
Move to diyspk.
---
 cross/imapfilter/Makefile              |  7 ++++++-
 cross/imapfilter/digests               |  6 +++---
 {spk => diyspk}/imapfilter/Makefile    |  6 +++---
 {spk => diyspk}/imapfilter/PLIST       |  0
 diyspk/imapfilter/src/service-setup.sh | 11 +++++++++++
 5 files changed, 23 insertions(+), 7 deletions(-)
 rename {spk => diyspk}/imapfilter/Makefile (78%)
 rename {spk => diyspk}/imapfilter/PLIST (100%)
 create mode 100644 diyspk/imapfilter/src/service-setup.sh

diff --git a/cross/imapfilter/Makefile b/cross/imapfilter/Makefile
index 2c6bb1827d9d..cb39cdc7c4e4 100644
--- a/cross/imapfilter/Makefile
+++ b/cross/imapfilter/Makefile
@@ -2,6 +2,7 @@ PKG_NAME = imapfilter
 PKG_VERS = 2.6.16
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/lefcha/$(PKG_NAME)/archive
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
@@ -12,6 +13,10 @@ DEPENDS = cross/openssl cross/lua cross/pcre
 HOMEPAGE = http://github.com/lefcha/imapfilter
 COMMENT  = An IMAP mail filtering utility using the Lua programming language as a configuration and extension language.
 LICENSE  = MIT
-UNSUPPORTED_ARCHS = ppc853x
+
+ifeq ($(findstring $(ARCH),powerpc ppc824x ppc853x ppc854x),$(ARCH))
+# PPC_ARCHES except QorIQ
+ADDITIONAL_CFLAGS = -DLUA_32BITS
+endif
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/imapfilter/digests b/cross/imapfilter/digests
index f9090586bd47..5969ee17923d 100644
--- a/cross/imapfilter/digests
+++ b/cross/imapfilter/digests
@@ -1,3 +1,3 @@
-v2.6.16.tar.gz SHA1 390f8e04c4f0b37620199f69ed531ed1bbcf6d7d
-v2.6.16.tar.gz SHA256 90af9bc9875e03fb5a09a3233287b74dd817867cb18ec9ff52fead615755563e
-v2.6.16.tar.gz MD5 3cb100fd8171c893079f9a969fea6db8
+imapfilter-2.6.16.tar.gz SHA1 390f8e04c4f0b37620199f69ed531ed1bbcf6d7d
+imapfilter-2.6.16.tar.gz SHA256 90af9bc9875e03fb5a09a3233287b74dd817867cb18ec9ff52fead615755563e
+imapfilter-2.6.16.tar.gz MD5 3cb100fd8171c893079f9a969fea6db8
diff --git a/spk/imapfilter/Makefile b/diyspk/imapfilter/Makefile
similarity index 78%
rename from spk/imapfilter/Makefile
rename to diyspk/imapfilter/Makefile
index 58de898c4b54..5f33f4052780 100644
--- a/spk/imapfilter/Makefile
+++ b/diyspk/imapfilter/Makefile
@@ -2,18 +2,18 @@ SPK_NAME = imapfilter
 SPK_VERS = 2.6.16
 SPK_REV = 1
 
-DEPENDS = cross/openssl cross/lua cross/pcre cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME)
 
 MAINTAINER = VanStratum
 DESCRIPTION = An IMAP mail filtering utility using the Lua programming language as a configuration and extension language.
 STARTABLE = no
 DISPLAY_NAME = Imapfilter
-BETA = 1
 
 HOMEPAGE = http://github.com/lefcha/imapfilter
 LICENSE  = MIT
 
 INSTALL_PREFIX = /usr/local
-UNSUPPORTED_ARCHS = ppc853x
+
+SERVICE_SETUP = src/service-setup.sh
 
 include ../../mk/spksrc.spk.mk
diff --git a/spk/imapfilter/PLIST b/diyspk/imapfilter/PLIST
similarity index 100%
rename from spk/imapfilter/PLIST
rename to diyspk/imapfilter/PLIST
diff --git a/diyspk/imapfilter/src/service-setup.sh b/diyspk/imapfilter/src/service-setup.sh
new file mode 100644
index 000000000000..91a890f6eb19
--- /dev/null
+++ b/diyspk/imapfilter/src/service-setup.sh
@@ -0,0 +1,11 @@
+service_postinst ()
+{
+    ln -s ${SYNOPKG_PKGDEST}/bin/imapfilter /usr/local/bin/imapfilter
+    ln -s ${SYNOPKG_PKGDEST}/share/imapfilter /usr/local/share/
+}
+
+service_postuninst ()
+{
+    rm /usr/local/bin/imapfilter
+    rm /usr/local/share/imapfilter
+}