5 files changed, 21 insertions, 43 deletions
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 $@ $^