Hola, This is a trivial diff to bring mail/mu to the latest version. Which includes the OpenBSD fixes[1,2] from Sean Levy <att...@stalphonsos.com>!
Tested on amd64 so far (i386 is where the issues were) [1] https://github.com/djcb/mu/pull/595 [2] https://github.com/djcb/mu/pull/634 Tests on i386 would be appreciated! Cheers, Aaron Index: Makefile =================================================================== RCS file: /cvs/ports/mail/mu/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 3 Jul 2015 01:36:48 -0000 1.2 +++ Makefile 22 Sep 2015 22:10:06 -0000 @@ -2,7 +2,7 @@ COMMENT= maildir indexer and searcher with emacs frontend -GH_TAGNAME= v0.9.12 +GH_TAGNAME= v0.9.13 GH_ACCOUNT= djcb GH_PROJECT= mu DISTNAME= mu-${GH_TAGNAME:S/v//} Index: distinfo =================================================================== RCS file: /cvs/ports/mail/mu/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 3 Jul 2015 01:36:48 -0000 1.2 +++ distinfo 22 Sep 2015 22:10:06 -0000 @@ -1,2 +1,2 @@ -SHA256 (mu-0.9.12.tar.gz) = uHEST8d3SiWTgV+JKGZxqPMdckO7iYqMpFRoVZnyua8= -SIZE (mu-0.9.12.tar.gz) = 2196977 +SHA256 (mu-0.9.13.tar.gz) = ociO/Tv+2pbgbX93qHVixHLm14fzzKmE3fJ1pOodQ3I= +SIZE (mu-0.9.13.tar.gz) = 2201181 Index: patches/patch-lib_mu-msg-iter_cc =================================================================== RCS file: patches/patch-lib_mu-msg-iter_cc diff -N patches/patch-lib_mu-msg-iter_cc --- patches/patch-lib_mu-msg-iter_cc 3 Jul 2015 01:36:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-lib_mu-msg-iter_cc,v 1.1 2015/07/03 01:36:48 abieber Exp $ ---- lib/mu-msg-iter.cc.orig Wed Jul 1 19:10:13 2015 -+++ lib/mu-msg-iter.cc Wed Jul 1 19:10:35 2015 -@@ -366,9 +366,7 @@ mu_msg_iter_get_msgid (MuMsgIter *iter) - g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL); - - try { -- const char *msgid (iter->msgid().c_str()); -- -- return msgid ? g_strdup (msgid) : NULL; -+ return g_strdup (iter->msgid().c_str()); - - } MU_XAPIAN_CATCH_BLOCK_RETURN (NULL); - } Index: patches/patch-lib_mu-msg-part_c =================================================================== RCS file: patches/patch-lib_mu-msg-part_c diff -N patches/patch-lib_mu-msg-part_c --- patches/patch-lib_mu-msg-part_c 3 Jul 2015 01:36:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-lib_mu-msg-part_c,v 1.1 2015/07/03 01:36:48 abieber Exp $ ---- lib/mu-msg-part.c.orig Mon Mar 23 12:57:29 2015 -+++ lib/mu-msg-part.c Wed Jul 1 19:09:54 2015 -@@ -780,6 +780,11 @@ mu_msg_part_save (MuMsg *msg, MuMsgOptions opts, - part = (GMimeObject*)g_mime_message_part_get_message - (GMIME_MESSAGE_PART (part)); - -+ if (!part) { -+ g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME, -+ "part %u does not exist", partidx); -+ return FALSE; -+ } - if (!GMIME_IS_PART(part) && !GMIME_IS_MESSAGE(part)) { - g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME, - "unexpected type %s for part %u", Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/mu/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 3 Jul 2015 01:36:48 -0000 1.2 +++ pkg/PLIST 22 Sep 2015 22:10:06 -0000 @@ -17,9 +17,12 @@ @man man/man1/mu.1 @man man/man1/mug.1 @man man/man5/mu-bookmarks.5 +share/doc/mu/ +share/doc/mu/NEWS.org +share/doc/mu/mu4e-about.org +share/emacs/ +share/emacs/site-lisp/ share/emacs/site-lisp/mu4e/ -share/emacs/site-lisp/mu4e/mu4e-about.el -share/emacs/site-lisp/mu4e/mu4e-about.elc share/emacs/site-lisp/mu4e/mu4e-actions.el share/emacs/site-lisp/mu4e/mu4e-actions.elc share/emacs/site-lisp/mu4e/mu4e-compose.el
