diff --git a/mail/mu/Makefile b/mail/mu/Makefile index 2b9619e3ee28..4d3a1f8f28bb 100644 --- a/mail/mu/Makefile +++ b/mail/mu/Makefile @@ -1,41 +1,42 @@ PORTNAME= mu -DISTVERSION= 1.14.2 +DISTVERSION= 1.14.3 CATEGORIES= mail MASTER_SITES= https://github.com/djcb/${PORTNAME}/releases/download/v${DISTVERSION}/ -MAINTAINER= rwn@mailo.com +MAINTAINER= mce@FreeBSD.org COMMENT= Mail searching frontend for Xapian WWW= https://www.djcbsoftware.nl/code/mu/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cli11>0:devel/cli11 LIB_DEPENDS= libxapian.so:databases/xapian-core14 \ libfmt.so:devel/libfmt \ libgmime-3.0.so:mail/gmime30 USES= compiler:c++20-lang gnome meson pkgconfig python:build \ readline shebangfix tar:xz USE_GNOME= glib20 SHEBANG_FILES= build-aux/date.py +MESON_ARGS= -Dbash-completion=enabled -Dzsh-completion=enabled OPTIONS_DEFINE= CLD2 DOCS GUILE MANPAGES MU4E OPTIONS_DEFAULT= MANPAGES MU4E OPTIONS_SUB= yes CLD2_DESC= Install CL2 support GUILE_DESC= Install guile support MU4E_DESC= Install mu4e e-mail client for emacs CLD2_LIB_DEPENDS= libcld2.so:devel/cld2 CLD2_MESON_ENABLED= cld2 GUILE_USES= guile:3.0 GUILE_MESON_ENABLED= scm MANPAGES_BUILD_DEPENDS= emacs:editors/emacs@nox MU4E_BUILD_DEPENDS= emacs:editors/emacs@nox .include diff --git a/mail/mu/distinfo b/mail/mu/distinfo index 45dcdc71b3ef..fc697274c543 100644 --- a/mail/mu/distinfo +++ b/mail/mu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1781559939 -SHA256 (mu-1.14.2.tar.xz) = db0732a7bd037d8726ec0c848aa3fe5736c810c90c96d70b597645f1821d9a0d -SIZE (mu-1.14.2.tar.xz) = 1042120 +TIMESTAMP = 1786269563 +SHA256 (mu-1.14.3.tar.xz) = edea1a4e6be390a2bf5260e0156813f9b473c2d91da934b219dbb38229b0930a +SIZE (mu-1.14.3.tar.xz) = 1065948 diff --git a/mail/mu/files/patch-mu4e_meson.build b/mail/mu/files/patch-mu4e_meson.build index f08625bf204d..0cf4120d4d40 100644 --- a/mail/mu/files/patch-mu4e_meson.build +++ b/mail/mu/files/patch-mu4e_meson.build @@ -1,63 +1,63 @@ ---- mu4e/meson.build.orig 2026-05-31 14:03:29 UTC +--- mu4e/meson.build.orig 2026-08-09 10:01:09 UTC +++ mu4e/meson.build -@@ -46,6 +46,7 @@ mu4e_srcs=[ +@@ -47,6 +47,7 @@ mu4e_srcs=[ 'mu4e-contacts.el', 'mu4e-context.el', 'mu4e-contrib.el', + 'mu4e-dbus.el', 'mu4e-draft.el', 'mu4e-folders.el', 'mu4e-headers.el', -@@ -73,52 +74,6 @@ mu4e_srcs=[ +@@ -74,52 +75,6 @@ mu4e_srcs=[ 'mu4e-window.el', 'mu4e.el' ] - -# 'bc'->byte-compile. The above should always be byte-compiled. -mu4e_bc_srcs = mu4e_srcs - -# do have we have dbus support? -mu4e_srcs += 'mu4e-dbus.el' -emacs_dbus = run_command(emacs, '--batch', '--eval', '(kill-emacs (if (featurep \'dbusbind) 0 1))', - check: false) -if emacs_dbus.returncode() == 0 - mu4e_bc_srcs += 'mu4e-dbus.el' -else - message('mu4e-dbus.el cannot be byte-compiled') -endif - -# note, we cannot compile mu4e-config.el without incurring -# WARNING: Source item -# '[...]/build/mu4e/mu4e-meta.el' cannot be converted to File object, because -# it is a generated file. This will become a hard error in the future. -# -#... so let's not do that! - -# byte compile the sources that can be byte-compiled. This may exclude mu4e-dbus.el -foreach src : mu4e_bc_srcs - target_name= '@BASENAME@.elc' -- target_path = join_paths(meson.current_build_dir(), target_name) +- target_path = meson.current_build_dir() / target_name - target_func = '(setq byte-compile-dest-file-function(lambda(_) "' + target_path + '"))' - - custom_target(src.underscorify() + '_el', - build_by_default: true, - input: src, - output: target_name, - install_dir: mu4e_lispdir, - install: true, - # rebuild all if any changed. - depend_files: mu4e_srcs, - command: [emacs, - '--no-init-file', - '--batch', - '--directory', meson.current_source_dir(), - '--directory', meson.current_build_dir(), - # we don't need warnings for items that have become - # obsolete _after_ our last supported emacs release. - '--eval', '(setq byte-compile-warnings \'(not obsolete))', - '--eval', target_func, - '--funcall', 'batch-byte-compile', '@INPUT@']) -endforeach # hack-around for native compile issue: copy sources to builddir. # see: https://debbugs.gnu.org/db/47/47987.html diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist index 6ac494a68d13..d3e9f5861004 100644 --- a/mail/mu/pkg-plist +++ b/mail/mu/pkg-plist @@ -1,62 +1,65 @@ bin/mu +share/bash-completion/completions/mu %%MANPAGES%%share/man/man1/mu-add.1.gz %%MANPAGES%%share/man/man1/mu-cfind.1.gz %%MANPAGES%%share/man/man1/mu-extract.1.gz %%MANPAGES%%share/man/man1/mu-find.1.gz %%MANPAGES%%share/man/man1/mu-help.1.gz %%MANPAGES%%share/man/man1/mu-index.1.gz %%MANPAGES%%share/man/man1/mu-info.1.gz %%MANPAGES%%share/man/man1/mu-init.1.gz %%MANPAGES%%share/man/man1/mu-labels.1.gz %%MANPAGES%%share/man/man1/mu-mkdir.1.gz %%MANPAGES%%share/man/man1/mu-move.1.gz %%MANPAGES%%share/man/man1/mu-remove.1.gz %%MANPAGES%%share/man/man1/mu-scm.1.gz %%MANPAGES%%share/man/man1/mu-server.1.gz %%MANPAGES%%share/man/man1/mu-verify.1.gz %%MANPAGES%%share/man/man1/mu-view.1.gz %%MANPAGES%%share/man/man1/mu.1.gz %%MANPAGES%%share/man/man5/mu-bookmarks.5.gz %%MANPAGES%%share/man/man7/mu-easy.7.gz %%MANPAGES%%share/man/man7/mu-query.7.gz %%PORTDOCS%%%%DOCSDIR%%/IDEAS.org %%PORTDOCS%%%%DOCSDIR%%/NEWS.org %%MU4E%%%%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-actions.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-autoloads.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-bookmarks.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-compose.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-config.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contacts.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-context.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contrib.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-dbus.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-draft.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-folders.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-headers.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-helpers.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-icalendar.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-labels.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-lists.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-main.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mark.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-message.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mime-parts.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-modeline.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-notification.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-obsolete.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-org.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-pkg.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-query-items.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-search.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-server.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-speedbar.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-thread.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-transient.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-update.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-vars.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-view.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e-window.el %%MU4E%%share/emacs/site-lisp/mu4e/mu4e.el +share/icons/hicolor/scalable/apps/mu-icon.svg %%GUILE%%%%DATADIR%%/scm/mu-scm-repl.scm %%GUILE%%%%DATADIR%%/scm/mu-scm.scm +share/zsh/site-functions/_mu