Revision: 139741 https://trac.macports.org/changeset/139741 Author: khindenburg@macports.org Date: 2015-08-25 19:44:02 -0700 (Tue, 25 Aug 2015) Log Message: ----------- notmuch: update to 0.20.2; remove unused patches #48666 #48665 Modified Paths: -------------- trunk/dports/mail/notmuch/Portfile trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff Removed Paths: ------------- trunk/dports/mail/notmuch/files/patch-doc-Makefile.local.diff trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff trunk/dports/mail/notmuch/files/visibility.patch Modified: trunk/dports/mail/notmuch/Portfile =================================================================== --- trunk/dports/mail/notmuch/Portfile 2015-08-26 02:43:14 UTC (rev 139740) +++ trunk/dports/mail/notmuch/Portfile 2015-08-26 02:44:02 UTC (rev 139741) @@ -5,7 +5,7 @@ PortGroup conflicts_build 1.0 name notmuch -version 0.19 +version 0.20.2 categories mail platforms darwin license GPL-3+ @@ -20,8 +20,8 @@ homepage http://notmuchmail.org/ master_sites ${homepage}releases/ -checksums rmd160 850fb63960abf5f5d4433683ce21e80cdf1205cb \ - sha256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb +checksums rmd160 8224050c08c5968cfe5c6818285337a49a6a0769 \ + sha256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec depends_build port:pkgconfig @@ -29,10 +29,7 @@ port:gmime\ port:talloc -patchfiles patch-bindings-python-notmuch-globals.py.diff \ - patch-doc-Makefile.local.diff \ - patch-lib-Makefile.local.diff \ - visibility.patch +patchfiles patch-bindings-python-notmuch-globals.py.diff post-patch { reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/bindings/python/notmuch/globals.py Modified: trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff =================================================================== --- trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff 2015-08-26 02:43:14 UTC (rev 139740) +++ trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff 2015-08-26 02:44:02 UTC (rev 139741) @@ -1,11 +1,11 @@ ---- bindings/python/notmuch/globals.py.orig 2013-08-03 06:29:40.000000000 -0500 -+++ bindings/python/notmuch/globals.py 2013-08-04 21:09:48.000000000 -0500 -@@ -24,7 +24,7 @@ +--- bindings/python/notmuch/globals.py.orig 2015-08-21 11:13:03.000000000 -0400 ++++ bindings/python/notmuch/globals.py 2015-08-21 12:13:27.000000000 -0400 +@@ -25,7 +25,7 @@ try: from os import uname if uname()[0] == 'Darwin': -- nmlib = CDLL("libnotmuch.4.dylib") -+ nmlib = CDLL("@PREFIX@/lib/libnotmuch.4.dylib") +- nmlib = CDLL("libnotmuch.{0:s}.dylib".format(SOVERSION)) ++ nmlib = CDLL("@PREFIX@/lib/"+"libnotmuch.{0:s}.dylib".format(SOVERSION)) else: - nmlib = CDLL("libnotmuch.so.4") + nmlib = CDLL("libnotmuch.so.{0:s}".format(SOVERSION)) except: Deleted: trunk/dports/mail/notmuch/files/patch-doc-Makefile.local.diff =================================================================== --- trunk/dports/mail/notmuch/files/patch-doc-Makefile.local.diff 2015-08-26 02:43:14 UTC (rev 139740) +++ trunk/dports/mail/notmuch/files/patch-doc-Makefile.local.diff 2015-08-26 02:44:02 UTC (rev 139741) @@ -1,13 +0,0 @@ -Fix destroot by gzipping manpage before trying to install it. -http://notmuchmail.org/pipermail/notmuch/2015/020103.html ---- doc/Makefile.local.orig 2014-11-14 13:35:40.000000000 -0600 -+++ doc/Makefile.local 2015-04-29 21:35:59.000000000 -0500 -@@ -63,7 +63,7 @@ - ifeq ($(HAVE_DOXYGEN),1) - MAN_GZIP_FILES += ${APIMAN}.gz - apidocs: $(APIMAN) --install-apidocs: apidocs -+install-apidocs: ${APIMAN}.gz - mkdir -p "$(DESTDIR)$(mandir)/man3" - install -m0644 $(DOCBUILDDIR)/man/man3/*.3.gz $(DESTDIR)/$(mandir)/man3 - Deleted: trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff =================================================================== --- trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff 2015-08-26 02:43:14 UTC (rev 139740) +++ trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff 2015-08-26 02:44:02 UTC (rev 139741) @@ -1,11 +0,0 @@ ---- lib/Makefile.local.orig 2012-08-21 03:43:50.000000000 -0500 -+++ lib/Makefile.local 2012-12-03 03:50:15.000000000 -0600 -@@ -24,7 +24,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) Deleted: trunk/dports/mail/notmuch/files/visibility.patch =================================================================== --- trunk/dports/mail/notmuch/files/visibility.patch 2015-08-26 02:43:14 UTC (rev 139740) +++ trunk/dports/mail/notmuch/files/visibility.patch 2015-08-26 02:44:02 UTC (rev 139741) @@ -1,18 +0,0 @@ ---- lib/notmuch-private.h.orig 2013-09-02 00:17:31.000000000 -0700 -+++ lib/notmuch-private.h 2013-09-02 00:17:42.000000000 -0700 -@@ -49,8 +49,6 @@ NOTMUCH_BEGIN_DECLS - #include "xutil.h" - #include "error_util.h" - --#pragma GCC visibility push(hidden) -- - #ifdef DEBUG - # define DEBUG_DATABASE_SANITY 1 - # define DEBUG_QUERY 1 -@@ -529,6 +527,4 @@ _notmuch_talloc_steal (const void *new_c - #endif - #endif - --#pragma GCC visibility pop -- - #endif