From dfa300397afaf7e3e649158852a7fc8f465fc593 Mon Sep 17 00:00:00 2001
From: miqlas <miqlas@users.noreply.github.com>
Date: Tue, 21 Mar 2017 21:46:01 +0100
Subject: [PATCH] mutt: unbreak, cleanup, reorder, stuff. (#1236)

---
 mail-client/mutt/mutt-1.8.0.recipe | 53 ++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/mail-client/mutt/mutt-1.8.0.recipe b/mail-client/mutt/mutt-1.8.0.recipe
index 4f07d17ee..8b701984a 100644
--- a/mail-client/mutt/mutt-1.8.0.recipe
+++ b/mail-client/mutt/mutt-1.8.0.recipe
@@ -1,8 +1,5 @@
 SUMMARY="Small but very powerful text-based mail client"
 DESCRIPTION="A text-based email client for Unix-like systems. \
-It was originally written by Michael Elkins in 1995 and released \
-under the GNU General Public License version 2 or any later version.
-
 The Mutt slogan is All mail clients suck. This one just sucks less."
 HOMEPAGE="http://www.mutt.org/"
 COPYRIGHT="1996-2016 Michael R. Elkins
@@ -21,12 +18,12 @@ CHECKSUM_SHA256="45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967ada
 PATCHES="mutt-$portVersion.patchset"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	mutt$secondaryArchSuffix = $portVersion
-	cmd:mutt$secondaryArchSuffix = $portVersion
 	cmd:flea$secondaryArchSuffix = $portVersion
+	cmd:mutt$secondaryArchSuffix = $portVersion
 	cmd:muttbug$secondaryArchSuffix = $portVersion
 	cmd:pgpewrap$secondaryArchSuffix = $portVersion
 	cmd:pgpring$secondaryArchSuffix = $portVersion
@@ -34,31 +31,45 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libgpgme$secondaryArchSuffix
-	lib:libncurses$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libgpgme$secondaryArchSuffix
-	lib:libgpg_error$secondaryArch >= 0
-	lib:libgettextpo$secondaryArch
-	lib:libassuan$secondaryArch
-	lib:libintl$secondaryArch
+	cmd:gpg$secondaryArchSuffix
+	lib:libaspell$secondaryArchSuffix
 	lib:libassuan$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libgettextpo$secondaryArchSuffix
+	lib:libgnutls$secondaryArchSuffix
+	lib:libgpgme$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
+	lib:libgsasl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libidn$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libncurses$secondaryArchSuffix
-	devel:libiconv$secondaryArchSuffix
+	devel:libaspell$secondaryArchSuffix
+	devel:libassuan$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	devel:libgettextlib$secondaryArchSuffix
+	devel:libgnutls$secondaryArchSuffix
 	devel:libgpgme$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
-	devel:libgettextlib$secondaryArchSuffix
-	devel:libassuan$secondaryArchSuffix
+	devel:libgsasl$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libidn$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:autoreconf
+	cmd:awk
 	cmd:bison
 	cmd:gawk
 	cmd:gcc$secondaryArchSuffix
+	cmd:gpg$secondaryArchSuffix
 	cmd:gpgme_config$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
@@ -81,11 +92,17 @@ BUILD()
 	autoreconf -vfi
 
 	runConfigure configure \
+		--enable-compressed \
 		--enable-gpgme \
-		--enable-pop \
 		--enable-imap \
+		--enable-pop \
 		--enable-smtp \
+		--enable-sidebar \
+		--disable-warnings \
+		--with-gnutls \
+		--with-idn \
 		--with-regex \
+		--with-ssl \
 		--with-mailpath=/boot/home/mail/mutt
 
 	make $jobArgs