6 files changed, 19 insertions, 45 deletions
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 57955eac8c0..aec62abff76 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/08/26 13:33:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/11/22 23:55:33 wiz Exp $
 
-DISTNAME=	notmuch-0.20.2
+DISTNAME=	notmuch-0.21
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
-MAKE_FLAGS+=	PYTHONBIN=${PYTHONBIN}
+MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
 
 .include "options.mk"
 
@@ -36,9 +36,8 @@ SUBST_MESSAGE.sphinx=	Fix sphinx command names.
 
 LDFLAGS.SunOS+=	-lnsl
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # as of 0.19
 .include "../../lang/python/application.mk"
-.include "../../mail/gmime24/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../textproc/xapian/buildlink3.mk"
 .include "../../devel/talloc/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/mail/notmuch/PLIST b/mail/notmuch/PLIST
index dbf66101b9f..04e0c6b005b 100644
--- a/mail/notmuch/PLIST
+++ b/mail/notmuch/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2015/08/26 13:33:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/11/22 23:55:33 wiz Exp $
 bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.4
-lib/libnotmuch.so.4.2.0
+lib/libnotmuch.so.4.3.0
 man/man1/notmuch-address.1
 man/man1/notmuch-compact.1
 man/man1/notmuch-config.1
diff --git a/mail/notmuch/buildlink3.mk b/mail/notmuch/buildlink3.mk
index 34d2678fb9b..f146dce1a31 100644
--- a/mail/notmuch/buildlink3.mk
+++ b/mail/notmuch/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/11/19 13:06:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/11/22 23:55:33 wiz Exp $
 
 BUILDLINK_TREE+=	notmuch
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.notmuch+=	notmuch>=0.16
 BUILDLINK_ABI_DEPENDS.notmuch+=	notmuch>=0.16
 BUILDLINK_PKGSRCDIR.notmuch?=	../../mail/notmuch
 
-.include "../../mail/gmime24/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../textproc/xapian/buildlink3.mk"
 .endif	# NOTMUCH_BUILDLINK3_MK
 
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 359d9d21816..2b4188eb26a 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:27:11 agc Exp $
+$NetBSD: distinfo,v 1.9 2015/11/22 23:55:33 wiz Exp $
 
-SHA1 (notmuch-0.20.2.tar.gz) = 1aba10c86af29cc5b372b81f1780290bebff7f26
-RMD160 (notmuch-0.20.2.tar.gz) = 8224050c08c5968cfe5c6818285337a49a6a0769
-SHA512 (notmuch-0.20.2.tar.gz) = 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75
-Size (notmuch-0.20.2.tar.gz) = 652945 bytes
+SHA1 (notmuch-0.21.tar.gz) = 147108cde5c42f0026f593c90bd762b9fc2d4152
+RMD160 (notmuch-0.21.tar.gz) = a02742c5d20ba56678ff9510440dbff0717f077d
+SHA512 (notmuch-0.21.tar.gz) = 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a
+Size (notmuch-0.21.tar.gz) = 663600 bytes
 SHA1 (patch-Makefile.local) = fad3bf11d139a9e0207965803bf854670f8f4853
-SHA1 (patch-aa) = a02bb9f8b1adff7c2d29b5919f32dab24adaaa65
-SHA1 (patch-doc_Makefile.local) = 7ebf6f335e22d0a7ffe2a57f3d39ab26a8181c99
+SHA1 (patch-aa) = a4c815c0663fa6e5e8692ff14f50ecf9537dda9a
 SHA1 (patch-lib_Makefile.local) = c81920e239d1e26d4502e57c4e7fdbd3209b6325
 SHA1 (patch-notmuch-dump.c) = d85095239da2c7247113143d2668d6ca47bc324f
 SHA1 (patch-notmuch-restore.c) = 5f908d2ee146e29bd025eee36adb5997d897e9ea
diff --git a/mail/notmuch/patches/patch-aa b/mail/notmuch/patches/patch-aa
index 06fb8f97919..1da6a75aaf2 100644
--- a/mail/notmuch/patches/patch-aa
+++ b/mail/notmuch/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2015/08/26 13:33:36 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2015/11/22 23:55:33 wiz Exp $
 
 Install completion files into example directory.
 Accept zlib 1.2.3.
 
---- configure.orig	2015-06-27 13:05:31.000000000 +0000
+--- configure.orig	2015-10-30 10:14:41.000000000 +0000
 +++ configure
-@@ -349,9 +349,9 @@ if ! pkg-config --exists zlib; then
+@@ -411,9 +411,9 @@ if ! pkg-config --exists zlib; then
    rm -f compat/gen_zlib_pc
  fi
  
@@ -17,16 +17,7 @@ Accept zlib 1.2.3.
      printf "Yes.\n"
      have_zlib=1
      zlib_cflags=$(pkg-config --cflags zlib)
-@@ -377,7 +377,7 @@ fi
- printf "Checking for python... "
- have_python=0
- 
--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
+@@ -614,7 +614,7 @@ EOF
  	echo "	http://xapian.org/"
      fi
      if [ $have_zlib -eq 0 ]; then
@@ -35,7 +26,7 @@ Accept zlib 1.2.3.
  	echo "	http://zlib.net/"
  	echo
      fi
-@@ -845,10 +845,10 @@ HAVE_DOXYGEN=${have_doxygen}
+@@ -952,10 +952,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
deleted file mode 100644
index 8d81df3bd1a..00000000000
--- a/mail/notmuch/patches/patch-doc_Makefile.local
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_Makefile.local,v 1.3 2015/08/26 13:33:36 wiz Exp $
-
-Use proper python binary.
-
---- doc/Makefile.local.orig	2015-06-27 13:05:31.000000000 +0000
-+++ doc/Makefile.local
-@@ -7,7 +7,7 @@ SPHINXOPTS    := -q
- SPHINXBUILD   = sphinx-build
- DOCBUILDDIR      := $(dir)/_build
- 
--mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
-+mkdocdeps := ${PYTHONBIN} $(srcdir)/$(dir)/mkdocdeps.py
- 
- # Internal variables.
- ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)