summaryrefslogtreecommitdiff
path: root/mail/mu
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--mail/mu/Makefile52
-rw-r--r--mail/mu/distinfo8
-rw-r--r--mail/mu/files/mu-ask4
-rw-r--r--mail/mu/files/patch-configure.ac18
-rw-r--r--mail/mu/files/patch-lib_utils_mu-lang-detector.cc13
-rw-r--r--mail/mu/pkg-descr13
-rw-r--r--mail/mu/pkg-plist130
-rw-r--r--mail/mu4e-maildirs/Makefile53
-rw-r--r--mail/mu4e-maildirs/distinfo3
-rw-r--r--mail/mu4e-maildirs/files/patch-mu4e-maildirs-extension.el10
-rw-r--r--mail/mu4e-maildirs/pkg-descr1
-rw-r--r--mail/mu4e-maildirs/pkg-message10
-rw-r--r--mail/mu4e/Makefile50
-rw-r--r--mail/mu4e/distinfo3
-rw-r--r--mail/mu4e/files/byte-compile.mk17
-rw-r--r--mail/mu4e/files/patch-configure.ac133
-rw-r--r--mail/mu4e/files/patch-mu4e_Makefile.am11
-rw-r--r--mail/mu4e/pkg-descr2
-rw-r--r--mail/mu4e/pkg-plist51
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt/distinfo6
21 files changed, 153 insertions, 437 deletions
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index ac6aecbee224..8005d3e08766 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,10 +1,12 @@
PORTNAME= mu
-PORTVERSION= 1.8.13
-PORTREVISION= 4
-DISTVERSIONPREFIX= v
+DISTVERSION= 1.12.13
CATEGORIES= mail
+MASTER_SITES= https://github.com/djcb/${PORTNAME}/releases/download/v${DISTVERSION}/
-MAINTAINER= hrs@FreeBSD.org
+PATCH_SITES= https://github.com/djcb/mu/commit/
+PATCHFILES= 0a4fabbf446d15b538600dfe7d879cad70ce941e.patch:-p1
+
+MAINTAINER= rwn@mailo.com
COMMENT= Mail searching frontend for Xapian
WWW= https://www.djcbsoftware.nl/code/mu/
@@ -12,36 +14,30 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxapian.so:databases/xapian-core \
- libgmime-3.0.so:mail/gmime30 \
- libgc-threaded.so:devel/boehm-gc-threaded \
- libjson-glib-1.0.so:devel/json-glib
-
-USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
- libtool makeinfo pkgconfig
-USE_GITHUB= yes
-GH_ACCOUNT= djcb
-USE_GNOME= glib20
+ libfmt.so:devel/libfmt \
+ libgmime-3.0.so:mail/gmime30
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-CONFIGURE_ARGS= --disable-mu4e
-INSTALL_TARGET= install-strip
+USES= compiler:c++17-lang gnome meson pkgconfig python:build \
+ readline shebangfix tar:xz
+SHEBANG_FILES= build-aux/date.py
+USE_GNOME= glib20
-OPTIONS_DEFINE= DOCS GUILE
-OPTIONS_DEFAULT= DOCS GUILE
+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_USE= ldconfig=yes
-GUILE_CONFIGURE_ENABLE= guile
-GUILE_INFO= mu-guile
+GUILE_MESON_ENABLED= guile
-post-install:
- cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
- ${STAGEDIR}${PREFIX}/bin
+MANPAGES_BUILD_DEPENDS= emacs:editors/emacs@nox
-post-install-GUILE-on:
- ${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
- ${XARGS} ${STRIP_CMD}
+MU4E_RUN_DEPENDS= emacs:editors/emacs
.include <bsd.port.mk>
diff --git a/mail/mu/distinfo b/mail/mu/distinfo
index 2ce3ca9bf865..06bf7dc8d329 100644
--- a/mail/mu/distinfo
+++ b/mail/mu/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1672749076
-SHA256 (djcb-mu-v1.8.13_GH0.tar.gz) = bb95143f6b153637c3d2551b81d82a04fea0227aa470df863abfa4e2b6474e7e
-SIZE (djcb-mu-v1.8.13_GH0.tar.gz) = 734397
+TIMESTAMP = 1761521692
+SHA256 (mu-1.12.13.tar.xz) = 7908078c5cc90afc7c038d4372b33b404f7fddfe466a27994413dc06f993a445
+SIZE (mu-1.12.13.tar.xz) = 775148
+SHA256 (0a4fabbf446d15b538600dfe7d879cad70ce941e.patch) = 24b385afcc508550e6edb745c03d320c2de37905128b15da348455814b2a7327
+SIZE (0a4fabbf446d15b538600dfe7d879cad70ce941e.patch) = 931
diff --git a/mail/mu/files/mu-ask b/mail/mu/files/mu-ask
deleted file mode 100644
index 708d2b177851..000000000000
--- a/mail/mu/files/mu-ask
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-read -p "Query: " query
-exec mu find "$@" $query
diff --git a/mail/mu/files/patch-configure.ac b/mail/mu/files/patch-configure.ac
deleted file mode 100644
index 19771e805d8c..000000000000
--- a/mail/mu/files/patch-configure.ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.ac.orig 2022-12-06 08:23:41 UTC
-+++ configure.ac
-@@ -134,13 +134,13 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo
- m4_ifndef([PKG_PROG_PKG_CONFIG],
- [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])])
- PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot
--AS_IF([test -z "$PKG_CONFIG"],
-+AS_IF([test -z "$PKG_CONFIG"],[
- AC_MSG_ERROR([
- *** pkg-config with version >= 0.28 could not be found.
- ***
- *** Make sure it is in your path, or set the PKG_CONFIG environment variable
- *** to the full path to pkg-config.])
--)
-+])
-
- # glib2?
- PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
diff --git a/mail/mu/files/patch-lib_utils_mu-lang-detector.cc b/mail/mu/files/patch-lib_utils_mu-lang-detector.cc
new file mode 100644
index 000000000000..9c4664d23af9
--- /dev/null
+++ b/mail/mu/files/patch-lib_utils_mu-lang-detector.cc
@@ -0,0 +1,13 @@
+--- lib/utils/mu-lang-detector.cc.orig 2025-09-29 18:02:55 UTC
++++ lib/utils/mu-lang-detector.cc
+@@ -25,8 +25,8 @@ Option<Language> Mu::detect_language(const std::string
+ // Dummy implementation
+ Option<Language> Mu::detect_language(const std::string& txt) { return Nothing; }
+ #else
+-#include <cld2/public/compact_lang_det.h>
+-#include <cld2/public/encodings.h>
++#include <cld/public/compact_lang_det.h>
++#include <cld/public/encodings.h>
+
+ Option<Language>
+ Mu::detect_language(const std::string& txt)
diff --git a/mail/mu/pkg-descr b/mail/mu/pkg-descr
index 0720c6a41268..c53ca570b63e 100644
--- a/mail/mu/pkg-descr
+++ b/mail/mu/pkg-descr
@@ -1,4 +1,9 @@
-mu is a tool for dealing with e-mail messages stored in the
-Maildir-format, on Unix-like systems. mu's main purpose is to help you
-to find the messages you need, quickly; in addition, it allows you to
-view messages, extract attachments, create new maildirs, ...
+mu is a set of command-line tools for dealing with e-mail messages
+stored in the Maildir-format. mu's goal is to help you to quickly find
+the messages you need, view them, extract attachments, create new
+maildirs, and so on.
+
+Built on top of mu are some extensions (included in this package):
+
+- mu4e: a full-featured e-mail client that runs inside emacs
+- mu-scm: bindings for the Guile/Scheme programming language
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
index 42480f689446..c1de3dc2ec5c 100644
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -1,36 +1,102 @@
bin/mu
-bin/mu-ask
-%%GUILE%%lib/libguile-mu.so
-%%GUILE%%lib/libguile-mu.so.0
-%%GUILE%%lib/libguile-mu.so.0.0.0
+%%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
-%%GUILE%%share/guile/site/3.0/mu.scm
-%%GUILE%%share/guile/site/3.0/mu/plot.scm
-%%GUILE%%share/guile/site/3.0/mu/script.scm
-%%GUILE%%share/guile/site/3.0/mu/stats.scm
-share/man/man1/mu-add.1.gz
-share/man/man1/mu-cfind.1.gz
-share/man/man1/mu-easy.1.gz
-share/man/man1/mu-extract.1.gz
-share/man/man1/mu-fields.1.gz
-share/man/man1/mu-find.1.gz
-share/man/man1/mu-help.1.gz
-share/man/man1/mu-index.1.gz
-share/man/man1/mu-info.1.gz
-share/man/man1/mu-init.1.gz
-share/man/man1/mu-mkdir.1.gz
-share/man/man1/mu-remove.1.gz
-share/man/man1/mu-script.1.gz
-share/man/man1/mu-server.1.gz
-share/man/man1/mu-verify.1.gz
-share/man/man1/mu-view.1.gz
-share/man/man1/mu.1.gz
-share/man/man5/mu-bookmarks.5.gz
-share/man/man7/mu-query.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-actions.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-actions.elc
+%%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-bookmarks.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-compose.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-compose.elc
+%%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-contacts.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-context.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-context.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contrib.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contrib.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-draft.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-draft.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-folders.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-folders.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-headers.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-headers.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-helpers.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-helpers.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-icalendar.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-icalendar.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-labels.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-labels.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-lists.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-lists.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-main.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-main.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mark.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mark.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-message.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-message.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mime-parts.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mime-parts.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-modeline.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-modeline.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-notification.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-notification.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-obsolete.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-obsolete.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-org.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-org.elc
+%%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-query-items.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-search.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-search.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-server.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-server.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-speedbar.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-speedbar.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-thread.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-thread.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-transient.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-transient.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-update.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-update.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-vars.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-vars.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-view.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-view.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-window.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-window.elc
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e.elc
+%%GUILE%%lib/guile/%%GUILE_VER%%/extensions/libguile-mu.so
+%%GUILE%%%%GUILE_SITE%%/mu.scm
+%%GUILE%%%%GUILE_SITE%%/mu/message.scm
+%%GUILE%%%%GUILE_SITE%%/mu/plot.scm
+%%GUILE%%%%GUILE_SITE%%/mu/script.scm
+%%GUILE%%%%GUILE_SITE%%/mu/stats.scm
+%%GUILE%%%%DATADIR%%/scm/mu-scm-repl.scm
+%%GUILE%%%%DATADIR%%/scm/mu-scm.scm
%%GUILE%%%%DATADIR%%/scripts/find-dups.scm
+%%GUILE%%%%DATADIR%%/scripts/histogram.scm
%%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-hour.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm
-%%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm
diff --git a/mail/mu4e-maildirs/Makefile b/mail/mu4e-maildirs/Makefile
deleted file mode 100644
index 2ada2cee5391..000000000000
--- a/mail/mu4e-maildirs/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-PORTNAME= mu4e-maildirs
-PORTVERSION= 0.8.20201028
-PORTREVISION= 18
-CATEGORIES= mail
-PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= Maildirs extension for Mu4e
-WWW= https://github.com/agpchil/mu4e-maildirs-extension
-
-LICENSE= GPLv3
-
-BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
- mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
-RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
- mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
-
-USES= emacs
-USE_GITHUB= yes
-GH_PROJECT= ${PORTNAME}-extension
-GH_ACCOUNT= agpchil
-GH_TAGNAME= 1167bc6
-
-NO_ARCH= yes
-PLIST_FILES= ${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.elc \
- ${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.el.gz
-PORTDOCS= README.md
-
-OPTIONS_DEFINE= DOCS
-
-do-build:
- cd ${WRKSRC} && ${EMACS_CMD} --batch \
- --eval "(provide 'mu4e)" \
- --eval "(defvar mu4e~main-buffer-name \"tests\")" \
- --eval "(defvar mu4e-mu-binary \"mu\")" \
- --eval "(require 'cl)" \
- -l dash.el \
- -l mu4e-maildirs-extension.el \
- --eval "(byte-compile-file \"mu4e-maildirs-extension.el\")" && \
- ${GZIP_CMD} mu4e-maildirs-extension.el
-
-do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
- cd ${WRKSRC} && ${INSTALL_DATA} \
- mu4e-maildirs-extension.elc \
- mu4e-maildirs-extension.el.gz \
- ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e
-
-post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR} && \
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/mail/mu4e-maildirs/distinfo b/mail/mu4e-maildirs/distinfo
deleted file mode 100644
index 0893ac080698..000000000000
--- a/mail/mu4e-maildirs/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1629742120
-SHA256 (agpchil-mu4e-maildirs-extension-0.8.20201028-1167bc6_GH0.tar.gz) = fbd8f18ede3d95bdc1f81b48ae528dffc6bb6c11aff7ec4f4642b9cee4de2a92
-SIZE (agpchil-mu4e-maildirs-extension-0.8.20201028-1167bc6_GH0.tar.gz) = 10948
diff --git a/mail/mu4e-maildirs/files/patch-mu4e-maildirs-extension.el b/mail/mu4e-maildirs/files/patch-mu4e-maildirs-extension.el
deleted file mode 100644
index 216eef3e600a..000000000000
--- a/mail/mu4e-maildirs/files/patch-mu4e-maildirs-extension.el
+++ /dev/null
@@ -1,10 +0,0 @@
---- mu4e-maildirs-extension.el.orig 2020-10-28 09:21:07 UTC
-+++ mu4e-maildirs-extension.el
-@@ -34,6 +34,7 @@
-
- ;;; Code:
- (require 'mu4e)
-+(require 'mu4e-config)
- (require 'dash)
-
- (defgroup mu4e-maildirs-extension nil
diff --git a/mail/mu4e-maildirs/pkg-descr b/mail/mu4e-maildirs/pkg-descr
deleted file mode 100644
index 5b5e30af148e..000000000000
--- a/mail/mu4e-maildirs/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This is an mu4e extension to show a maildir summary in `mu4e-main-view`.
diff --git a/mail/mu4e-maildirs/pkg-message b/mail/mu4e-maildirs/pkg-message
deleted file mode 100644
index 5385ed3585cc..000000000000
--- a/mail/mu4e-maildirs/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
- message: <<EOM
-To enable this extension, add the following lines into ~/.emacs:
-
-(require 'mu4e-maildirs-extension)
-(mu4e-maildirs-extension)
-EOM
-}
-]
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
deleted file mode 100644
index 5ba88a110e77..000000000000
--- a/mail/mu4e/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME= mu4e
-PORTVERSION= 1.8.13
-PORTREVISION= 12
-DISTVERSIONPREFIX= v
-CATEGORIES= mail
-PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= Emacs frontend for Mu
-WWW= https://www.djcbsoftware.nl/code/mu/
-
-LICENSE= GPLv3+
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-RUN_DEPENDS= mu:mail/mu
-
-USES= autoreconf emacs makeinfo pkgconfig
-USE_GITHUB= yes
-GH_PROJECT= mu
-GH_ACCOUNT= djcb
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-guile \
- --disable-readline \
- --docdir="${DOCSDIR}" \
- --enable-mu4e
-INFO= ${PORTNAME}
-BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
-INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}
-INSTALL_TARGET= install-strip
-
-MAKE_JOBS_UNSAFE= yes
-
-OPTIONS_DEFINE= DOCS
-OPTIONS_SUB= yes
-
-post-extract:
- ${INSTALL_DATA} ${WRKSRC}/mu4e/obsolete/org-mu4e.el \
- ${WRKSRC}/mu4e/org-mu4e.el
-
-post-configure:
- ${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
- ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
- >> ${BUILD_WRKSRC}/Makefile
-
-post-install:
- cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
- ${GZIP_CMD} *.el
-
-.include <bsd.port.mk>
diff --git a/mail/mu4e/distinfo b/mail/mu4e/distinfo
deleted file mode 100644
index d673f70428d6..000000000000
--- a/mail/mu4e/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1672775272
-SHA256 (djcb-mu-v1.8.13_GH0.tar.gz) = bb95143f6b153637c3d2551b81d82a04fea0227aa470df863abfa4e2b6474e7e
-SIZE (djcb-mu-v1.8.13_GH0.tar.gz) = 734397
diff --git a/mail/mu4e/files/byte-compile.mk b/mail/mu4e/files/byte-compile.mk
deleted file mode 100644
index 134dc98e9f46..000000000000
--- a/mail/mu4e/files/byte-compile.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-.el.elc:
- if test '$(EMACS)' != no; then \
- am__dir=. am__subdir_includes=''; \
- case $@ in */*) \
- am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
- am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
- esac; \
- test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
- $(EMACS) --batch \
- $(AM_ELCFLAGS) $(ELCFLAGS) \
- $$am__subdir_includes -L $(builddir) -L $(srcdir) \
- --eval '(setq byte-compile-dest-file-function (lambda (_) "/tmp/$@"))' \
- -f batch-byte-compile '$<'; \
- if [ -f "/tmp/$@" ]; then \
- cp /tmp/$@ $@ && rm -f /tmp/$@; \
- fi; \
- else :; fi
diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac
deleted file mode 100644
index 55d9363fc128..000000000000
--- a/mail/mu4e/files/patch-configure.ac
+++ /dev/null
@@ -1,133 +0,0 @@
---- configure.ac.orig 2022-12-06 08:23:41 UTC
-+++ configure.ac
-@@ -34,11 +34,11 @@ AC_SUBST(prefix)
-
- # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
- # when a c++ compiler is not found. Weird, huh?
--AC_PROG_CXX
--AC_PROG_CC
--AC_PROG_CPP
-+#AC_PROG_CXX
-+#AC_PROG_CC
-+#AC_PROG_CPP
- AC_PROG_INSTALL
--AC_CHECK_INCLUDES_DEFAULT
-+#AC_CHECK_INCLUDES_DEFAULT
- AC_PROG_EGREP
-
-
-@@ -49,22 +49,22 @@ extra_flags="-Wformat-security \
- -Wno-bad-function-cast \
- -Wno-switch-enum"
-
--AX_CXX_COMPILE_STDCXX_17
--AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
--AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS])
--AX_VALGRIND_CHECK
-+#AX_CXX_COMPILE_STDCXX_17
-+#AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
-+#AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS])
-+#AX_VALGRIND_CHECK
-
--LT_INIT
-+#LT_INIT
-
- AX_CODE_COVERAGE
-
- AC_PROG_AWK
- AC_CHECK_PROG(SORT,sort,sort)
-
--AC_CHECK_HEADERS([wordexp.h])
-+#AC_CHECK_HEADERS([wordexp.h])
-
- # use the 64-bit versions
--AC_SYS_LARGEFILE
-+#AC_SYS_LARGEFILE
-
- # asan is somewhat similar to valgrind, but has low enough overhead so it
- # can be used during normal operation.
-@@ -134,52 +134,22 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo
- m4_ifndef([PKG_PROG_PKG_CONFIG],
- [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])])
- PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot
--AS_IF([test -z "$PKG_CONFIG"],
-+AS_IF([test -z "$PKG_CONFIG"],[
- AC_MSG_ERROR([
- *** pkg-config with version >= 0.28 could not be found.
- ***
- *** Make sure it is in your path, or set the PKG_CONFIG environment variable
- *** to the full path to pkg-config.])
--)
-+])
-
- # glib2?
--PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
--glib_version="$($PKG_CONFIG --modversion glib-2.0)"
-+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
-+# glib_version="$($PKG_CONFIG --modversion glib-2.0)"
-
- # gmime, version 3.0 or higher
--PKG_CHECK_MODULES(GMIME,gmime-3.0)
--gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
-+# PKG_CHECK_MODULES(GMIME,gmime-3.0)
-+# gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
-
--# xapian checking - we need 1.4 at least
--PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
-- have_xapian=yes
-- xapian_version=$($PKG_CONFIG xapian-core --modversion)
-- AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
--],[
-- # fall back to the xapian-config script. Not sure if there are cases where the
-- # pkgconfig does not work, but xapian-config does, so keep this for now.
-- AC_MSG_NOTICE([falling back to xapian-config])
-- AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
-- AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
-- AC_MSG_ERROR([
-- *** xapian could not be found; please install it
-- *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
-- *** If you compiled it yourself, you should ensure that xapian-config
-- *** is in your PATH.])],
-- [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
--
-- AS_CASE([$xapian_version],
-- [1.[[4-9]].[[0-9]]*],
-- [AC_MSG_NOTICE([xapian $xapian_version found.])],
-- [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
--
-- XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
-- XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
-- have_xapian="yes"
--
-- AC_SUBST(XAPIAN_CXXFLAGS)
-- AC_SUBST(XAPIAN_LIBS)
--])
- ###############################################################################
- # we set the set the version of the MuStore (Xapian database) layout
- # here; it will become part of the db name, so we can automatically
-@@ -247,24 +217,10 @@ Makefile
-
- AC_CONFIG_FILES([
- Makefile
--mu/Makefile
--lib/Makefile
--lib/doxyfile
--lib/thirdparty/Makefile
--lib/utils/Makefile
--lib/message/Makefile
--lib/index/Makefile
- mu4e/Makefile
- mu4e/mu4e-config.el
--guile/Makefile
--guile/mu/Makefile
--guile/examples/Makefile
--guile/scripts/Makefile
--man/Makefile
--m4/Makefile
--contrib/Makefile
- ])
--AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck])
-+# AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck])
-
- AC_OUTPUT
-
diff --git a/mail/mu4e/files/patch-mu4e_Makefile.am b/mail/mu4e/files/patch-mu4e_Makefile.am
deleted file mode 100644
index caae4391af09..000000000000
--- a/mail/mu4e/files/patch-mu4e_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- mu4e/Makefile.am.orig 2021-08-21 13:27:15 UTC
-+++ mu4e/Makefile.am
-@@ -44,7 +44,7 @@ dist_lisp_LISP= \
- mu4e-view-gnus.el \
- mu4e-view-old.el \
- mu4e.el \
-- obsolete/org-mu4e.el
-+ org-mu4e.el
-
-
- EXTRA_DIST= \
diff --git a/mail/mu4e/pkg-descr b/mail/mu4e/pkg-descr
deleted file mode 100644
index d96ff2835bc5..000000000000
--- a/mail/mu4e/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-mu4e is an Emacs frontend for mu, a tool for dealing with e-mail
-messages stored in the Maildir-format, on Unix-like systems.
diff --git a/mail/mu4e/pkg-plist b/mail/mu4e/pkg-plist
deleted file mode 100644
index e4e363322331..000000000000
--- a/mail/mu4e/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-bookmarks.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-bookmarks.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-config.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-config.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contacts.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contacts.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-folders.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-folders.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-helpers.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-helpers.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-search.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-search.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-server.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-server.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-update.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-update.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 8a495f3c6336..6ef6eff57f79 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mutt
-DISTVERSION= 2.2.15
+DISTVERSION= 2.2.16
CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
https://bitbucket.org/mutt/mutt/downloads/
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 27688e46001d..dac0a94ce039 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1759540899
-SHA256 (mutt/mutt-2.2.15.tar.gz) = a51686104e4203f4c2a3b176527be3b95d08e808e94fd2dcadb7c30566bf894d
-SIZE (mutt/mutt-2.2.15.tar.gz) = 5555304
+TIMESTAMP = 1763797056
+SHA256 (mutt/mutt-2.2.16.tar.gz) = 1d3109a743ad8b25eef97109b2bdb465db7837d0a8d211cd388be1b6faac3f32
+SIZE (mutt/mutt-2.2.16.tar.gz) = 5557080