Avoid confusion with libutil. Allow zlib 1.2.3. Bump revision.

4 files changed, 51 insertions, 12 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index c1ccf92ed5e..858c9f75a52 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2014/11/19 13:06:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/18 10:52:58 joerg Exp $
 
 DISTNAME=	notmuch-0.19
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -35,6 +36,5 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # as of 0.19
 .include "../../mail/gmime24/buildlink3.mk"
 .include "../../textproc/xapian/buildlink3.mk"
 .include "../../devel/talloc/buildlink3.mk"
-BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.5.2
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 9ce504c7391..d480c5940af 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.5 2014/11/19 13:06:14 wiz Exp $
+$NetBSD: distinfo,v 1.6 2014/12/18 10:52:58 joerg 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-aa) = d439fe1539c14524832e0059ad8201f8131e3b04
+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) = b6aff48b540419af21c673f1c9882a471cebcb9c
+SHA1 (patch-lib_Makefile.local) = 965f8722958017cc86b6eaf955cfd7f4db322114
+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-aa b/mail/notmuch/patches/patch-aa
index 06007b7386a..6f558577e58 100644
--- a/mail/notmuch/patches/patch-aa
+++ b/mail/notmuch/patches/patch-aa
@@ -1,10 +1,23 @@
-$NetBSD: patch-aa,v 1.2 2014/07/03 15:01:46 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2014/12/18 10:52:58 joerg Exp $
 
 Install completion files into example directory.
+Accept zlib 1.2.3.
 
 --- configure.orig	2014-05-06 07:27:29.000000000 +0000
 +++ configure
-@@ -418,7 +418,7 @@ else
+@@ -349,9 +349,9 @@ if ! pkg-config --exists zlib; then
+   rm -f compat/gen_zlib_pc
+ fi
+ 
+-printf "Checking for zlib (>= 1.2.5.2)... "
++printf "Checking for zlib (>= 1.2.3)... "
+ have_zlib=0
+-if pkg-config --atleast-version=1.2.5.2 zlib; then
++if pkg-config --atleast-version=1.2.3 zlib; then
+     printf "Yes.\n"
+     have_zlib=1
+     zlib_cflags=$(pkg-config --cflags zlib)
+@@ -436,7 +436,7 @@ else
      have_sphinx=0
  
      printf "Checking if rst2man is available... "
@@ -13,7 +26,16 @@ Install completion files into example directory.
         printf "Yes.\n"
         have_rst2man=1
      else
-@@ -824,10 +824,10 @@ HAVE_RST2MAN=${have_rst2man}
+@@ -527,7 +527,7 @@ EOF
+ 	echo "	http://xapian.org/"
+     fi
+     if [ $have_zlib -eq 0 ]; then
+-	echo "	zlib library (>= version 1.2.5.2, including development files such as headers)"
++	echo "	zlib library (>= version 1.2.3, including development files such as headers)"
+ 	echo "	http://zlib.net/"
+ 	echo
+     fi
+@@ -835,10 +835,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-lib_Makefile.local b/mail/notmuch/patches/patch-lib_Makefile.local
index 4ea507140cb..080d66b684f 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.1 2014/09/01 08:14:07 wiz Exp $
+$NetBSD: patch-lib_Makefile.local,v 1.2 2014/12/18 10:52:58 joerg 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
@@ -9,9 +9,11 @@ $NetBSD: patch-lib_Makefile.local,v 1.1 2014/09/01 08:14:07 wiz Exp $
 
     http://notmuchmail.org/pipermail/notmuch/2014/018956.html
 
---- lib/Makefile.local.orig	2014-06-25 05:30:10.000000000 -0500
-+++ lib/Makefile.local	2014-08-29 10:09:41.000000000 -0500
-@@ -27,7 +27,7 @@
+* Don't overlap with BSD's libutil.
+
+--- lib/Makefile.local.orig	2014-11-14 19:35:40.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)
@@ -20,3 +22,14 @@ $NetBSD: patch-lib_Makefile.local,v 1.1 2014/09/01 08:14:07 wiz Exp $
  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 $@ $^
+ 
+-$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libutil.a parse-time-string/libparse-time-string.a
+-	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a parse-time-string/libparse-time-string.a
++$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libmyutil.a parse-time-string/libparse-time-string.a
++	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libmyutil.a parse-time-string/libparse-time-string.a
+ 
+ notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
+ 	sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@