[108886] trunk/dports/mail/notmuch

yeled at macports.org yeled at macports.org
Sun Aug 4 01:30:26 PDT 2013


Revision: 108886
          https://trac.macports.org/changeset/108886
Author:   yeled at macports.org
Date:     2013-08-04 01:30:26 -0700 (Sun, 04 Aug 2013)
Log Message:
-----------
lots of new features, now builds without our patches on OS X cf. http://notmuchmail.org/news/

Modified Paths:
--------------
    trunk/dports/mail/notmuch/Portfile

Removed Paths:
-------------
    trunk/dports/mail/notmuch/files/patch-Makefile.local.diff
    trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff
    trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff

Modified: trunk/dports/mail/notmuch/Portfile
===================================================================
--- trunk/dports/mail/notmuch/Portfile	2013-08-04 08:02:58 UTC (rev 108885)
+++ trunk/dports/mail/notmuch/Portfile	2013-08-04 08:30:26 UTC (rev 108886)
@@ -5,7 +5,7 @@
 PortGroup           conflicts_build 1.0
 
 name                notmuch
-version             0.15.2
+version             0.16
 categories          mail
 platforms           darwin
 license             GPL-3+
@@ -20,8 +20,8 @@
 homepage            http://notmuchmail.org/
 master_sites        ${homepage}releases/
 
-checksums           rmd160  a29861f4a35fb4fee185ae9b527e2fa74ae44ba5 \
-                    sha256  a6e8af6382ab6df4a944bbffda9eb22639612c047b94632168b4270f2af59c0d
+checksums           rmd160  9c3864ea157b32ab7c2d33248e5cc83402607546 \
+                    sha256  e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344
 
 depends_build       port:pkgconfig
 
@@ -29,21 +29,11 @@
                     port:gmime\
                     port:talloc
 
-patchfiles          patch-lib-Makefile.local.diff \
-                    patch-Makefile.local.diff \
-                    patch-bindings-python-notmuch-globals.py.diff
 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/bindings/python/notmuch/globals.py
 }
 
-# 0.14 failed to build when 0.11 was active with this error:
-# notmuch-count.c:70:44: error: too many arguments to function call, expected 2, have 3
-#                                NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
-#                                                                 ^~~~~~~~
-# /opt/local/include/notmuch.h:174:1: note: 'notmuch_database_open' declared here
-# notmuch_database_t *
-# ^
 conflicts_build     ${name}
 
 configure.args      --without-emacs

Deleted: trunk/dports/mail/notmuch/files/patch-Makefile.local.diff
===================================================================
--- trunk/dports/mail/notmuch/files/patch-Makefile.local.diff	2013-08-04 08:02:58 UTC (rev 108885)
+++ trunk/dports/mail/notmuch/files/patch-Makefile.local.diff	2013-08-04 08:30:26 UTC (rev 108886)
@@ -1,11 +0,0 @@
---- Makefile.local.orig 2013-02-18 02:39:46.000000000 +1100
-+++ Makefile.local  2013-02-20 00:01:19.000000000 +1100
-@@ -41,7 +41,7 @@
- # Smash together user's values with our extra values
- FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
- FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
--FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
-+FINAL_NOTMUCH_LDFLAGS = -Wl,-search_paths_first -Lutil -lutil -Llib -lnotmuch $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
- FINAL_NOTMUCH_LINKER = CC
- ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
- FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)

Deleted: trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff
===================================================================
--- trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff	2013-08-04 08:02:58 UTC (rev 108885)
+++ trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff	2013-08-04 08:30:26 UTC (rev 108886)
@@ -1,11 +0,0 @@
---- bindings/python/notmuch/globals.py.orig	2012-08-21 03:43:50.000000000 -0500
-+++ bindings/python/notmuch/globals.py	2012-12-03 03:44:28.000000000 -0600
-@@ -22,7 +22,7 @@
- #-----------------------------------------------------------------------------
- #package-global instance of the notmuch library
- try:
--    nmlib = CDLL("libnotmuch.so.3")
-+    nmlib = CDLL("@PREFIX@/lib/libnotmuch.3.dylib")
- except:
-     raise ImportError("Could not find shared 'notmuch' library.")
- 

Deleted: trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff
===================================================================
--- trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff	2013-08-04 08:02:58 UTC (rev 108885)
+++ trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff	2013-08-04 08:30:26 UTC (rev 108886)
@@ -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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130804/f042af73/attachment.html>


More information about the macports-changes mailing list