Fix install_name on OS X. From J. Lewis Muir on pkgsrc-users.

Bump PKGREVISION since the binary package changes on OS X.
While here, add comments to all patches.

5 files changed, 34 insertions, 7 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index e52b65b6bdc..509ba7a289a 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2014/08/21 08:25:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2014/09/01 08:14:07 wiz Exp $
 
 DISTNAME=	notmuch-0.18.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 98bde9928d7..1d376ce9916 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2014/07/03 15:01:46 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/09/01 08:14:07 wiz Exp $
 
 SHA1 (notmuch-0.18.1.tar.gz) = ad82d6d5355594c4cab3c6d28c70ae4993acbec9
 RMD160 (notmuch-0.18.1.tar.gz) = 2e4825029cce0a972bf7d2b4493657e4366e262c
 Size (notmuch-0.18.1.tar.gz) = 634691 bytes
 SHA1 (patch-aa) = d439fe1539c14524832e0059ad8201f8131e3b04
-SHA1 (patch-doc_Makefile.local) = 4bdae1a7cb16db7ffd60948b30a1b73fe73af8ea
-SHA1 (patch-doc_prerst2man.py) = 66db50b64da9d0ccb4ec35cd9fb8327524e19af8
+SHA1 (patch-doc_Makefile.local) = 3c066de7c4686e1fd513437415bfa61ecf4f2cce
+SHA1 (patch-doc_prerst2man.py) = 90e0dd66e19ee4247b63872ebc8b1b9a5e02748c
+SHA1 (patch-lib_Makefile.local) = b6aff48b540419af21c673f1c9882a471cebcb9c
diff --git a/mail/notmuch/patches/patch-doc_Makefile.local b/mail/notmuch/patches/patch-doc_Makefile.local
index d65a034978d..7a53ac18b54 100644
--- a/mail/notmuch/patches/patch-doc_Makefile.local
+++ b/mail/notmuch/patches/patch-doc_Makefile.local
@@ -1,4 +1,6 @@
-$NetBSD: patch-doc_Makefile.local,v 1.1 2014/07/03 15:01:46 wiz Exp $
+$NetBSD: patch-doc_Makefile.local,v 1.2 2014/09/01 08:14:07 wiz Exp $
+
+Call correct python binary.
 
 --- doc/Makefile.local.orig	2014-05-06 07:27:29.000000000 +0000
 +++ doc/Makefile.local
diff --git a/mail/notmuch/patches/patch-doc_prerst2man.py b/mail/notmuch/patches/patch-doc_prerst2man.py
index 2d831b7b472..f8887ec3151 100644
--- a/mail/notmuch/patches/patch-doc_prerst2man.py
+++ b/mail/notmuch/patches/patch-doc_prerst2man.py
@@ -1,4 +1,6 @@
-$NetBSD: patch-doc_prerst2man.py,v 1.1 2014/07/03 15:01:46 wiz Exp $
+$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
diff --git a/mail/notmuch/patches/patch-lib_Makefile.local b/mail/notmuch/patches/patch-lib_Makefile.local
new file mode 100644
index 00000000000..4ea507140cb
--- /dev/null
+++ b/mail/notmuch/patches/patch-lib_Makefile.local
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_Makefile.local,v 1.1 2014/09/01 08:14:07 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
+
+--- 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 @@
+ 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)