diff -uNpr /usr/ports/mail/neomutt/Makefile
/build/usr/ports/mail/neomutt/Makefile
--- /usr/ports/mail/neomutt/Makefile Tue Jul 28 23:54:23 2020
+++ /build/usr/ports/mail/neomutt/Makefile Fri Aug 7 23:46:50 2020
@@ -26,7 +26,7 @@ BUILD_DEPENDS+= textproc/docbook-xsl \
DEBUG_PACKAGES= ${BUILD_PACKAGES}
SEPARATE_BUILD= Yes
-FLAVORS= gpgme sasl
+FLAVORS= gpgme sasl notmuch
FLAVOR?=
CONFIGURE_STYLE= simple
@@ -63,6 +63,12 @@ WANTLIB+= assuan gpg-error gpgme sqlite3
CONFIGURE_ARGS+= --sasl
LIB_DEPENDS+= security/cyrus-sasl2
WANTLIB+= sasl2
+.endif
+
+.if ${FLAVOR:Mnotmuch}
+CONFIGURE_ARGS+= --notmuch
+LIB_DEPENDS+= mail/notmuch/notmuch,-main
+WANTLIB+= notmuch
.endif
post-install:
diff -uNpr /usr/ports/mail/neomutt/patches/patch-notmuch_private_h
/build/usr/ports/mail/neomutt/patches/patch-notmuch_private_h
--- /usr/ports/mail/neomutt/patches/patch-notmuch_private_h Thu Jan 1
01:00:00 1970
+++ /build/usr/ports/mail/neomutt/patches/patch-notmuch_private_h Fri Aug
7 23:40:05 2020
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: notmuch/private.h
+--- notmuch/private.h.orig
++++ notmuch/private.h
+@@ -34,11 +34,7 @@
+ #endif
+
+ /* The definition in <notmuch.h> is broken */
+-#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro)
\
+- (LIBNOTMUCH_MAJOR_VERSION > (major) ||
\
+- (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION >
(minor)) || \
+- (LIBNOTMUCH_MAJOR_VERSION == (major) &&
\
+- LIBNOTMUCH_MINOR_VERSION == (minor) && LIBNOTMUCH_MICRO_VERSION >=
(micro)))
++#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro) (1>0)
+
+ extern const int NmUrlProtocolLen;
+
diff -uNpr /usr/ports/mail/neomutt/pkg/PLIST
/build/usr/ports/mail/neomutt/pkg/PLIST
--- /usr/ports/mail/neomutt/pkg/PLIST Fri May 15 10:19:08 2020
+++ /build/usr/ports/mail/neomutt/pkg/PLIST Sat Aug 8 22:34:35 2020
@@ -88,8 +88,6 @@ share/locale/cs/LC_MESSAGES/neomutt.mo
share/locale/da/LC_MESSAGES/neomutt.mo
share/locale/de/LC_MESSAGES/neomutt.mo
share/locale/el/LC_MESSAGES/neomutt.mo
-share/locale/en_GB/
-share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/neomutt.mo
share/locale/eo/LC_MESSAGES/neomutt.mo
share/locale/es/LC_MESSAGES/neomutt.mo
@@ -104,8 +102,6 @@ share/locale/id/LC_MESSAGES/neomutt.mo
share/locale/it/LC_MESSAGES/neomutt.mo
share/locale/ja/LC_MESSAGES/neomutt.mo
share/locale/ko/LC_MESSAGES/neomutt.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/neomutt.mo
share/locale/nl/LC_MESSAGES/neomutt.mo
share/locale/pl/LC_MESSAGES/neomutt.mo
