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`).

1 files changed, 4 insertions, 6 deletions

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.