Update to 0.20.2:

Notmuch 0.20.2 (2015-06-27)
===========================

Emacs Interface
---------------

Bug fix for marking messages read in `notmuch-tree` mode.

Notmuch 0.20.1 (2015-06-01)
===========================

Test Suite
----------

Work around apparent gdb bug on arm64

Notmuch 0.20 (2015-05-31)
=========================

Command-Line Interface
----------------------

There is a new `mimetype:` search prefix

  The new `mimetype:` search prefix allows searching for the
  content-type of attachments, which is now indexed. See the
  `notmuch-search-terms` manual page for details.

Path to gpg is now configurable

  On systems with multiple versions of gpg, you can tell
  notmuch which one to use by setting `crypto.gpg_path`

Emacs
-----

Avoid rendering large text attachements.

Improved rendering of CID references in HTML.

Vim
---

Vim client now respects excluded tags.

Notmuch-Mutt
------------

Support messages without Message-IDs.

Library
-------

Undeprecate single message mboxes

  It seems more trouble to remove this feature than expected, so
  `notmuch new` will no longer nag about mboxes with a single message.

New error logging facility

  Clients should call `notmuch_database_status_string` to retrieve
  output formerly printed to stderr.

Several bug fixes related to stale iterators

New status code returning API for n_query_search_{messages,thread}

Fix for library `install_name` on Mac OS X

Fix for rounding of seconds

Documentation
-------------

Sphinx is now mandatory to build docs

  Support for using rst2man in place of sphinx to build the
  docmumentation has been removed.

Improved notmuch-search-terms.7

  The man page `notmuch-search-terms(7)` has been extended, merging
  some material from the relicensed wiki.

Contrib
-------

`notmuch-deliver` is removed. As far as we know, all functionality
previously provided by `notmuch-deliver` should now be provided by
`notmuch insert`, provided by the main notmuch binary.

nmbug-status
------------

`nmbug-status` now only matches local branches when reading
`status-config.json` from the `config` branch of the `NMBGIT`
repository.  To help new users running `nmbug-status`, `nmbug clone`
now creates a local `config` branch tracking `origin/config`.  Folks
who use `nmbug-status` with an in-Git config (i.e. you don't use the
`--config` option) who already have `NMBGIT` set up are encouraged to
run:

    git checkout config origin/config

in their `NMBGIT` repository (usually `~/.nmbug`).

8 files changed, 40 insertions, 63 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index ba4b122ce58..57955eac8c0 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/26 12:17:04 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/08/26 13:33:36 wiz Exp $
 
-DISTNAME=	notmuch-0.19
-PKGREVISION=	1
+DISTNAME=	notmuch-0.20.2
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -10,7 +9,7 @@ HOMEPAGE=	http://notmuchmail.org/
 COMMENT=	Mail indexer
 LICENSE=	gnu-gpl-v3
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
@@ -29,11 +28,11 @@ SUBST_FILES.gnuld=	lib/Makefile.local
 SUBST_SED.gnuld=	-e 's/-Wl,--[^ ]*//g'
 .endif
 
-SUBST_CLASSES+=		docutils
-SUBST_SED.docutils+=	-e "s,rst2man.py,rst2man-${PYVERSSUFFIX}.py,"
-SUBST_FILES.docutils+=	configure doc/prerst2man.py
-SUBST_STAGE.docutils=	pre-configure
-SUBST_MESSAGE.docutils=	Fix docutils command names.
+SUBST_CLASSES+=		sphinx
+SUBST_SED.sphinx+=	-e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
+SUBST_FILES.sphinx+=	bindings/python/docs/Makefile configure doc/Makefile.local
+SUBST_STAGE.sphinx=	pre-configure
+SUBST_MESSAGE.sphinx=	Fix sphinx command names.
 
 LDFLAGS.SunOS+=	-lnsl
 
diff --git a/mail/notmuch/PLIST b/mail/notmuch/PLIST
index dfd57d4c6c4..dbf66101b9f 100644
--- a/mail/notmuch/PLIST
+++ b/mail/notmuch/PLIST
@@ -1,14 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2014/11/19 13:06:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/08/26 13:33:36 wiz Exp $
 bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.4
-lib/libnotmuch.so.4.1.0
+lib/libnotmuch.so.4.2.0
 man/man1/notmuch-address.1
 man/man1/notmuch-compact.1
 man/man1/notmuch-config.1
 man/man1/notmuch-count.1
 man/man1/notmuch-dump.1
+man/man1/notmuch-emacs-mua.1
 man/man1/notmuch-insert.1
 man/man1/notmuch-new.1
 man/man1/notmuch-reply.1
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index d480c5940af..03f76ca2ebc 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.6 2014/12/18 10:52:58 joerg Exp $
+$NetBSD: distinfo,v 1.7 2015/08/26 13:33:36 wiz Exp $
 
