From nobody Tue Oct 21 22:03:48 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crmXN4pllz6D5rH; Tue, 21 Oct 2025 22:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crmXN4J31z3D4X; Tue, 21 Oct 2025 22:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761084228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rB61q9UVFEP1W5ckY0pp+m7lFhBScZ88jCxIn7NlkeE=; b=EhOlIyQNCRfIg4+15jvTMvAvxIExS1j+b/CM5frYLyc+LSSfgi+9GefChQyV5OTM5Vzj0o SEGw1ho5Eji3EPiewaPMjR879v/9bYP+iIIgxWLh6fIrMr9f1rPA5UYe7+k69x8q1vzjJs dofXuiMTNtNGsmjNzkyYwRY7eKPfkPbu0E/HXvHH37Y6HbONSPxqVx0LPyAG0bu5pji+XH n3D+787J/uPdUkX7DYdZTkSrF45SZeV/6MA6QcRzuMeLRc4TDCiWWD93fWF2HbbpMYY0dv 18m6Kr7jfZP48PBIv75Uv48Fz7iA+wG9or4bHZJUGgbgz4H/KW0VdawhjKtDtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761084228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rB61q9UVFEP1W5ckY0pp+m7lFhBScZ88jCxIn7NlkeE=; b=jNtha1jys8R78KwJ3L98eBVZb5aNU5DPQeqeTPvHtEULCqA9REsyCbw/UN8/v9Pntfkn9o e1mvmseHjnk8dtMvLPlkHeiK/p6gYUS7Oh+3LXgbJ0VceBtd76HWJB6+J2CwJBlFa78u0N xOtvDD3T9uZlYKwETisb539ANHwO1fesQ/DePVmb8Gj1HpxKXCEpfKLPPgwp/sXpSNXZyt KpkQ+BfC0UimMCKc51sYzfun2ddVsHDUY0F9Me0uOFBruEeKgoRqO5wyGYokVzdNZj47Wv uSvcXl1/Pn5OpdttW6Im9jfNXz3LAveyT8A0mJ3blcOXg6mUll3uB9X8kn/rpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761084228; a=rsa-sha256; cv=none; b=sWnxkyOz+JZJ8KT0g/2Fd7zAroTjfLAXqkE1dJDTgx5WfzxKGAFMstj1F+moc7wnCBO1c0 cDuiOED+VhxcdgopTRkiofr7UNLYC/d7QT5v6mazo0Xmw76DFeraGcgO0Q83O6XV/utmdY sii87PnQRLRO7xr337sEYpKv/u5OPr1iXUW8F/1XMmrH04aM3y3+ZWY5jqX4/9Yh2ZjOzv W2Xlaem0uPnBmv+0Rh9xazMKjZmVKEuL5C/o9y0UcZ9aF2d2mScGx385lxcd1FaOdQu59V y8A2YTXhgFaFzH8uYhvykwpv0YIyd0+M/GNsxJJojdtOHYos6iqz07/C62ORtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crmXN3srCz1GCs; Tue, 21 Oct 2025 22:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LM3meN018339; Tue, 21 Oct 2025 22:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LM3m3H018336; Tue, 21 Oct 2025 22:03:48 GMT (envelope-from git) Date: Tue, 21 Oct 2025 22:03:48 GMT Message-Id: <202510212203.59LM3m3H018336@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: c772a705045e - main - mail/mu: Update to 1.12.13 and take maintainership List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c772a705045ed84a715ba30297dc3a874527867b Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=c772a705045ed84a715ba30297dc3a874527867b commit c772a705045ed84a715ba30297dc3a874527867b Author: RwN AuthorDate: 2025-10-21 21:43:57 +0000 Commit: Hiroki Tagato CommitDate: 2025-10-21 22:02:07 +0000 mail/mu: Update to 1.12.13 and take maintainership Changelog: https://github.com/djcb/mu/blob/v1.12.13/NEWS.org PR: 289593 Reported by: RwN (new maintainer) Tested by: Trenton Schulz Approved by: hrs (previous maintainer, timeout >5 weeks) --- mail/mu/Makefile | 54 +++++++----- mail/mu/distinfo | 6 +- mail/mu/files/mu-ask | 4 - mail/mu/files/patch-configure.ac | 18 ---- mail/mu/files/patch-lib_utils_mu-lang-detector.cc | 13 +++ mail/mu/pkg-descr | 13 ++- mail/mu/pkg-plist | 100 ++++++++++++++++++---- 7 files changed, 139 insertions(+), 69 deletions(-) diff --git a/mail/mu/Makefile b/mail/mu/Makefile index ac6aecbee224..992d05b6a3e9 100644 --- a/mail/mu/Makefile +++ b/mail/mu/Makefile @@ -1,47 +1,55 @@ PORTNAME= mu -PORTVERSION= 1.8.13 -PORTREVISION= 4 DISTVERSIONPREFIX= v +DISTVERSION= 1.12.13 CATEGORIES= mail -MAINTAINER= hrs@FreeBSD.org +MAINTAINER= rwn@mailo.com COMMENT= Mail searching frontend for Xapian WWW= https://www.djcbsoftware.nl/code/mu/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= emacs:editors/emacs@nox + 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 + libfmt.so:devel/libfmt \ + libgmime-3.0.so:mail/gmime30 + +USES= meson compiler:c++17-lang gnome \ + makeinfo pkgconfig \ + readline shebangfix python:build -USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \ - libtool makeinfo pkgconfig USE_GITHUB= yes GH_ACCOUNT= djcb + USE_GNOME= glib20 -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --disable-mu4e -INSTALL_TARGET= install-strip +SHEBANG_GLOB= *.py -OPTIONS_DEFINE= DOCS GUILE -OPTIONS_DEFAULT= DOCS GUILE +OPTIONS_DEFINE= DOCS MU4E GUILE CLD2 +OPTIONS_DEFAULT= MU4E OPTIONS_SUB= yes +MU4E_DESC= Install mu4e e-mail client for emacs +GUILE_DESC= Install guile support +CLD2_DESC= Install CL2 support + +MU4E_RUN_DEPENDS= emacs:editors/emacs +MU4E_INFO= mu4e + GUILE_USES= guile:3.0 -GUILE_USE= ldconfig=yes -GUILE_CONFIGURE_ENABLE= guile -GUILE_INFO= mu-guile +GUILE_MESON_ENABLED= guile +GUILE_INFO= mu-guile mu-scm + +CLD2_MESON_ENABLED= cld2 +CLD2_LIB_DEPENDS= libcld2.so:devel/cld2 -post-install: - cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \ - ${STAGEDIR}${PREFIX}/bin +post-stage-GUILE-off: + ${RM} ${STAGEDIR}${PREFIX}/share/info/mu-guile.info + ${RM} ${STAGEDIR}${PREFIX}/share/info/mu-scm.info -post-install-GUILE-on: - ${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \ - ${XARGS} ${STRIP_CMD} +post-stage-MU4E-off: + ${RM} ${STAGEDIR}${PREFIX}/share/info/mu4e.info .include diff --git a/mail/mu/distinfo b/mail/mu/distinfo index 2ce3ca9bf865..6a7cbb7b3b5b 100644 --- a/mail/mu/distinfo +++ b/mail/mu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672749076 -SHA256 (djcb-mu-v1.8.13_GH0.tar.gz) = bb95143f6b153637c3d2551b81d82a04fea0227aa470df863abfa4e2b6474e7e -SIZE (djcb-mu-v1.8.13_GH0.tar.gz) = 734397 +TIMESTAMP = 1757779184 +SHA256 (djcb-mu-v1.12.13_GH0.tar.gz) = bc7c4dc1a3c86498efcbc9d61b4ff8c38630153c4a8f7e3af39c7f03c1c049bc +SIZE (djcb-mu-v1.12.13_GH0.tar.gz) = 1033829 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 Mu::detect_language(const std::string + // Dummy implementation + Option Mu::detect_language(const std::string& txt) { return Nothing; } + #else +-#include +-#include ++#include ++#include + + Option + 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..9163be007e4f 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 -%%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-labels.1.gz share/man/man1/mu-mkdir.1.gz +share/man/man1/mu-move.1.gz share/man/man1/mu-remove.1.gz -share/man/man1/mu-script.1.gz +share/man/man1/mu-scm.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-easy.7.gz share/man/man7/mu-query.7.gz +%%PORTDOCS%%%%DOCSDIR%%/IDEAS.org +%%PORTDOCS%%%%DOCSDIR%%/NEWS.org +%%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