[pkgsrc/trunk]: pkgsrc/mail/notmuch Remove zlib-1.2.3 compatibility patches.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfbc7f533002
branches:  trunk
changeset: 359557:bfbc7f533002
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 12 20:51:13 2017 +0000

description:
Remove zlib-1.2.3 compatibility patches.
Upstream claims dump/restore may not work correctly with zlib-1.2.3.
https://notmuchmail.org/pipermail/notmuch/2017/024277.html

Depend on zlib-1.2.5.2 and bump PKGREVISION.

While here, update patch comments.

diffstat:

 mail/notmuch/Makefile                         |   4 +++-
 mail/notmuch/distinfo                         |   8 +++-----
 mail/notmuch/patches/patch-aa                 |  24 +-----------------------
 mail/notmuch/patches/patch-lib_Makefile.local |  11 +----------
 mail/notmuch/patches/patch-notmuch-dump.c     |  24 ------------------------
 mail/notmuch/patches/patch-notmuch-restore.c  |  15 ---------------
 6 files changed, 8 insertions(+), 78 deletions(-)

diffs (139 lines):

diff -r f101830c6407 -r bfbc7f533002 mail/notmuch/Makefile
--- a/mail/notmuch/Makefile     Sun Mar 12 20:31:53 2017 +0000
+++ b/mail/notmuch/Makefile     Sun Mar 12 20:51:13 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2017/03/05 12:33:31 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2017/03/12 20:51:13 wiz Exp $
 
 DISTNAME=      notmuch-0.23.7
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  http://notmuchmail.org/releases/
 
@@ -41,5 +42,6 @@
 BUILDLINK_API_DEPENDS.xapian+= xapian>=1.2.6
 .include "../../textproc/xapian/buildlink3.mk"
 .include "../../devel/talloc/buildlink3.mk"
+BUILDLINK_ABI_DEPENDS.zlib+=   zlib>=1.2.5.2
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f101830c6407 -r bfbc7f533002 mail/notmuch/distinfo
--- a/mail/notmuch/distinfo     Sun Mar 12 20:31:53 2017 +0000
+++ b/mail/notmuch/distinfo     Sun Mar 12 20:51:13 2017 +0000
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.19 2017/03/05 12:33:31 wiz Exp $
+$NetBSD: distinfo,v 1.20 2017/03/12 20:51:13 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 (patch-aa) = 5276035fce76d9cf891d168aeba60b0eede00a09
-SHA1 (patch-lib_Makefile.local) = c81920e239d1e26d4502e57c4e7fdbd3209b6325
-SHA1 (patch-notmuch-dump.c) = d85095239da2c7247113143d2668d6ca47bc324f
-SHA1 (patch-notmuch-restore.c) = 5f908d2ee146e29bd025eee36adb5997d897e9ea
+SHA1 (patch-aa) = 90414224b80703587d211c8b56bfba0cbe1377b6
+SHA1 (patch-lib_Makefile.local) = 84ebfe1a57647e590f923d727d206b5f4687e1ce
 SHA1 (patch-util_Makefile.local) = 1dcf152c0aba329e5e309c98042bd14f9a733714
diff -r f101830c6407 -r bfbc7f533002 mail/notmuch/patches/patch-aa
--- a/mail/notmuch/patches/patch-aa     Sun Mar 12 20:31:53 2017 +0000
+++ b/mail/notmuch/patches/patch-aa     Sun Mar 12 20:51:13 2017 +0000
@@ -1,31 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2016/10/09 21:20:45 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2017/03/12 20:51:13 wiz Exp $
 
 Install completion files into example directory.
-Accept zlib 1.2.3.
 
 --- configure.orig     2016-10-04 01:47:21.000000000 +0000
 +++ configure
-@@ -490,9 +490,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)
-@@ -688,7 +688,7 @@ EOF
-       echo "  https://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
 @@ -1026,10 +1026,10 @@ HAVE_DOXYGEN=${have_doxygen}
  desktop_dir = \$(prefix)/share/applications
  
diff -r f101830c6407 -r bfbc7f533002 mail/notmuch/patches/patch-lib_Makefile.local
--- a/mail/notmuch/patches/patch-lib_Makefile.local     Sun Mar 12 20:31:53 2017 +0000
+++ b/mail/notmuch/patches/patch-lib_Makefile.local     Sun Mar 12 20:51:13 2017 +0000
@@ -1,13 +1,4 @@
-$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
-  enables programs that link against it as a dependent library to find
-  it when they run.
-
-  Upstream bug report:
-
-    http://notmuchmail.org/pipermail/notmuch/2014/018956.html
+$NetBSD: patch-lib_Makefile.local,v 1.4 2017/03/12 20:51:13 wiz Exp $
 
 * Don't overlap with BSD's libutil.
 
diff -r f101830c6407 -r bfbc7f533002 mail/notmuch/patches/patch-notmuch-dump.c
--- a/mail/notmuch/patches/patch-notmuch-dump.c Sun Mar 12 20:31:53 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-notmuch-dump.c,v 1.1 2014/12/18 12:26:51 joerg Exp $
-
-Avoid depending on very recent zlib.
-
---- notmuch-dump.c.orig        2014-12-15 20:12:50.000000000 +0000
-+++ notmuch-dump.c
-@@ -177,7 +177,7 @@ notmuch_database_dump (notmuch_database_
-       }
-     }
- 
--    if (gzclose_w (output) != Z_OK) {
-+    if (gzclose(output) != Z_OK) {
-       fprintf (stderr, "Error closing %s: %s\n", name_for_error,
-                gzerror (output, NULL));
-       ret = EXIT_FAILURE;
-@@ -196,7 +196,7 @@ notmuch_database_dump (notmuch_database_
-     }
-  DONE:
-     if (ret != EXIT_SUCCESS && output)
--      (void) gzclose_w (output);
-+      (void) gzclose(output);
- 
-     if (ret != EXIT_SUCCESS && output_file_name)
-       (void) unlink (tempname);
diff -r f101830c6407 -r bfbc7f533002 mail/notmuch/patches/patch-notmuch-restore.c
--- a/mail/notmuch/patches/patch-notmuch-restore.c      Sun Mar 12 20:31:53 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-notmuch-restore.c,v 1.1 2014/12/18 12:26:51 joerg Exp $
-
-Avoid depending on very recent zlib.
-
---- notmuch-restore.c.orig     2014-12-15 20:12:30.000000000 +0000
-+++ notmuch-restore.c
-@@ -312,7 +312,7 @@ notmuch_restore_command (notmuch_config_
-     if (notmuch)
-       notmuch_database_destroy (notmuch);
- 
--    if (input && gzclose_r (input)) {
-+    if (input && gzclose(input)) {
-       fprintf (stderr, "Error closing %s: %s\n",
-                name_for_error, gzerror (input, NULL));
-       ret = EXIT_FAILURE;