diff --git a/mail-client/mutt/mutt-1.10.1.recipe b/mail-client/mutt/mutt-1.14.6.recipe similarity index 94% rename from mail-client/mutt/mutt-1.10.1.recipe rename to mail-client/mutt/mutt-1.14.6.recipe index 08d93df7a..4f9432e2c 100644 --- a/mail-client/mutt/mutt-1.10.1.recipe +++ b/mail-client/mutt/mutt-1.14.6.recipe @@ -12,9 +12,9 @@ COPYRIGHT="1996-2016 Michael R. Elkins 2006-2009 Rocco Rutte 2014-2018 Kevin J. McCarthy" LICENSE="GNU GPL v2" -REVISION="4" +REVISION="1" SOURCE_URI="https://bitbucket.org/mutt/mutt/downloads/mutt-$portVersion.tar.gz" -CHECKSUM_SHA256="734a3883158ec3d180cf6538d8bd7f685ce641d2cdef657aa0038f76e79a54a0" +CHECKSUM_SHA256="47972a0152b81b9f67ff322a0a6682b914c15545bfdeac6bcc2f2c0bf9361844" PATCHES="mutt-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 x86 x86_64" @@ -33,7 +33,7 @@ PROVIDES=" cmd:mutt$commandSuffix = $portVersion cmd:muttbug$commandSuffix = $portVersion cmd:pgpewrap$commandSuffix = $portVersion - cmd:pgpring$commandSuffix = $portVersion + cmd:mutt_pgpring$commandSuffix = $portVersion cmd:smime_keys$commandSuffix = $portVersion " REQUIRES=" @@ -94,7 +94,7 @@ GLOBAL_WRITABLE_FILES=" defineDebugInfoPackage mutt$secondaryArchSuffix \ $commandBinDir/mutt \ $commandBinDir/pgpewrap \ - $commandBinDir/pgpring + $commandBinDir/mutt_pgpring BUILD() { diff --git a/mail-client/mutt/patches/mutt-1.10.1.patchset b/mail-client/mutt/patches/mutt-1.10.1.patchset deleted file mode 100644 index 7a1800437..000000000 --- a/mail-client/mutt/patches/mutt-1.10.1.patchset +++ /dev/null @@ -1,27 +0,0 @@ -From 71de919e2ba5b93d8004047e32adc0186241827b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Mon, 26 Dec 2016 21:43:34 +0100 -Subject: [PATCH] Haiku patch - ---- - getdomain.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/getdomain.c b/getdomain.c -index 15803af..8abd415 100644 ---- a/getdomain.c -+++ b/getdomain.c -@@ -28,6 +28,10 @@ - - #include "mutt.h" - -+#ifdef __HAIKU__ -+#define _SC_HOST_NAME_MAX 72 -+#endif -+ - - int getdnsdomainname (char *d, size_t len) - { --- -2.10.2 - diff --git a/mail-client/mutt/patches/mutt-1.14.6.patchset b/mail-client/mutt/patches/mutt-1.14.6.patchset new file mode 100644 index 000000000..66e70810c --- /dev/null +++ b/mail-client/mutt/patches/mutt-1.14.6.patchset @@ -0,0 +1,23 @@ +From 5b516e78cc734558b1fb07b3095e5eabd2b432f4 Mon Sep 17 00:00:00 2001 +From: "Charles W. Ross" <15680744+cwross@users.noreply.github.com> +Date: Sun, 2 Aug 2020 17:28:35 -0600 +Subject: Add #ifdef for Haiku + + +diff --git a/getdomain.c b/getdomain.c +index a30a5dc..4b78644 100644 +--- a/getdomain.c ++++ b/getdomain.c +@@ -28,6 +28,9 @@ + + #include "mutt.h" + ++#ifdef __HAIKU__ ++#define _SC_HOST_NAME_MAX 72 ++#endif + + int getdnsdomainname (BUFFER *d) + { +-- +2.28.0 +