[100191] trunk/dports/mail/notmuch

[ryandesign at macports.org]

Revision: 100191
          https://trac.macports.org/changeset/100191
Author:   ryandesign at macports.org
Date:     2012-12-03 02:01:30 -0800 (Mon, 03 Dec 2012)
Log Message:
-----------
notmuch: update to 0.14 and fix livecheck (#33875); use patchfiles instead of reinplaces; prevent build conflict when previous version of notmuch is active; disable silent rules; remove python variant which does nothing; fix emacs variant to actually do something; fix license

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

Added Paths:
-----------
    trunk/dports/mail/notmuch/files/
    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	2012-12-03 09:57:36 UTC (rev 100190)
+++ trunk/dports/mail/notmuch/Portfile	2012-12-03 10:01:30 UTC (rev 100191)
@@ -2,12 +2,13 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           conflicts_build 1.0
 
 name                notmuch
-version             0.11
+version             0.14
 categories          mail
 platforms           darwin
-license             GPL-3
+license             GPL-3+
 maintainers         yeled
 description         The mail indexer
 long_description    "Not much mail" is what Notmuch thinks about your email\
@@ -17,27 +18,44 @@
                     plain not much mail.
 
 homepage            http://notmuchmail.org/
-master_sites        http://notmuchmail.org/releases/
-checksums           md5     f5d0d3de3b9948de11e48e3bbc849183 \
-                    sha1    11eb1d967af089ed36f6816f61ebae308bc19339 \
-                    rmd160  184ba8a7589d499ae18b8ec61c1cc05c1b1b2d1e
+master_sites        ${homepage}releases/
 
+checksums           rmd160  afe86b644b29e57f2261cc19230435e8dcdd6841 \
+                    sha256  095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753
+
 depends_build       port:pkgconfig
 
 depends_lib         port:xapian-bindings\
                     port:gmime\
                     port:talloc
 
-configure.args      --without-emacs
+patchfiles          patch-lib-Makefile.local.diff \
+                    patch-bindings-python-notmuch-globals.py.diff
 
-post-configure  {
-                    reinplace "s|install_name \$(SONAME)|install_name \$(libdir)/\$(SONAME)|g" "${worksrcpath}/lib/Makefile.local"
-                    reinplace "s|libnotmuch.so.2|${prefix}/lib/libnotmuch.2.dylib|g" "${worksrcpath}/bindings/python/notmuch/globals.py"
+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
+
+# disable silent rules
+build.args          V=1
+
 variant emacs description {EMACS support} {
-                    depends_lib-append      port:emacs
+    depends_lib-append      port:emacs
+    configure.args-delete   --without-emacs
+    configure.args-append   --with-emacs
 }
 
-variant python description {install the python bindings } {
-}
+livecheck.type      regex
+livecheck.url       [lindex ${master_sites} 0]
+livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff
===================================================================
--- trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff	                        (rev 0)
+++ trunk/dports/mail/notmuch/files/patch-bindings-python-notmuch-globals.py.diff	2012-12-03 10:01:30 UTC (rev 100191)
@@ -0,0 +1,11 @@
+--- 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.")
+ 

Added: trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff
===================================================================
--- trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff	                        (rev 0)
+++ trunk/dports/mail/notmuch/files/patch-lib-Makefile.local.diff	2012-12-03 10:01:30 UTC (rev 100191)
@@ -0,0 +1,11 @@
+--- 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/20121203/60fb0c4f/attachment-0001.html>