Index: mail/mu/Makefile =================================================================== RCS file: /home/cvs/ports/mail/mu/Makefile,v retrieving revision 1.34 diff -u -p -u -p -r1.34 Makefile --- mail/mu/Makefile 16 Jun 2022 15:39:44 -0000 1.34 +++ mail/mu/Makefile 31 Jul 2022 11:32:12 -0000 @@ -1,7 +1,7 @@ COMMENT= maildir indexer and searcher with emacs frontend -V= 1.6.11 -GUILE_V= 2.2 +V= 1.8.7 +GUILE_V= 3.0 DISTNAME= mu-$V @@ -22,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} assuan c c WANTLIB += gmime-3.0 gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0 WANTLIB += iconv idn2 intl m pcre readline unistring xapian z -MASTER_SITES= https://github.com/djcb/mu/releases/download/${V}/ +MASTER_SITES= https://github.com/djcb/mu/releases/download/v${V}/ EXTRACT_SUFX= .tar.xz BUILD_DEPENDS= emacs->=24:editors/emacs @@ -32,19 +32,17 @@ LIB_DEPENDS= databases/xapian-core \ mail/gmime30 \ security/gpgme -# C++14 +# C++17 COMPILER= base-clang ports-gcc AUTOCONF_VERSION= 2.69 AUTOMAKE_VERSION= 1.15 CONFIGURE_STYLE= autoreconf -CONFIGURE_ARGS= --disable-gtk \ - --disable-webkit - .if ${FLAVOR} == "guile" WANTLIB += guile-${GUILE_V} gc ltdl gmp -LIB_DEPENDS += lang/guile2 +LIB_DEPENDS += devel/libtool,-ltdl \ + lang/guile3 .else CONFIGURE_ARGS += --disable-guile .endif Index: mail/mu/distinfo =================================================================== RCS file: /home/cvs/ports/mail/mu/distinfo,v retrieving revision 1.20 diff -u -p -u -p -r1.20 distinfo --- mail/mu/distinfo 16 Jun 2022 15:39:44 -0000 1.20 +++ mail/mu/distinfo 31 Jul 2022 08:40:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (mu-1.6.11.tar.xz) = YOqyQNwQjypBn0fWp1wWhBB43NGT8sC7Atzbn/SE7I0= -SIZE (mu-1.6.11.tar.xz) = 870188 +SHA256 (mu-1.8.7.tar.xz) = WgckpiX0PgHXP/5/flNY8LQ9ygaWVZ1wdXtiRp9imm8= +SIZE (mu-1.8.7.tar.xz) = 539664 Index: mail/mu/patches/patch-configure_ac =================================================================== RCS file: mail/mu/patches/patch-configure_ac diff -N mail/mu/patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/mu/patches/patch-configure_ac 31 Jul 2022 10:50:33 -0000 @@ -0,0 +1,11 @@ +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -38,7 +38,6 @@ AC_PROG_CXX + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL +-AC_CHECK_INCLUDES_DEFAULT + AC_PROG_EGREP + + Index: mail/mu/patches/patch-lib_mu-store_cc =================================================================== RCS file: mail/mu/patches/patch-lib_mu-store_cc diff -N mail/mu/patches/patch-lib_mu-store_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/mu/patches/patch-lib_mu-store_cc 29 Jul 2022 05:33:57 -0000 @@ -0,0 +1,14 @@ +fix time_t format specifier + +Index: lib/mu-store.cc +--- lib/mu-store.cc.orig ++++ lib/mu-store.cc +@@ -599,7 +599,7 @@ Store::set_dirstamp(const std::string& path, time_t ts + { + std::array data{}; + const auto len = static_cast( +- g_snprintf(data.data(), data.size(), "%zx", tstamp)); ++ g_snprintf(data.data(), data.size(), "%lld", (long long)tstamp)); + + set_metadata(path, std::string{data.data(), len}); + } Index: mail/mu/patches/patch-lib_utils_mu-readline_cc =================================================================== RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-readline_cc,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-lib_utils_mu-readline_cc --- mail/mu/patches/patch-lib_utils_mu-readline_cc 11 Mar 2022 19:34:42 -0000 1.2 +++ mail/mu/patches/patch-lib_utils_mu-readline_cc 28 Jun 2022 20:30:21 -0000 @@ -3,12 +3,12 @@ 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{}; +@@ -74,7 +74,7 @@ Mu::have_readline() void - Mu::setup_readline (const std::string& histpath, size_t maxlines) + 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; +- is_a_tty = !!::isatty(::fileno(stdout)); ++ is_a_tty = !!::isatty(fileno(stdout)); + hist_path = histpath; + max_lines = maxlines; Index: mail/mu/patches/patch-lib_utils_mu-utils-format_hh =================================================================== RCS file: mail/mu/patches/patch-lib_utils_mu-utils-format_hh diff -N mail/mu/patches/patch-lib_utils_mu-utils-format_hh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/mu/patches/patch-lib_utils_mu-utils-format_hh 28 Jun 2022 20:30:21 -0000 @@ -0,0 +1,12 @@ +Index: lib/utils/mu-utils-format.hh +--- lib/utils/mu-utils-format.hh.orig ++++ lib/utils/mu-utils-format.hh +@@ -49,7 +49,7 @@ std::string format(const char* frm, ...) __attribute__ + * + * @return a formatted string + */ +-std::string vformat(const char* frm, va_list args) __attribute__((format(printf, 1, 0))); ++std::string vformat(const char* frm, __va_list args) __attribute__((format(printf, 1, 0))); + + + } // namepace Mu Index: mail/mu/patches/patch-lib_utils_mu-utils_cc =================================================================== RCS file: /home/cvs/ports/mail/mu/patches/patch-lib_utils_mu-utils_cc,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-lib_utils_mu-utils_cc --- mail/mu/patches/patch-lib_utils_mu-utils_cc 11 Mar 2022 19:34:42 -0000 1.3 +++ mail/mu/patches/patch-lib_utils_mu-utils_cc 28 Jun 2022 20:30:21 -0000 @@ -1,13 +1,14 @@ -Bring vasprintf into scope - Index: lib/utils/mu-utils.cc --- lib/utils/mu-utils.cc.orig +++ lib/utils/mu-utils.cc -@@ -18,7 +18,6 @@ +@@ -17,10 +17,7 @@ + ** 02110-1301, USA. */ - +-#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE - #include + #include +-#endif /*_XOPEN_SOURCE*/ + + #include - #define GNU_SOURCE Index: mail/mu/patches/patch-mu_mu-cmd-server_cc =================================================================== RCS file: /home/cvs/ports/mail/mu/patches/patch-mu_mu-cmd-server_cc,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-mu_mu-cmd-server_cc --- mail/mu/patches/patch-mu_mu-cmd-server_cc 11 Mar 2022 19:34:42 -0000 1.2 +++ mail/mu/patches/patch-mu_mu-cmd-server_cc 28 Jun 2022 20:30:21 -0000 @@ -3,12 +3,12 @@ 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"); +@@ -130,7 +130,7 @@ Mu::mu_cmd_server(const MuConfig* opts) try { + opts->debug ? "yes" : "no", + have_readline() ? "yes" : "no"); -- tty = ::isatty(::fileno(stdout)); -+ tty = ::isatty(fileno(stdout)); - - const auto eval = std::string { - opts->commands ? "(help :full t)" : opts->eval ? opts->eval : ""}; +- tty = ::isatty(::fileno(stdout)); ++ tty = ::isatty(fileno(stdout)); + const auto eval = std::string{opts->commands ? "(help :full t)" + : opts->eval ? opts->eval + : ""}; Index: mail/mu/pkg/PFRAG.guile =================================================================== RCS file: /home/cvs/ports/mail/mu/pkg/PFRAG.guile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PFRAG.guile --- mail/mu/pkg/PFRAG.guile 11 Mar 2022 19:34:42 -0000 1.2 +++ mail/mu/pkg/PFRAG.guile 31 Jul 2022 09:58:59 -0000 @@ -2,11 +2,6 @@ @static-lib lib/libguile-mu.a lib/libguile-mu.la @lib lib/libguile-mu.so.${LIBguile-mu_VERSION} -share/guile/site/2.2/mu/ -share/guile/site/2.2/mu.scm -share/guile/site/2.2/mu/plot.scm -share/guile/site/2.2/mu/script.scm -share/guile/site/2.2/mu/stats.scm share/mu/ share/mu/scripts/ share/mu/scripts/find-dups.scm @@ -16,3 +11,8 @@ share/mu/scripts/msgs-per-hour.scm share/mu/scripts/msgs-per-month.scm share/mu/scripts/msgs-per-year-month.scm share/mu/scripts/msgs-per-year.scm +share/guile/site/3.0/mu/ +share/guile/site/3.0/mu.scm +share/guile/site/3.0/mu/plot.scm +share/guile/site/3.0/mu/script.scm +share/guile/site/3.0/mu/stats.scm Index: mail/mu/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/mail/mu/pkg/PLIST,v retrieving revision 1.9 diff -u -p -u -p -r1.9 PLIST --- mail/mu/pkg/PLIST 11 Mar 2022 19:34:42 -0000 1.9 +++ mail/mu/pkg/PLIST 31 Jul 2022 09:58:51 -0000 @@ -4,6 +4,7 @@ @man man/man1/mu-cfind.1 @man man/man1/mu-easy.1 @man man/man1/mu-extract.1 +@man man/man1/mu-fields.1 @man man/man1/mu-find.1 @man man/man1/mu-help.1 @man man/man1/mu-index.1 @@ -27,16 +28,26 @@ share/emacs/site-lisp/ share/emacs/site-lisp/mu4e/ share/emacs/site-lisp/mu4e/mu4e-actions.el share/emacs/site-lisp/mu4e/mu4e-actions.elc +share/emacs/site-lisp/mu4e/mu4e-bookmarks.el +share/emacs/site-lisp/mu4e/mu4e-bookmarks.elc share/emacs/site-lisp/mu4e/mu4e-compose.el share/emacs/site-lisp/mu4e/mu4e-compose.elc +share/emacs/site-lisp/mu4e/mu4e-config.el +share/emacs/site-lisp/mu4e/mu4e-config.elc +share/emacs/site-lisp/mu4e/mu4e-contacts.el +share/emacs/site-lisp/mu4e/mu4e-contacts.elc share/emacs/site-lisp/mu4e/mu4e-context.el share/emacs/site-lisp/mu4e/mu4e-context.elc share/emacs/site-lisp/mu4e/mu4e-contrib.el share/emacs/site-lisp/mu4e/mu4e-contrib.elc share/emacs/site-lisp/mu4e/mu4e-draft.el share/emacs/site-lisp/mu4e/mu4e-draft.elc +share/emacs/site-lisp/mu4e/mu4e-folders.el +share/emacs/site-lisp/mu4e/mu4e-folders.elc share/emacs/site-lisp/mu4e/mu4e-headers.el share/emacs/site-lisp/mu4e/mu4e-headers.elc +share/emacs/site-lisp/mu4e/mu4e-helpers.el +share/emacs/site-lisp/mu4e/mu4e-helpers.elc share/emacs/site-lisp/mu4e/mu4e-icalendar.el share/emacs/site-lisp/mu4e/mu4e-icalendar.elc share/emacs/site-lisp/mu4e/mu4e-lists.el @@ -47,24 +58,18 @@ share/emacs/site-lisp/mu4e/mu4e-mark.el share/emacs/site-lisp/mu4e/mu4e-mark.elc share/emacs/site-lisp/mu4e/mu4e-message.el share/emacs/site-lisp/mu4e/mu4e-message.elc -share/emacs/site-lisp/mu4e/mu4e-meta.el -share/emacs/site-lisp/mu4e/mu4e-meta.elc share/emacs/site-lisp/mu4e/mu4e-org.el share/emacs/site-lisp/mu4e/mu4e-org.elc -share/emacs/site-lisp/mu4e/mu4e-proc.el -share/emacs/site-lisp/mu4e/mu4e-proc.elc +share/emacs/site-lisp/mu4e/mu4e-search.el +share/emacs/site-lisp/mu4e/mu4e-search.elc +share/emacs/site-lisp/mu4e/mu4e-server.el +share/emacs/site-lisp/mu4e/mu4e-server.elc share/emacs/site-lisp/mu4e/mu4e-speedbar.el share/emacs/site-lisp/mu4e/mu4e-speedbar.elc -share/emacs/site-lisp/mu4e/mu4e-utils.el -share/emacs/site-lisp/mu4e/mu4e-utils.elc +share/emacs/site-lisp/mu4e/mu4e-update.el +share/emacs/site-lisp/mu4e/mu4e-update.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