notmuch: Update to 0.34

* Buildlink to textproc/sfsexp for S-expression search.

Changelog:
Notmuch 0.34 (2021-10-20)
=========================

General
-------

An optional new s-expression based query parser is available if
notmuch is built with the `sfsexp` library. See
notmuch-sexp-queries(7) for syntax, and use `notmuch config get
built_with.sexpr_queries` to check if notmuch is compiled with
s-expression query support.

CLI
---

Support multiple `Delivered-To` headers in notmuch-reply(1).

Emacs
-----

Functions are now allowed in `notmuch-search-result-format`.

Improvements to unthreaded view on large threads.

Tolerate bad/missing working directory for most commands.

Allow customization of tree drawing symbols in notmuch-tree mode.

4 files changed, 31 insertions, 28 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index c65b18c7abe..1e6d96529bb 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2021/10/05 06:56:48 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2021/11/01 14:17:32 ryoon Exp $
 
-DISTNAME=	notmuch-0.33.2
+DISTNAME=	notmuch-0.34
 CATEGORIES=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -47,6 +47,7 @@ SUBST_VARS.gpg=		GPGME_GPG
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
+.include "../../devel/sfsexp/buildlink3.mk"
 .include "../../lang/python/application.mk"
 BUILDLINK_API_DEPENDS.gmime3+=	gmime3>=3.0.3
 .include "../../mail/gmime3/buildlink3.mk"
diff --git a/mail/notmuch/PLIST b/mail/notmuch/PLIST
index 5d34d3d7601..c6b1d7603a8 100644
--- a/mail/notmuch/PLIST
+++ b/mail/notmuch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2021/08/23 03:24:38 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.22 2021/11/01 14:17:32 ryoon Exp $
 bin/notmuch
 ${PLIST.emacs}bin/notmuch-emacs-mua
 include/notmuch.h
@@ -18,12 +18,13 @@ ${PLIST.doc}info/notmuch-reply.info
 ${PLIST.doc}info/notmuch-restore.info
 ${PLIST.doc}info/notmuch-search-terms.info
 ${PLIST.doc}info/notmuch-search.info
+${PLIST.doc}info/notmuch-sexp-queries.info
 ${PLIST.doc}info/notmuch-show.info
 ${PLIST.doc}info/notmuch-tag.info
 ${PLIST.doc}info/notmuch.info
 lib/libnotmuch.so
 lib/libnotmuch.so.5
-lib/libnotmuch.so.5.4.0
+lib/libnotmuch.so.5.5.0
 ${PLIST.doc}man/man1/notmuch-address.1
 ${PLIST.doc}man/man1/notmuch-compact.1
 ${PLIST.doc}man/man1/notmuch-config.1
@@ -43,6 +44,7 @@ ${PLIST.doc}man/man1/notmuch.1
 ${PLIST.doc}man/man5/notmuch-hooks.5
 ${PLIST.doc}man/man7/notmuch-properties.7
 ${PLIST.doc}man/man7/notmuch-search-terms.7
+${PLIST.doc}man/man7/notmuch-sexp-queries.7
 ${PLIST.emacs}share/applications/notmuch-emacs-mua.desktop
 ${PLIST.emacs}share/emacs/site-lisp/coolj.el
 ${PLIST.emacs}share/emacs/site-lisp/coolj.elc
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 1462d4358f4..f76f789c29f 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.59 2021/10/26 10:54:10 nia Exp $
+$NetBSD: distinfo,v 1.60 2021/11/01 14:17:32 ryoon Exp $
 
-BLAKE2s (notmuch-0.33.2.tar.xz) = 4d98e89f09d397204fa8a8c0b850291f975b6aa20930ae0b4df9c5717f8a2da3
-SHA512 (notmuch-0.33.2.tar.xz) = 15f4ecbd991df3a64c2b89aeb6bf7649e76ff2010f80120a15c10c9c5e913a90696ef6a760cbea24bbc9a3ca8cae18fada13d80e69c848cc142d355f2a513f5d
-Size (notmuch-0.33.2.tar.xz) = 733228 bytes
-SHA1 (patch-configure) = b99a3c51e1d4521489a927469398e90ac14a156f
+BLAKE2s (notmuch-0.34.tar.xz) = 587a60b7d956aef8c91adf960dd4cbeb90969ccb61706203387c6e9bfcde3e38
+SHA512 (notmuch-0.34.tar.xz) = c7c802ee6fc056cb626611e3403541e404c628d238983299faf877e7eca9dfb94bd643c399e6a6cda53b051d2ad837ad03b124a1f44e17c7637a9c9b23e33c73
+Size (notmuch-0.34.tar.xz) = 748232 bytes
+SHA1 (patch-configure) = 93831007eb3ffac12612d12f772e8a0ac0115207
 SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c
diff --git a/mail/notmuch/patches/patch-configure b/mail/notmuch/patches/patch-configure
index 40758d22b4b..0e83a07a068 100644
--- a/mail/notmuch/patches/patch-configure
+++ b/mail/notmuch/patches/patch-configure
@@ -1,40 +1,40 @@
-$NetBSD: patch-configure,v 1.5 2021/09/30 13:18:17 jperkin Exp $
+$NetBSD: patch-configure,v 1.6 2021/11/01 14:17:32 ryoon Exp $
 
 * Select GnuPG binary
 * Don't let CDPATH affect the build
 * Ignore errors for gpgme tests, can be affected by running gpg-agent
 
---- configure.orig	2021-09-30 11:28:49.000000000 +0000
+--- configure.orig	2021-10-20 14:25:35.000000000 +0000
 +++ configure
 @@ -499,7 +499,7 @@ EOF
-         printf 'No.\nCould not make tempdir for testing session-key support.\n'
-         errors=$((errors + 1))
+ 	printf 'No.\nCould not make tempdir for testing session-key support.\n'
+ 	errors=$((errors + 1))
      elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
--           && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
-+           && GNUPGHOME=${TEMP_GPG} @GPGME_GPG@ --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
-            && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
-            && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+-	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
++	   && GNUPGHOME=${TEMP_GPG} @GPGME_GPG@ --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+ 	   && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+ 	   && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
      then
 @@ -591,7 +591,6 @@ is later than 3.2.7, which should have f
  Please follow up on https://github.com/jstedfast/gmime/pull/90 with
  more details.
  EOF
--                errors=$((errors + 1))
-             fi
-         fi
+-		errors=$((errors + 1))
+ 	    fi
+ 	fi
      else
 @@ -650,7 +649,7 @@ EOF
-         printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
-         errors=$((errors + 1))
+ 	printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
+ 	errors=$((errors + 1))
      elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
--            && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
-+            && GNUPGHOME=${TEMP_GPG} @GPGME_GPG@ --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
-             && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
+-	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
++	    && GNUPGHOME=${TEMP_GPG} @GPGME_GPG@ --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+ 	    && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
      then
-         if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
-@@ -1536,7 +1535,7 @@ EOF
+ 	if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
+@@ -1576,7 +1575,7 @@ EOF
      if [ $WITH_PYTHON_DOCS = "1" ]; then
-         echo "tags.add('WITH_PYTHON')"
+ 	echo "tags.add('WITH_PYTHON')"
      fi
 -    printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)"
 +    printf "rsti_dir = '%s'\n" "$(unset CDPATH && cd emacs && pwd -P)"