mail/notmuch: Update to 0.31

Changelog:	https://notmuchmail.org/news/release-0.31/

Add patch to fix a build issue with mail/notmuch-emacs.

7 files changed, 34 insertions, 9 deletions

diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index 791aa7211f3d..bfc9ac4e4b26 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -57,6 +57,8 @@ do-configure:
 		WITH_EMACS=1 \
 		${CONFIGURE_ARGS} \
 		> ${WRKSRC}/Makefile.config
+	@${PRINTF} "tags.add('WITH_EMACS')\nrsti_dir = '${WRKSRC}/emacs'\n" \
+		> ${WRKSRC}/sphinx.config
 
 post-install:
 	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index fda2e01eafd9..a642644cdfbe 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.30
+PORTVERSION=	0.31
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index abd0296513d6..118a77c51f25 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596897922
-SHA256 (notmuch-0.30.tar.xz) = 5e3baa6fe11d65c67e26ae488be11b320bae04e336acc9c64621f7e3449096fa
-SIZE (notmuch-0.30.tar.xz) = 711904
+TIMESTAMP = 1599486775
+SHA256 (notmuch-0.31.tar.xz) = 571fa0e1539c86612b1f2b2c80a398e08ecfef52e27ef7e48cf8e3b84fa18394
+SIZE (notmuch-0.31.tar.xz) = 713144
diff --git a/mail/notmuch/files/patch-configure b/mail/notmuch/files/patch-configure
index 5e7a55e6913c..c6a84bde029e 100644
--- a/mail/notmuch/files/patch-configure
+++ b/mail/notmuch/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2020-07-11 01:25:04 UTC
+--- configure.orig	2020-09-06 00:50:03 UTC
 +++ configure
-@@ -753,6 +753,7 @@ if command -v ${BASHCMD} > /dev/null; then
+@@ -734,6 +734,7 @@ if command -v ${BASHCMD} > /dev/null; then
      printf "Yes (%s).\n" "$bash_absolute"
  else
      have_bash=0
@@ -8,7 +8,7 @@
      printf "No. (%s not found)\n" "${BASHCMD}"
  fi
  
-@@ -763,6 +764,7 @@ if command -v ${PERL} > /dev/null; then
+@@ -744,6 +745,7 @@ if command -v ${PERL} > /dev/null; then
      printf "Yes (%s).\n" "$perl_absolute"
  else
      have_perl=0
diff --git a/mail/notmuch/files/patch-emacs_notmuch-emacs-mua b/mail/notmuch/files/patch-emacs_notmuch-emacs-mua
index 56878a4b1648..4274eac13c59 100644
--- a/mail/notmuch/files/patch-emacs_notmuch-emacs-mua
+++ b/mail/notmuch/files/patch-emacs_notmuch-emacs-mua
@@ -1,4 +1,4 @@
---- emacs/notmuch-emacs-mua.orig	2017-07-18 20:34:56 UTC
+--- emacs/notmuch-emacs-mua.orig	2020-09-06 00:50:03 UTC
 +++ emacs/notmuch-emacs-mua
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
@@ -33,3 +33,4 @@
 +if [ -z "$USE_EMACSCLIENT" ] || [ -n "$CREATE_FRAME" ] || [ -n "$NO_WINDOW" ]; then
      ELISP="${ELISP} (message-add-action #'save-buffers-kill-terminal 'exit)"
  fi
+ 
diff --git a/mail/notmuch/files/patch-emacs_notmuch-tree.el b/mail/notmuch/files/patch-emacs_notmuch-tree.el
new file mode 100644
index 000000000000..18409ea946b5
--- /dev/null
+++ b/mail/notmuch/files/patch-emacs_notmuch-tree.el
@@ -0,0 +1,22 @@
+From: William Casarin <jackbox55@gmail.com>
+
+Some are running into undeclarated function errors
+
+> emacs/notmuch-tree.el:1143:1:Warning: the following functions are
+>     not known to be defined: notmuch-search-previous-thread,
+>     notmuch-search-next-thread, notmuch-tree-from-search-thread
+
+Reported-by: Danilo G. Baio <dbaio@FreeBSD.org>
+Signed-off-by: William Casarin <jb55@jb55.com>
+--- emacs/notmuch-tree.el.orig	2020-09-06 00:50:03 UTC
++++ emacs/notmuch-tree.el
+@@ -41,6 +41,9 @@
+ (declare-function notmuch-read-query "notmuch" (prompt))
+ (declare-function notmuch-search-find-thread-id "notmuch" (&optional bare))
+ (declare-function notmuch-search-find-subject "notmuch" ())
++(declare-function notmuch-search-next-thread "notmuch" ())
++(declare-function notmuch-search-previous-thread "notmuch" ())
++(declare-function notmuch-tree-from-search-thread "notmuch" ())
+ 
+ ;; the following variable is defined in notmuch.el
+ (defvar notmuch-search-query-string)
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index 7a24b523c47f..6addac35fe37 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -21,7 +21,7 @@ bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.5
-lib/libnotmuch.so.5.2.0
+lib/libnotmuch.so.5.3.0
 share/bash-completion/completions/notmuch
 share/zsh/site-functions/_email-notmuch
 share/zsh/site-functions/_notmuch