[Midnightbsd-cvs] [MidnightBSD/mports] fb06c2: mail/mutt: update to 2.4.1 (#726)
Lucas Holt
noreply at github.com
Sun Aug 9 09:42:08 EDT 2026
Branch: refs/heads/master
Home: https://github.com/MidnightBSD/mports
Commit: fb06c204f41640db50f4854e0670c8076e6bb7de
https://github.com/MidnightBSD/mports/commit/fb06c204f41640db50f4854e0670c8076e6bb7de
Author: Lucas Holt <luke at foolishgames.com>
Date: 2026-08-09 (Sun, 09 Aug 2026)
Changed paths:
M mail/mutt/Makefile
M mail/mutt/distinfo
M mail/mutt/files/extra-patch-ifdef
M mail/mutt/files/extra-patch-maildir-mtime
R mail/mutt/files/extra-patch-quote
M mail/mutt/files/extra-patch-reverse_reply
M mail/mutt/files/extra-patch-smartdate
M mail/mutt/files/extra-smime-sender
M mail/mutt/files/patch-date-conditional
M mail/mutt/files/patch-dgc-deepif
Log Message:
-----------
mail/mutt: update to 2.4.1 (#726)
Update `mail/mutt` from 2.3.2 to 2.4.1.
## The patch set is the substance of this change
mutt **2.4.0 reformatted the entire source tree** (space-before-paren
removed, tabs → spaces). Every carried patch failed on whitespace
context, not semantics — `diff -w -B` between 2.3.2 and 2.4.1 confirms
near-zero real change in the affected files (`commands.c`: zero
non-whitespace diff).
**Nothing was upstreamed.** Each feature was checked by grepping 2.4.1
for its distinctive symbol — `"ifdef"` in `Commands[]`,
`reverse_reply`/`OPTREVREPLY`, `smartdate`, `OPTSMIMENOSENDER`,
`check_maildir_times` — all absent, and 2.4.0/2.4.1 `UPDATING` mentions
none of them. So all were re-anchored, none dropped as redundant.
Re-anchored by hand against pristine 2.4.1 and reindented to upstream's
new style (`bmake makepatch` was **not** used):
| patch | option | files |
|---|---|---|
| `patch-date-conditional` | unconditional | `hdrline.c`, `muttlib.c` |
| `patch-dgc-deepif` | unconditional | `muttlib.c` |
| `extra-patch-ifdef` | IFDEF_PATCH (default on) | `init.c`, `init.h` |
| `extra-patch-maildir-mtime` | MAILDIR_MTIME_PATCH (default on) |
`browser.c` |
| `extra-patch-reverse_reply` | REVERSE_REPLY_PATCH (default on) |
`init.h`, `mutt.h`, `protos.h`, `send.c`, `sendlib.c` |
| `extra-patch-smartdate` | SMART_DATE (default on) | `hdrline.c`,
`mutt.h` |
| `extra-smime-sender` | SMIME (default on) | `commands.c`, `init.h`,
`mutt.h` |
**These are mports-only.** FreeBSD deleted the entire feature-patch set
in `ee5c5804ddf6` (2023, maintainer's own PR 272194) to stay in line
with upstream. mports kept them, so there is no FreeBSD counterpart to
sync from — every re-anchor was hand-written from the 2.3.2 semantics.
**Deleted `files/extra-patch-quote`** — orphaned: grepping the Makefile
for `extra-patch-quote|QUOTE` returns nothing (the QUOTE_PATCH option
was dropped long ago, FreeBSD `efe2cf37e6`), and it no longer applies to
2.4.1.
**Verification of the patch work:** after `bmake patch`, all ten touched
source files in `WRKSRC` are byte-identical to the intended tree. Note
`do-patch.sh` applies `EXTRA_PATCHES` *before* the `patch-*` glob
(opposite of file ordering); it composes correctly either way because
the overlapping regions in `hdrline.c` (smartdate ~247, date-conditional
~344) and `muttlib.c` are non-adjacent and absorb as line offsets.
Recompiling the seven hand-patched sources under `-Wall` produced zero
warnings and zero errors.
**Caveat on what the build proves:** these features are
compile-time-gated options. A default build exercises them at compile
time but does **not** functionally test them. This is the highest-risk
change in this batch and warrants a closer look than a green build
implies.
## Dependencies
**Added** `textproc/docbook-xsl` and `textproc/libxslt` to
`DOCS_BUILD_DEPENDS` (FreeBSD sync); both present in mports.
**Deliberately not synced:** FreeBSD moved `HCACHE_LMDB` to
`databases/lmdb0` because their `databases/lmdb` went to 1.0.0 with a
new ABI. mports `databases/lmdb` is still 0.9.33 and ABI-compatible, so
`liblmdb.so:databases/lmdb` stays correct.
## Verification
makesum/patch/build/fake/package all OK → `mutt-2.4.1.mport`, with
**default options** (`bmake showconfig` equals `OPTIONS_DEFAULT`
exactly; `/var/db/mports/options/mail_mutt` is empty, so no saved config
interfered). distinfo matches FreeBSD; the `mutt-2.2.0.vc.greeting`
entry survives. LICENSE unchanged (GPL v2 "or any later"; `gpl2+`
stays). No plist surprises. portlint: 0 fatal.
## Noted, not fixed
1. `SASL_NONE` has no `CONFIGURE` block in mports, so selecting it does
nothing. FreeBSD fixed this in `37e65e1ec393` with
`SASL_NONE_CONFIGURE_ON=--with-sasl=no`. Pre-existing.
2. `extra-patch-ifdef` inserts the `ifdef` command *inside* the `#ifdef
HAVE_ICONV` block, so the command only exists in iconv builds. Almost
certainly an upstream-patch accident, but preserved verbatim rather than
changing behavior.
3. Dead config: `VVV_PATCH_VERSION=1.13.0` and the `:vvv` entries in
`MASTER_SITES`/`PATCH_SITES` have no corresponding `PATCHFILES`.
4. `GREETING_PATCH_VERSION=2.2.0` is pinned to a 2022 third-party patch
from vc.org.ua; it still fetches and checksums, but nobody has produced
a 2.4.x version. Off by default, so not build-tested.
amd64, default options only. No test target exists.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
## Summary by Sourcery
Update the mutt mail client port to 2.4.1 while preserving existing
mports-only feature patches and cleaning up obsolete patch files.
New Features:
- Retain and re-anchor mports-only mutt feature patches (ifdef command,
maildir mtime handling, reverse reply behavior, smart date display,
SMIME sender handling, date-conditional logic, and deep-if handling)
against the 2.4.1 source tree.
Enhancements:
- Remove the obsolete extra-patch-quote file, which no longer applies
and is no longer wired into the port options.
Build:
- Adjust DOCS build dependencies to use docbook-xsl and libxslt
alongside lynx for generating documentation, in line with
upstream/FreeBSD practices.
Signed-off-by: Lucas Holt <luke at foolishgames.com>
To unsubscribe from these emails, change your notification settings at https://github.com/MidnightBSD/mports/settings/notifications
More information about the Midnightbsd-cvs
mailing list