Mutt: bump version (#2307)

* Mutt: bump version

* SASL: enable

* Cleanup, debug

mail-client/mutt/mutt-1.9.4.recipe

@@ -10,24 +10,31 @@ COPYRIGHT="1996-2016 Michael R. Elkins
 	1999-2002 Tommi Komulainen
 	2000-2004 Edmund Grimley Evans
 	2006-2009 Rocco Rutte
-	2014-2017 Kevin J. McCarthy"
+	2014-2018 Kevin J. McCarthy"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://bitbucket.org/mutt/mutt/downloads/mutt-$portVersion.tar.gz"
-CHECKSUM_SHA256="749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1"
+CHECKSUM_SHA256="f4d1bf26350c1ac81b551f98e5a4fd80d7fecd86919aa8165e69fde87de1b5df"
 PATCHES="mutt-$portVersion.patchset"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandBinDir=$prefix/bin
+	commandSuffix=
+fi
+
 PROVIDES="
 	mutt$secondaryArchSuffix = $portVersion
-	cmd:flea$secondaryArchSuffix = $portVersion
-	cmd:mutt$secondaryArchSuffix = $portVersion
-	cmd:muttbug$secondaryArchSuffix = $portVersion
-	cmd:pgpewrap$secondaryArchSuffix = $portVersion
-	cmd:pgpring$secondaryArchSuffix = $portVersion
-	cmd:smime_keys$secondaryArchSuffix = $portVersion
+	cmd:flea$commandSuffix = $portVersion
+	cmd:mutt$commandSuffix = $portVersion
+	cmd:muttbug$commandSuffix = $portVersion
+	cmd:pgpewrap$commandSuffix = $portVersion
+	cmd:pgpring$commandSuffix = $portVersion
+	cmd:smime_keys$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -44,6 +51,7 @@ REQUIRES="
 	lib:libidn$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
+#	lib:libsasl2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -60,6 +68,7 @@ BUILD_REQUIRES="
 	devel:libidn$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
+#	devel:libsasl2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -82,6 +91,11 @@ GLOBAL_WRITABLE_FILES="
 	settings/mime.types.dist keep-old
 	"
 
+defineDebugInfoPackage mutt$secondaryArchSuffix \
+	$commandBinDir/mutt \
+	$commandBinDir/pgpewrap \
+	$commandBinDir/pgpring
+
 BUILD()
 {
 	export CFLAGS="-D_BSD_SOURCE"
@@ -90,7 +104,7 @@ BUILD()
 	libtoolize --force --copy --install
 	autoreconf -vfi
 
-	runConfigure configure \
+	runConfigure --omit-dirs "binDir" configure \
 		--enable-compressed \
 		--enable-gpgme \
 		--enable-imap \
@@ -102,7 +116,8 @@ BUILD()
 		--with-idn \
 		--with-regex \
 		--with-ssl \
-		--with-mailpath=`finddir B_USER_DIRECTORY`/mail/mutt
+		--with-mailpath=`finddir B_USER_DIRECTORY`/mail/mutt \
+		--bindir=$commandBinDir
 
 	make $jobArgs
 }