-SHA1 (notmuch-0.19.tar.gz) = df023988f67e329357a5e8d00c4f6fc71249b89f
-RMD160 (notmuch-0.19.tar.gz) = 850fb63960abf5f5d4433683ce21e80cdf1205cb
-Size (notmuch-0.19.tar.gz) = 659038 bytes
-SHA1 (patch-Makefile.local) = 4759dff68d23b47b5bf32ee34477defb3e586a57
-SHA1 (patch-aa) = e60ea5f6ad2f14ddfde6c795775aeb537e13489e
-SHA1 (patch-doc_Makefile.local) = 3c066de7c4686e1fd513437415bfa61ecf4f2cce
-SHA1 (patch-doc_prerst2man.py) = 90e0dd66e19ee4247b63872ebc8b1b9a5e02748c
-SHA1 (patch-lib_Makefile.local) = 965f8722958017cc86b6eaf955cfd7f4db322114
+SHA1 (notmuch-0.20.2.tar.gz) = 1aba10c86af29cc5b372b81f1780290bebff7f26
+RMD160 (notmuch-0.20.2.tar.gz) = 8224050c08c5968cfe5c6818285337a49a6a0769
+Size (notmuch-0.20.2.tar.gz) = 652945 bytes
+SHA1 (patch-Makefile.local) = fad3bf11d139a9e0207965803bf854670f8f4853
+SHA1 (patch-aa) = a02bb9f8b1adff7c2d29b5919f32dab24adaaa65
+SHA1 (patch-doc_Makefile.local) = 7ebf6f335e22d0a7ffe2a57f3d39ab26a8181c99
+SHA1 (patch-lib_Makefile.local) = c81920e239d1e26d4502e57c4e7fdbd3209b6325
 SHA1 (patch-notmuch-dump.c) = d85095239da2c7247113143d2668d6ca47bc324f
 SHA1 (patch-notmuch-restore.c) = 5f908d2ee146e29bd025eee36adb5997d897e9ea
 SHA1 (patch-util_Makefile.local) = 1dcf152c0aba329e5e309c98042bd14f9a733714
diff --git a/mail/notmuch/patches/patch-Makefile.local b/mail/notmuch/patches/patch-Makefile.local
index 2373ea4ec10..1f75ab88a9f 100644
--- a/mail/notmuch/patches/patch-Makefile.local
+++ b/mail/notmuch/patches/patch-Makefile.local
@@ -1,4 +1,6 @@
-$NetBSD: patch-Makefile.local,v 1.1 2014/12/18 12:26:51 joerg Exp $
+$NetBSD: patch-Makefile.local,v 1.2 2015/08/26 13:33:36 wiz Exp $
+
+Avoid conflict with NetBSD's libutil.
 
 --- Makefile.local.orig	2014-12-15 20:14:52.000000000 +0000
 +++ Makefile.local
diff --git a/mail/notmuch/patches/patch-aa b/mail/notmuch/patches/patch-aa
index 6f558577e58..06fb8f97919 100644
--- a/mail/notmuch/patches/patch-aa
+++ b/mail/notmuch/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2014/12/18 10:52:58 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2015/08/26 13:33:36 wiz Exp $
 
 Install completion files into example directory.
 Accept zlib 1.2.3.
 
---- configure.orig	2014-05-06 07:27:29.000000000 +0000
+--- configure.orig	2015-06-27 13:05:31.000000000 +0000
 +++ configure
 @@ -349,9 +349,9 @@ if ! pkg-config --exists zlib; then
    rm -f compat/gen_zlib_pc
@@ -17,16 +17,16 @@ Accept zlib 1.2.3.
      printf "Yes.\n"
      have_zlib=1
      zlib_cflags=$(pkg-config --cflags zlib)
-@@ -436,7 +436,7 @@ else
-     have_sphinx=0
+@@ -377,7 +377,7 @@ fi
+ printf "Checking for python... "
+ have_python=0
  
-     printf "Checking if rst2man is available... "
--    if rst2man -V > /dev/null 2>&1; then
-+    if rst2man.py -V > /dev/null 2>&1; then
-        printf "Yes.\n"
-        have_rst2man=1
-     else
-@@ -527,7 +527,7 @@ EOF
+-for name in python python2 python3; do
++for name in python python2 python2.7 python3 python3.3 python3.4 ; do
+     if command -v $name > /dev/null; then
+ 	have_python=1
+ 	python=$name
+@@ -537,7 +537,7 @@ EOF
  	echo "	http://xapian.org/"
      fi
      if [ $have_zlib -eq 0 ]; then
