4 files changed, 27 insertions, 21 deletions
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index ec30b3042f1..88db216559a 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2017/03/12 20:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/03/20 13:19:26 wiz Exp $
 
-DISTNAME=	notmuch-0.23.7
-PKGREVISION=	1
+DISTNAME=	notmuch-0.24
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 67a898d3b25..75de848d912 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.20 2017/03/12 20:51:13 wiz Exp $
+$NetBSD: distinfo,v 1.21 2017/03/20 13:19:26 wiz Exp $
 
-SHA1 (notmuch-0.23.7.tar.gz) = 07eca222977488051cb7fcd3f2238da355c5ec1c
-RMD160 (notmuch-0.23.7.tar.gz) = 681d6bdbbf4db692934d63b4dc3a37cbb221ae6b
-SHA512 (notmuch-0.23.7.tar.gz) = e71da3bd6ce1b344aae79b277b695a4668d4fe1b8838618d6970a0b27df9867bac66a3240473ef31fc30ed8af2b0a558203ed5ffb34da873c991b1ecc6c08522
-Size (notmuch-0.23.7.tar.gz) = 692230 bytes
-SHA1 (patch-Makefile.local) = cab8635a8ff1f2f2e7dc45f2c853f90553c28606
+SHA1 (notmuch-0.24.tar.gz) = 76c890ac3719f78dbcc5c4a434a7383290ce4817
+RMD160 (notmuch-0.24.tar.gz) = be5156827b596ba87f3d1f204903c217655718a8
+SHA512 (notmuch-0.24.tar.gz) = f966b4faf96b165cc04be15a90681fabfe7ce66a0a9255183f9e4542556836adb7acfe8c02033db3ad8af6cb8962d1a64da8cdd03a0485b104a7b40b88b598d5
+Size (notmuch-0.24.tar.gz) = 708243 bytes
+SHA1 (patch-Makefile.global) = 848213d8914c59d2786c74eee71df5c7599c17ec
+SHA1 (patch-Makefile.local) = e5a11e3fd7470f745fccb3086fb864c2068f55a7
 SHA1 (patch-aa) = 90414224b80703587d211c8b56bfba0cbe1377b6
 SHA1 (patch-lib_Makefile.local) = 84ebfe1a57647e590f923d727d206b5f4687e1ce
 SHA1 (patch-util_Makefile.local) = 1dcf152c0aba329e5e309c98042bd14f9a733714
diff --git a/mail/notmuch/patches/patch-Makefile.global b/mail/notmuch/patches/patch-Makefile.global
new file mode 100644
index 00000000000..79fb7b5676f
--- /dev/null
+++ b/mail/notmuch/patches/patch-Makefile.global
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.global,v 1.1 2017/03/20 13:19:27 wiz Exp $
+
+Change library name to myutil to avoid conflict with NetBSD's.
+
+--- Makefile.global.orig	2017-03-13 01:31:16.000000000 +0000
++++ Makefile.global
+@@ -52,7 +52,7 @@ PV_FILE=bindings/python/notmuch/version.
+ STD_CFLAGS := -std=gnu99
+ FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(STD_CFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
+ FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
+-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch
++FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lmyutil -Llib -lnotmuch
+ ifeq ($(LIBDIR_IN_LDCONFIG),0)
+ FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
+ endif
diff --git a/mail/notmuch/patches/patch-Makefile.local b/mail/notmuch/patches/patch-Makefile.local
index 09bfcecc6ec..59549c2d053 100644
--- a/mail/notmuch/patches/patch-Makefile.local
+++ b/mail/notmuch/patches/patch-Makefile.local
@@ -1,19 +1,10 @@
-$NetBSD: patch-Makefile.local,v 1.3 2016/10/09 21:20:45 wiz Exp $
+$NetBSD: patch-Makefile.local,v 1.4 2017/03/20 13:19:27 wiz Exp $
 
 Avoid conflict with NetBSD's libutil.
 
---- Makefile.local.orig	2016-10-04 01:47:21.000000000 +0000
+--- Makefile.local.orig	2017-03-13 01:31:16.000000000 +0000
 +++ Makefile.local
-@@ -47,7 +47,7 @@ PV_FILE=bindings/python/notmuch/version.
- STD_CFLAGS := -std=gnu99
- FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(STD_CFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
- FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
--FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch
-+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lmyutil -Llib -lnotmuch
- ifeq ($(LIBDIR_IN_LDCONFIG),0)
- FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
- endif
-@@ -301,7 +301,7 @@ notmuch_client_modules = $(notmuch_clien
+@@ -241,7 +241,7 @@ notmuch_client_modules = $(notmuch_clien
  
  notmuch.o: version.stamp