Hello,
This is an update from mail/mu 1.4.15 to 1.6.2.
Port changes:
- Two patches removing _XOPEN_SOURCE
- no longer depends on devel/json-glib
The test suite runs fine. Portcheck and lib-depends-check are happy.
All tests done on amd64.
Software changes (from NEWS file):
* 1.6 (released, as of July 27 2021)
NOTE: After upgrading, you need to call ~mu init~, with your prefered
parameters
before you can use ~mu~ / ~mu4e~. This is because the underlying
database-schema
has changed.
*** mu
- Where available (and with suitably equiped ~libglib~), log to the
~systemd~
journal instead of ~~/.cache/mu.log~. Passing the ~--debug~ option to ~mu~
increases the amount that is logged.
- Follow symlinks in maildirs, and support moving messsages across
filesystems. Obviously, that is typically quite a bit slower than the
single-filesystem case, but can be still be useful.
- Optionally provide readline support for the ~mu~ server (when in tty-mode)
- Reworked the way mu generates s-expressions for mu4e; they are created
programmatically now instead of through string building.
- The indexer (the part of mu that scans maildirs and updates the message
store) has been rewritten so it can work asynchronously and take advantage
of multiple cores. Note that for now, indexing in ~mu4e~ is still a
blocking
operation.
- Portability updates for dealing with non-POSIX systems, and in particular
VFAT filesystem, and building using Clang/libc++.
- The personal addresses (as per ~--my-address=~ for ~mu init~) can now also
include regular expressions (basic POSIX); wrap the expression in ~/~,
e.g.,
~--my-address='/.*@example.*/~'.
- Modernized the querying/threading machinery; this makes some old code a
lot easier to understand and maintain, and even while not an explicit
goal, is also faster.
- Experimental support for the Meson build system.
*** mu4e
- Use the gnus-based message viewer as the default; the new viewer has quite
a few extra features compared to the old, mu4e-specific one, such as
faster crypto, support for S/MIME, syntax-highlighting, calendar
invitations and more.
The new view is superior in most ways, but if you still depend on
something from the old one, you can use:
#+begin_example
;; set *before* loading mu4e; and restart emacs if you want to change it
;; users of use-packag~ should can use the :init section for this.
(setq mu4e-view-use-old t)
#+end_example
(The older variable ~mu4e-view-use-gnus~ with the opposite meaning is
obsolete now, and no longer in use).
- Include maildir-shortcuts in the main-view with overall/unread counts,
similar to bookmarks, and with the same ~:hide~ and ~:hide-unread~
properties.
Note that for the latter, you need to update your maildir-shortcuts to the
new format, as explained in the ~mu4e-maildir-shortcuts~ docstring.
You can set ~mu4e-main-hide-fully-read~ to hide any bookmarks/maildirs
that
have no unread messages.
- Add some more properties for use in capturing org-mode links to messages /
queries. See [[info:mu4e#Org-mode links][the mu4e manual]] for details.
- Honor ~truncate-string-ellipsis~ so you can now use 'fancy' ellipses for
truncated strings with ~(setq truncate-string-ellipsis "…")~
- Add a variable ~mu4e-mu-debug~ which, when set to non-~nil,~ makes the
~mu~
server log more verbosely (to ~mu.log~ or the journal)
- Better alignment in headers-buffers; this looks nicer, but is also a bit
slower, hence you need to enable ~mu4e-headers-precise-alignment~ for
this.
- Support ~mu~'s new regexp-based personal addresses, and add
~mu4e-personal-address-p~ to check whether a given string matches a
personal
address.
- TAB-Completion for writing ~mu~ queries
- Switch the context for existing draft messages using
~mu4e-compose-context-switch~ or ~C-c C-;~ in ~mu4e-compose-mode~.
Best Regards,
Stefan
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile 28 Mar 2021 17:45:18 -0000 1.24
+++ Makefile 7 Aug 2021 16:27:24 -0000
@@ -2,7 +2,7 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V= 1.4.15
+V= 1.6.2
GUILE_V= 2.2
DISTNAME= mu-$V
@@ -22,8 +22,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} assuan c curses ffi gio-2.0 glib-2.0
WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0
-WANTLIB += iconv idn2 intl json-glib-1.0 m pcre readline unistring
-WANTLIB += xapian z
+WANTLIB += iconv idn2 intl m pcre readline unistring xapian z
MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/
EXTRACT_SUFX= .tar.xz
@@ -32,7 +31,6 @@ BUILD_DEPENDS= emacs->=24:editors/emacs
LIB_DEPENDS= databases/xapian-core \
devel/glib2 \
- devel/json-glib \
mail/gmime30 \
security/gpgme
@@ -53,6 +51,8 @@ LIB_DEPENDS += lang/guile2
CONFIGURE_ARGS += --disable-guile
.endif
+MAKE_FLAGS = "CPPFLAGS=${CPPFLAGS} -I/usr/include"
+
USE_GMAKE= Yes
SEPARATE_BUILD= Yes
@@ -61,6 +61,6 @@ pre-configure:
sed -e 's/exec guile/exec guile${GUILE_V}/' -i \
${WRKDIST}/guile/*/*.scm
sed -e 's/guile-snarf/guile-snarf${GUILE_V}/' -i \
- ${WRKDIST}/configure.ac
+ ${WRKDIST}/configure.ac
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mu/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 28 Mar 2021 17:45:18 -0000 1.11
+++ distinfo 7 Aug 2021 16:27:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (mu-1.4.15.tar.xz) = 91JOF94JRw0TabwbOVmx+KwShu/y1ELbM/g1Vyb4NCo=
-SIZE (mu-1.4.15.tar.xz) = 846052
+SHA256 (mu-1.6.2.tar.xz) = N0QeQeuK+K8niXIKh5PsyulPp+xTMJmIQUwZREKfl0o=
+SIZE (mu-1.6.2.tar.xz) = 866560
Index: patches/patch-lib_utils_mu-readline_cc
===================================================================
RCS file: patches/patch-lib_utils_mu-readline_cc
diff -N patches/patch-lib_utils_mu-readline_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_utils_mu-readline_cc 7 Aug 2021 16:27:24 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+:: doesn't work on macro expansion
+
+Index: lib/utils/mu-readline.cc
+--- lib/utils/mu-readline.cc.orig
++++ lib/utils/mu-readline.cc
+@@ -68,7 +68,7 @@ static size_t max_lines{};
+ void
+ Mu::setup_readline (const std::string& histpath, size_t maxlines)
+ {
+- is_a_tty = !!::isatty(::fileno(stdout));
++ is_a_tty = !!::isatty(fileno(stdout));
+ hist_path = histpath;
+ max_lines = maxlines;
+
Index: patches/patch-lib_utils_mu-util_c
===================================================================
RCS file: patches/patch-lib_utils_mu-util_c
diff -N patches/patch-lib_utils_mu-util_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_utils_mu-util_c 7 Aug 2021 16:27:24 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Bring S_ISLNK into scope
+
+Index: lib/utils/mu-util.c
+--- lib/utils/mu-util.c.orig
++++ lib/utils/mu-util.c
+@@ -23,10 +23,6 @@
+ #include <config.h>
+ #endif /*HAVE_CONFIG_H*/
+
+-#ifndef _XOPEN_SOURCE
+-#define _XOPEN_SOURCE (500)
+-#endif /*_XOPEN_SOURCE*/
+-
+ #include "mu-util.h"
+ #ifdef HAVE_WORDEXP_H
+ #include <wordexp.h> /* for shell-style globbing */
Index: patches/patch-lib_utils_mu-utils_cc
===================================================================
RCS file: /cvs/ports/mail/mu/patches/patch-lib_utils_mu-utils_cc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-lib_utils_mu-utils_cc
--- patches/patch-lib_utils_mu-utils_cc 28 Jul 2020 13:41:55 -0000 1.1
+++ patches/patch-lib_utils_mu-utils_cc 7 Aug 2021 16:27:24 -0000
@@ -1,13 +1,14 @@
-$OpenBSD: patch-lib_utils_mu-utils_cc,v 1.1 2020/07/28 13:41:55 abieber Exp $
-Bring g_vasprintf into scope
+$OpenBSD$
+
+Bring vasprintf into scope
+
Index: lib/utils/mu-utils.cc
--- lib/utils/mu-utils.cc.orig
+++ lib/utils/mu-utils.cc
-@@ -17,8 +17,6 @@
- ** 02110-1301, USA.
+@@ -18,7 +18,6 @@
*/
--
+
-#define _XOPEN_SOURCE
#include <time.h>
Index: patches/patch-mu_mu-cmd-server_cc
===================================================================
RCS file: patches/patch-mu_mu-cmd-server_cc
diff -N patches/patch-mu_mu-cmd-server_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mu_mu-cmd-server_cc 7 Aug 2021 16:27:24 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+:: doesn't work on macro expansion
+
+Index: mu/mu-cmd-server.cc
+--- mu/mu-cmd-server.cc.orig
++++ mu/mu-cmd-server.cc
+@@ -109,7 +109,7 @@ Mu::mu_cmd_server (const MuConfig *opts, GError **err)
+ store.metadata().root_maildir.c_str(),
+ opts->debug ? "yes" : "no");
+
+- tty = ::isatty(::fileno(stdout));
++ tty = ::isatty(fileno(stdout));
+
+ const auto eval = std::string {
+ opts->commands ? "(help :full t)" : opts->eval ? opts->eval :
""};
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mu/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 28 Jul 2020 13:41:56 -0000 1.7
+++ pkg/PLIST 7 Aug 2021 16:27:24 -0000
@@ -60,6 +60,12 @@ share/emacs/site-lisp/mu4e/mu4e-utils.el
share/emacs/site-lisp/mu4e/mu4e-utils.elc
share/emacs/site-lisp/mu4e/mu4e-vars.el
share/emacs/site-lisp/mu4e/mu4e-vars.elc
+share/emacs/site-lisp/mu4e/mu4e-view-common.el
+share/emacs/site-lisp/mu4e/mu4e-view-common.elc
+share/emacs/site-lisp/mu4e/mu4e-view-gnus.el
+share/emacs/site-lisp/mu4e/mu4e-view-gnus.elc
+share/emacs/site-lisp/mu4e/mu4e-view-old.el
+share/emacs/site-lisp/mu4e/mu4e-view-old.elc
share/emacs/site-lisp/mu4e/mu4e-view.el
share/emacs/site-lisp/mu4e/mu4e-view.elc
share/emacs/site-lisp/mu4e/mu4e.el