@@ -35,7 +35,7 @@ Accept zlib 1.2.3.
  	echo "	http://zlib.net/"
  	echo
      fi
-@@ -835,10 +835,10 @@ HAVE_DOXYGEN=${have_doxygen}
+@@ -845,10 +845,10 @@ HAVE_DOXYGEN=${have_doxygen}
  desktop_dir = \$(prefix)/share/applications
  
  # The directory to which bash completions files should be installed
diff --git a/mail/notmuch/patches/patch-doc_Makefile.local b/mail/notmuch/patches/patch-doc_Makefile.local
index 7a53ac18b54..8d81df3bd1a 100644
--- a/mail/notmuch/patches/patch-doc_Makefile.local
+++ b/mail/notmuch/patches/patch-doc_Makefile.local
@@ -1,16 +1,14 @@
-$NetBSD: patch-doc_Makefile.local,v 1.2 2014/09/01 08:14:07 wiz Exp $
+$NetBSD: patch-doc_Makefile.local,v 1.3 2015/08/26 13:33:36 wiz Exp $
 
-Call correct python binary.
+Use proper python binary.
 
---- doc/Makefile.local.orig	2014-05-06 07:27:29.000000000 +0000
+--- doc/Makefile.local.orig	2015-06-27 13:05:31.000000000 +0000
 +++ doc/Makefile.local
-@@ -7,8 +7,8 @@ SPHINXOPTS    := -q
+@@ -7,7 +7,7 @@ SPHINXOPTS    := -q
  SPHINXBUILD   = sphinx-build
  DOCBUILDDIR      := $(dir)/_build
  
--prerst2man := python $(srcdir)/$(dir)/prerst2man.py
 -mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
-+prerst2man := ${PYTHONBIN} $(srcdir)/$(dir)/prerst2man.py
 +mkdocdeps := ${PYTHONBIN} $(srcdir)/$(dir)/mkdocdeps.py
  
  # Internal variables.
diff --git a/mail/notmuch/patches/patch-doc_prerst2man.py b/mail/notmuch/patches/patch-doc_prerst2man.py
deleted file mode 100644
index f8887ec3151..00000000000
--- a/mail/notmuch/patches/patch-doc_prerst2man.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-doc_prerst2man.py,v 1.2 2014/09/01 08:14:07 wiz Exp $
-
-Fix rst2man executable name.
-
---- doc/prerst2man.py.orig	2014-05-06 07:27:29.000000000 +0000
-+++ doc/prerst2man.py
-@@ -59,5 +59,5 @@ for page in man_pages:
-     outfile.write("".join(lines))
-     outfile.close()
- 
--    system('set -x; rst2man {0} {1}/{2}.{3}'
-+    system('set -x; rst2man.py {0} {1}/{2}.{3}'
-            .format(filename, outdir, page[0], page[4]))
diff --git a/mail/notmuch/patches/patch-lib_Makefile.local b/mail/notmuch/patches/patch-lib_Makefile.local
index 080d66b684f..ed6d99d1940 100644
--- a/mail/notmuch/patches/patch-lib_Makefile.local
+++ b/mail/notmuch/patches/patch-lib_Makefile.local
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Makefile.local,v 1.2 2014/12/18 10:52:58 joerg Exp $
+$NetBSD: patch-lib_Makefile.local,v 1.3 2015/08/26 13:33:36 wiz Exp $
 
 * On Mac OS X (Darwin), for the install_name of the notmuch shared
   library, use the full path rather than just the file name.  This
@@ -11,17 +11,8 @@ $NetBSD: patch-lib_Makefile.local,v 1.2 2014/12/18 10:52:58 joerg Exp $
 
 * Don't overlap with BSD's libutil.
 
---- lib/Makefile.local.orig	2014-11-14 19:35:40.000000000 +0000
+--- lib/Makefile.local.orig	2015-06-27 13:05:31.000000000 +0000
 +++ lib/Makefile.local
-@@ -27,7 +27,7 @@ LIBRARY_SUFFIX = dylib
- LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
- SONAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBRARY_SUFFIX)
- LIBNAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE).$(LIBRARY_SUFFIX)
--LIBRARY_LINK_FLAG = -dynamiclib -install_name $(SONAME) -compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) -current_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
-+LIBRARY_LINK_FLAG = -dynamiclib -install_name $(libdir)/$(SONAME) -compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) -current_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
- else
- LIBRARY_SUFFIX = so
- LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
 @@ -76,8 +76,8 @@ libnotmuch_modules := $(libnotmuch_c_src
  $(dir)/libnotmuch.a: $(libnotmuch_modules)
  	$(call quiet,AR) rcs $@ $^