UPDATE mail/notmuch-0.33.2

Diff below updates notmuch to 0.33.2. Changelog can be found at [0].

Changes to the port:
- Bump minor of libnotmuch as several symbols have been added
- Patch a test so that we do not need gsed

Tests:
- Several tests fail because of seemingly failing LD_PRELOAD=shim. I'm
not sure what the issue is. Maybe someone knows?
- Run tested on amd64 in combination with neomutt

Comments/OK?

[0] https://git.notmuchmail.org/git?p=notmuch;a=blob;f=NEWS;h=d3010ebe49e4fe9b9de2a4302f4e8a75fe207263;hb=3c60a25c6dcc4d594b66c0f8acd3e84b82a6f42d


diff --git Makefile.inc Makefile.inc
index df270a194a3..35a3f5af536 100644
--- Makefile.inc
+++ Makefile.inc
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.5 2021/03/14 19:50:49 bket Exp $

-V = 0.31.4
+V = 0.33.2
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz

diff --git notmuch/Makefile notmuch/Makefile
index 878e324025c..d4f627982cc 100644
--- notmuch/Makefile
+++ notmuch/Makefile
@@ -6,9 +6,7 @@ COMMENT-emacs = Emacs bindings for notmuch
PKGNAME-main = notmuch-${V}
PKGNAME-emacs = notmuch-emacs-${V}

-REVISION = 0
-
-SHARED_LIBS += notmuch 1.0
+SHARED_LIBS += notmuch 1.1

MULTI_PACKAGES = -main -emacs
DEBUG_PACKAGES = -main
diff --git notmuch/distinfo notmuch/distinfo
index f638cb4bfd9..745ece3d8d0 100644
--- notmuch/distinfo
+++ notmuch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.31.4.tar.xz) = hmG2ZWdmD9YwrxDEZHwwMn/dGzSpiMq4DWFDKKW3T1U=
-SIZE (notmuch-0.31.4.tar.xz) = 713888
+SHA256 (notmuch-0.33.2.tar.xz) = JEiS9qtSqE9rATs4fNZlLUYe/9NrFO+eV2YEtYULLK4=
+SIZE (notmuch-0.33.2.tar.xz) = 733228
diff --git notmuch/patches/patch-lib_Makefile_local notmuch/patches/patch-lib_Makefile_local
index 45049db37d5..56306b67b2a 100644
--- notmuch/patches/patch-lib_Makefile_local
+++ notmuch/patches/patch-lib_Makefile_local
@@ -26,7 +26,7 @@ Index: lib/Makefile.local
endif
ifeq ($(LIBDIR_IN_LDCONFIG),1)
ifeq ($(DESTDIR),)
-@@ -69,19 +73,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
+@@ -73,19 +77,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
$(dir)/$(LIBNAME): $(libnotmuch_modules) util/libnotmuch_util.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a

diff --git notmuch/patches/patch-test_T400-hooks_sh notmuch/patches/patch-test_T400-hooks_sh
new file mode 100644
index 00000000000..07acb42d02d
--- /dev/null
+++ notmuch/patches/patch-test_T400-hooks_sh
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: test/T400-hooks.sh
+--- test/T400-hooks.sh.orig
++++ test/T400-hooks.sh
+@@ -194,7 +194,7 @@ EOF
+ generate_message '[subject]="add msg in new"'
+ NOTMUCH_NEW
+ notmuch search id:$id1 or id:$gen_msg_id | notmuch_search_sanitize > OUTPUT
+- cat <<EOF | sed s'/^[ \t]*//' > EXPECTED
++ cat <<EOF | sed s'/^[ ]*//' > EXPECTED
+ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; add msg in pre-new (inbox unread)
+ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; add msg in new (inbox unread)
+ EOF
diff --git py-notmuch/distinfo py-notmuch/distinfo
index f638cb4bfd9..745ece3d8d0 100644
--- py-notmuch/distinfo
+++ py-notmuch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.31.4.tar.xz) = hmG2ZWdmD9YwrxDEZHwwMn/dGzSpiMq4DWFDKKW3T1U=
-SIZE (notmuch-0.31.4.tar.xz) = 713888
+SHA256 (notmuch-0.33.2.tar.xz) = JEiS9qtSqE9rATs4fNZlLUYe/9NrFO+eV2YEtYULLK4=
+SIZE (notmuch-0.33.2.tar.xz) = 733228