git: 8aef05ad4efe - main - mail/aerc: Update from 0.16.0 to 0.18.0

From: Torsten Zuehlsdorff <tz_at_FreeBSD.org>
Date: Mon, 08 Jul 2024 08:41:55 UTC
The branch main has been updated by tz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8aef05ad4efe39d058c54d0829879b04d71c5c78

commit 8aef05ad4efe39d058c54d0829879b04d71c5c78
Author:     Torsten Zuehlsdorff <tz@FreeBSD.org>
AuthorDate: 2024-07-08 08:38:04 +0000
Commit:     Torsten Zuehlsdorff <tz@FreeBSD.org>
CommitDate: 2024-07-08 08:41:41 +0000

    mail/aerc: Update from 0.16.0 to 0.18.0
    
      Changelog:
    
      # Added
    
      - Add `[ui].msglist-scroll-offset` option to set a scroll offset for
        the message list.
      - Add new `:align` command to align the selected message at the top,
        center, or bottom of the message list.
      - Inline image previews when no filter is defined for `image/*` and the
        terminal supports it.
      - `:bounce` command to reintroduce messages into the transport system.
      - Message counts are available in statusline templates.
      - Execute IPC commands verbatim by providing the command and its args
        as a single argument in the shell.
      - Virtually any key binding can now be configured in `binds.conf`,
        including Shift+Alt+Control modifier combinations.
      - Configure default message list `:split` or `:vsplit` on startup with
        `message-list-split` in `aerc.conf`.
      - Create notmuch named queries with the `:query` command.
      - Specify a ":q" alias for quit.
      - The `:detach` command now understands globs similar to `:attach`.
      - Match filters on filename via `.filename,~<regexp> =`.
      - Tell aerc how to handle file-based operations on multi-file notmuch
        messages with the account config option `multi-file-strategy` and the
        `-m` flag to `:archive`, `:copy`, `:delete`, and `:move`.
      - Add `[ui].dialog-{position,width,height}` to set the position, width
        and height of popover dialogs.
      - New `pgp-self-encrypt` option in `accounts.conf`.
      - Add `--no-ipc` flag to run `aerc mailto:...`, `aerc mbox:...`, and
        `aerc :<command...>` within the current aerc instance and prevent
        listening for IPC calls from other aerc instances.
      - Add config options `disable-ipc-mailto` and `disable-ipc-mbox` to
        make `mailto:...` and `mbox:...` commands always run in a new aerc
        instance.
      - Set global options in `accounts.conf` by placing them at the top of
        the file.
      - Silently close the terminal tab after piping a message to a command
        with `:pipe -s <cmd>`.
      - New `tag-modified` hook for notmuch and JMAP accounts.
      - New `flag-changed` hook.
      - Notmuch search term completions to `:query`.
      - Notmuch completions for `:cf`, `:filter` and `:search`.
      - Add `imaps+insecure` to the available protocols, for connections that
        should ignore issues with certificate verification.
      - Add `[ui].select-last-message` option to position cursor at the
        bottom of the view.
      - Propagate terminal bell from the built-in terminal.
      - Added `AERC_FOLDER_ROLE` to hooks that have `AERC_FOLDER`.
      - Added `{{.AccountBackend}}` to templates.
      - Added `AERC_ACCOUNT_BACKEND` to hooks with `AERC_ACCOUNT`.
      - Per folder key bindings can now be defined for the message viewer.
      - Allow using existing directory name with `:query -f`.
      - Allow specifying the folder to delete with `:rmdir`.
      - The address book is now used for `:cc`, `:bcc` and `:forward`.
      - Allow fallback to threading by subject with
        `[ui].threading-by-subject`.
    
      # Fixed
    
      - Calendar responses now ignore case.
      - Allow account- and folder-specific binds to coexist.
      - Fixed crash when running `:send` with a `:preview` tab focused.
      - Deadlock when running `aerc mailto:foo@bar.com` without another
        instance of aerc already running.
      - Prevent a freeze for large-scale deletions with IMAP.
      - `Mime-Version` is no longer inserted in signed text parts headers.
        MTAs normalizing header case will not corrupt signatures anymore.
      - Restore previous behaviour of the new message bell which was broken
        in the last two releases for at least some setups.
    
      # Changed
    
      - The default `[ui]` settings and the `default` styleset have changed
        extensively. A no-color theme can be restored with the `monochrome`
        styleset.
      - The default `colorize` theme has been changed to use the base
        terminal colors.
      - The `[viewer]` section of stylesets now preserve default values as
        documented in `aerc-stylesets(7)` unless explicitly overridden.
      - Add Message-ID to the variables of `[hooks].mail-received`.
      - The `TrayInfo` template variable now includes a visual mark mode
        indicator.
      - The `disable-ipc` option in `aerc.conf` completely disables IPC.
      - Improved readability of the builtin `calendar` filter.
      - `:open` commands now preserve the original filename.
      - Unparsable accounts are skipped, instead of aerc exiting with an
        error.
    
      # Deprecated
    
      - Built-in descriptions for the default keybinds shown on the review
        screen will be deprecated in a future release. Descriptions can be
        added to those keybinds with inline comments in binds.conf.
    
      Taken from:
        https://git.sr.ht/~rjarry/aerc/refs/0.18.0
    
    PR:             280172
    Approved by:    Yuvakiran Rayapureddy <iamsleepy@ryuki.me> (maintainer)
---
 mail/aerc/Makefile  |  73 ++++++++++++++-------------
 mail/aerc/distinfo  | 140 ++++++++++++++++++++++++++--------------------------
 mail/aerc/pkg-plist |   2 +
 3 files changed, 107 insertions(+), 108 deletions(-)

diff --git a/mail/aerc/Makefile b/mail/aerc/Makefile
index 03571873689f..1729be77d63d 100644
--- a/mail/aerc/Makefile
+++ b/mail/aerc/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	aerc
-DISTVERSION=	0.16.0
-PORTREVISION=	7
+DISTVERSION=	0.18.0
 CATEGORIES=	mail
 
 MAINTAINER=	iamsleepy@ryuki.me
@@ -17,61 +16,61 @@ USES=		desktop-file-utils gmake go:modules ncurses:port python \
 		shebangfix
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	ProtonMail:go-crypto:71bec3603bf3:protonmail_crypto/vendor/golang.org/x/crypto \
-		ProtonMail:go-crypto:8ee5748c52b5:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
-		arran4:golang-ical:19abf92700cc:arran4_golang_ical/vendor/github.com/arran4/golang-ical \
-		cloudflare:circl:v1.3.2:cloudflare_circl/vendor/github.com/cloudflare/circl \
-		creack:pty:v1.1.18:creack_pty/vendor/github.com/creack/pty \
+
+GH_TUPLE=	ProtonMail:go-crypto:v1.0.0:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
+		arran4:golang-ical:v0.2.7:arran4_golang_ical/vendor/github.com/arran4/golang-ical \
+		cloudflare:circl:v1.3.7:cloudflare_circl/vendor/github.com/cloudflare/circl \
+		containerd:console:v1.0.4:containerd_console/vendor/github.com/containerd/console \
+		creack:pty:v1.1.21:creack_pty/vendor/github.com/creack/pty \
 		danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		emersion:go-imap-sortthread:v1.2.0:emersion_go_imap_sortthread/vendor/github.com/emersion/go-imap-sortthread \
 		emersion:go-imap:v1.2.1:emersion_go_imap/vendor/github.com/emersion/go-imap \
-		emersion:go-maildir:v0.3.0:emersion_go_maildir/vendor/github.com/emersion/go-maildir \
+		emersion:go-maildir:v0.4.1:emersion_go_maildir/vendor/github.com/emersion/go-maildir \
 		emersion:go-mbox:v1.0.3:emersion_go_mbox/vendor/github.com/emersion/go-mbox \
-		emersion:go-message:v0.17.0:emersion_go_message/vendor/github.com/emersion/go-message \
-		emersion:go-msgauth:v0.6.6:emersion_go_msgauth/vendor/github.com/emersion/go-msgauth \
-		emersion:go-pgpmail:v0.2.0:emersion_go_pgpmail/vendor/github.com/emersion/go-pgpmail \
-		emersion:go-sasl:0145f2c60ead:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
-		emersion:go-smtp:v0.16.0:emersion_go_smtp/vendor/github.com/emersion/go-smtp \
+		emersion:go-message:v0.18.0:emersion_go_message/vendor/github.com/emersion/go-message \
+		emersion:go-msgauth:v0.6.8:emersion_go_msgauth/vendor/github.com/emersion/go-msgauth \
+		emersion:go-pgpmail:v0.2.1:emersion_go_pgpmail/vendor/github.com/emersion/go-pgpmail \
+		emersion:go-sasl:e73c9f7bad43:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
+		emersion:go-smtp:v0.21.0:emersion_go_smtp/vendor/github.com/emersion/go-smtp \
 		emersion:go-textwrapper:65d896831594:emersion_go_textwrapper/vendor/github.com/emersion/go-textwrapper \
 		fsnotify:fsevents:v0.1.1:fsnotify_fsevents/vendor/github.com/fsnotify/fsevents \
-		fsnotify:fsnotify:v1.6.0:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		fsnotify:fsnotify:v1.7.0:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		gatherstars-com:jwz:v1.4.0:gatherstars_com_jwz/vendor/github.com/gatherstars-com/jwz \
-		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
-		gdamore:tcell:v2.6.0:gdamore_tcell_v2/vendor/github.com/gdamore/tcell/v2 \
+		go-check:check:10cb98267c6c:go_check_check/vendor/gopkg.in/check.v1 \
 		go-ini:ini:v1.67.0:go_ini_ini/vendor/github.com/go-ini/ini \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
-		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
-		golang:net:v0.9.0:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:v0.7.0:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.5.3:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:appengine:v1.6.8:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:v0.21.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:image:v0.15.0:golang_image/vendor/golang.org/x/image \
+		golang:mod:v0.14.0:golang_mod/vendor/golang.org/x/mod \
+		golang:oauth2:v0.18.0:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.5.4:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.4:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sys:v0.7.0:golang_sys/vendor/golang.org/x/sys \
-		golang:term:v0.7.0:golang_term/vendor/golang.org/x/term \
-		golang:text:v0.12.0:golang_text/vendor/golang.org/x/text \
-		golang:tools:v0.6.0:golang_tools/vendor/golang.org/x/tools \
-		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
+		golang:sys:v0.18.0:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.14.0:golang_text/vendor/golang.org/x/text \
+		golang:tools:v0.17.0:golang_tools/vendor/golang.org/x/tools \
 		kr:pretty:v0.3.0:kr_pretty/vendor/github.com/kr/pretty \
-		lithammer:fuzzysearch:v1.1.5:lithammer_fuzzysearch/vendor/github.com/lithammer/fuzzysearch \
-		lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		mattn:go-isatty:v0.0.18:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-runewidth:v0.0.14:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		lithammer:fuzzysearch:v1.1.8:lithammer_fuzzysearch/vendor/github.com/lithammer/fuzzysearch \
+		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.15:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		mattn:go-sixel:v0.0.5:mattn_go_sixel/vendor/github.com/mattn/go-sixel \
 		onsi:gomega:v1.20.0:onsi_gomega/vendor/github.com/onsi/gomega \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		protocolbuffers:protobuf-go:v1.30.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		rivo:uniseg:v0.4.4:rivo_uniseg/vendor/github.com/rivo/uniseg \
+		protocolbuffers:protobuf-go:v1.33.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		rivo:uniseg:v0.4.7:rivo_uniseg/vendor/github.com/rivo/uniseg \
 		riywo:loginshell:7d26008be1ab:riywo_loginshell/vendor/github.com/riywo/loginshell \
 		rogpeppe:go-internal:v1.8.1:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
-		stretchr:testify:v1.8.2:stretchr_testify/vendor/github.com/stretchr/testify \
-		syndtr:goleveldb:v1.0.0:syndtr_goleveldb/vendor/github.com/syndtr/goleveldb \
-		xo:terminfo:abceb7e1c41e:xo_terminfo/vendor/github.com/xo/terminfo
+		soniakeys:quant:v1.0.0:soniakeys_quant/vendor/github.com/soniakeys/quant \
+		stretchr:testify:v1.8.4:stretchr_testify/vendor/github.com/stretchr/testify \
+		syndtr:goleveldb:v1.0.0:syndtr_goleveldb/vendor/github.com/syndtr/goleveldb
 
 # Additional distfiles to fetch from https://git.sr.ht
 _SRHT_TUPLE=	rjarry:aerc:${DISTVERSIONFULL}:"" \
-		rockorager:go-jmap:v0.3.0:vendor/git.sr.ht/~rockorager/go-jmap \
-		rockorager:tcell-term:v0.8.0:vendor/git.sr.ht/~rockorager/tcell-term \
-		sircmpwn:getopt:v1.0.0:vendor/git.sr.ht/~sircmpwn/getopt
+		rjarry:go-opt:v1.4.0:vendor/git.sr.ht/~rjarry/go-opt \
+		rockorager:go-jmap:v0.5.0:vendor/git.sr.ht/~rockorager/go-jmap \
+		rockorager:vaxis:v0.9.2:vendor/git.sr.ht/~rockorager/vaxis
 
 SHEBANG_FILES=	contrib/carddav-query filters/show-ics-details.py
 
diff --git a/mail/aerc/distinfo b/mail/aerc/distinfo
index 5a6857cd0ad0..d3cc46a21518 100644
--- a/mail/aerc/distinfo
+++ b/mail/aerc/distinfo
@@ -1,22 +1,22 @@
-TIMESTAMP = 1696869457
-SHA256 (rjarry-aerc-0.16.0_SRHT0.tar.gz) = b81b4f27272df2e370da377438a500c0695d29b8a4c86ff5849d6ddf3433f4db
-SIZE (rjarry-aerc-0.16.0_SRHT0.tar.gz) = 387833
-SHA256 (sircmpwn-getopt-v1.0.0_SRHT0.tar.gz) = 923c577dbb10fc7d788b42930a486aaeddd90f1d396b092e16145213ea5d1327
-SIZE (sircmpwn-getopt-v1.0.0_SRHT0.tar.gz) = 8495
-SHA256 (rockorager-go-jmap-v0.3.0_SRHT0.tar.gz) = a78b2fac2330296b5d43c2b200b6eb2d288ba14a25efa2d07a95212feacd2035
-SIZE (rockorager-go-jmap-v0.3.0_SRHT0.tar.gz) = 61853
-SHA256 (rockorager-tcell-term-v0.8.0_SRHT0.tar.gz) = 5514f556629c7e99fe581e82d639a2d5563adeea24e06dc766c9807ebbe31374
-SIZE (rockorager-tcell-term-v0.8.0_SRHT0.tar.gz) = 114581
-SHA256 (ProtonMail-go-crypto-71bec3603bf3_GH0.tar.gz) = 392ebb83083271f4540a2752b8805d379a437e50d89f53c0a1c0203d45cd96e8
-SIZE (ProtonMail-go-crypto-71bec3603bf3_GH0.tar.gz) = 1985937
-SHA256 (ProtonMail-go-crypto-8ee5748c52b5_GH0.tar.gz) = 4a242722b277e991c8fc8420f396b358750986c4a9b6a4b301a40f6a9e823251
-SIZE (ProtonMail-go-crypto-8ee5748c52b5_GH0.tar.gz) = 375394
-SHA256 (arran4-golang-ical-19abf92700cc_GH0.tar.gz) = e1e6319a74eedb12efea47b71dc89b1a12d304130657553d18e4013110887d9c
-SIZE (arran4-golang-ical-19abf92700cc_GH0.tar.gz) = 22264
-SHA256 (cloudflare-circl-v1.3.2_GH0.tar.gz) = 2464b9dd16aaab4588780716fe597289c56dc6e9b1fadd4244f8364963908403
-SIZE (cloudflare-circl-v1.3.2_GH0.tar.gz) = 4764738
-SHA256 (creack-pty-v1.1.18_GH0.tar.gz) = 7a1d6775e3f99b98e5d87303e9aeacfd73d810abffc17e42a561d0650adc980e
-SIZE (creack-pty-v1.1.18_GH0.tar.gz) = 10668
+TIMESTAMP = 1720352903
+SHA256 (rjarry-aerc-0.18.0_SRHT0.tar.gz) = d20382d7eb6a93b8b6fe508b87c83eb1bb600a0443f173ab1edef0e81ea9f66a
+SIZE (rjarry-aerc-0.18.0_SRHT0.tar.gz) = 447257
+SHA256 (rockorager-go-jmap-v0.5.0_SRHT0.tar.gz) = 39fcd7aa248d4b65e001b49f4d1d4ccefe66b45384cb79c014cecabbea664708
+SIZE (rockorager-go-jmap-v0.5.0_SRHT0.tar.gz) = 25671
+SHA256 (rockorager-vaxis-v0.9.2_SRHT0.tar.gz) = b124cfae25b3f5af5013f833080c7bd7242fdb5888be6eca3b443292ba7b7757
+SIZE (rockorager-vaxis-v0.9.2_SRHT0.tar.gz) = 101419
+SHA256 (rjarry-go-opt-v1.4.0_SRHT0.tar.gz) = fc082f80a1716db3195b4d2a9b1bf5a7416a1ac3481dad130a75086d0353db3b
+SIZE (rjarry-go-opt-v1.4.0_SRHT0.tar.gz) = 14099
+SHA256 (ProtonMail-go-crypto-v1.0.0_GH0.tar.gz) = 596e264d2df6beb3ec40e47286f86960845ab227cb635150ef3bd35a90a79e43
+SIZE (ProtonMail-go-crypto-v1.0.0_GH0.tar.gz) = 333515
+SHA256 (arran4-golang-ical-v0.2.7_GH0.tar.gz) = 1d77cc6af1adc56641b9d147641390ceca4f7686235a143cb3c125241a842553
+SIZE (arran4-golang-ical-v0.2.7_GH0.tar.gz) = 24178
+SHA256 (cloudflare-circl-v1.3.7_GH0.tar.gz) = e1db989f921eeec80fd853cbf376c0e7893796fee96d8183fc5a29e01464a585
+SIZE (cloudflare-circl-v1.3.7_GH0.tar.gz) = 4938649
+SHA256 (containerd-console-v1.0.4_GH0.tar.gz) = 3b8f8b07ede2a7236d1ff2ef3e05e8e1a43f43a44dcb8e15f7d30ce910302430
+SIZE (containerd-console-v1.0.4_GH0.tar.gz) = 13622
+SHA256 (creack-pty-v1.1.21_GH0.tar.gz) = 1282f0912dd7b02acac253d1203343b06378ed8bac1c45c9ed7df05e6840365d
+SIZE (creack-pty-v1.1.21_GH0.tar.gz) = 20132
 SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
 SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
@@ -25,83 +25,81 @@ SHA256 (emersion-go-imap-sortthread-v1.2.0_GH0.tar.gz) = 4e5829010b2f633b360ed11
 SIZE (emersion-go-imap-sortthread-v1.2.0_GH0.tar.gz) = 8976
 SHA256 (emersion-go-imap-v1.2.1_GH0.tar.gz) = 5491725275b90e05f2ed98e5273688e5f05a8a488b0c5ce504f60aa19c9d8791
 SIZE (emersion-go-imap-v1.2.1_GH0.tar.gz) = 103546
-SHA256 (emersion-go-maildir-v0.3.0_GH0.tar.gz) = 7ea29f50b7b719b67ce52cb68068e4d1962cf08de09d39cd5ac1642de523ae11
-SIZE (emersion-go-maildir-v0.3.0_GH0.tar.gz) = 7042
+SHA256 (emersion-go-maildir-v0.4.1_GH0.tar.gz) = 2badeaf29be27b4065c934c5874bbfb25cb0eeba8c60385bd73e8cbda3d6ecd1
+SIZE (emersion-go-maildir-v0.4.1_GH0.tar.gz) = 8196
 SHA256 (emersion-go-mbox-v1.0.3_GH0.tar.gz) = 54c85831ececafb417939741b00da573c5dab61a746834b9977e7dde8dba523e
 SIZE (emersion-go-mbox-v1.0.3_GH0.tar.gz) = 5692
-SHA256 (emersion-go-message-v0.17.0_GH0.tar.gz) = ac05e1f9c1bbdbae68408dfaba0fdb70199c34e058ce00c6ebf66f1580040850
-SIZE (emersion-go-message-v0.17.0_GH0.tar.gz) = 47399
-SHA256 (emersion-go-msgauth-v0.6.6_GH0.tar.gz) = 869b05558bec6658b9b82aa8a6f3c733e77dcb9d084c19bb107655ff3dd1390d
-SIZE (emersion-go-msgauth-v0.6.6_GH0.tar.gz) = 28218
-SHA256 (emersion-go-pgpmail-v0.2.0_GH0.tar.gz) = ce301d46ff18c33f4dd47b6431bd0133dd5657abd16a286a51384b0642d65a48
-SIZE (emersion-go-pgpmail-v0.2.0_GH0.tar.gz) = 15310
-SHA256 (emersion-go-sasl-0145f2c60ead_GH0.tar.gz) = ac6669e609678af1229e136040988789ffaacca51a18ced3b89383c3cf7ac8c7
-SIZE (emersion-go-sasl-0145f2c60ead_GH0.tar.gz) = 7355
-SHA256 (emersion-go-smtp-v0.16.0_GH0.tar.gz) = 7019a4d090dc9627a3347ef800ee28d272ad75520481f4d47c9360fd27fb354e
-SIZE (emersion-go-smtp-v0.16.0_GH0.tar.gz) = 36847
+SHA256 (emersion-go-message-v0.18.0_GH0.tar.gz) = aca69aa1ee19a401bb581a0c644345b896ec064603b93bf9f9af3014c4dd337f
+SIZE (emersion-go-message-v0.18.0_GH0.tar.gz) = 47498
+SHA256 (emersion-go-msgauth-v0.6.8_GH0.tar.gz) = 44ab6e48d8b073ea9cd4c166b9d506fe213998b47d37da91d88c43e90e244c38
+SIZE (emersion-go-msgauth-v0.6.8_GH0.tar.gz) = 29769
+SHA256 (emersion-go-pgpmail-v0.2.1_GH0.tar.gz) = 7831256eec5f11cc6964b3ccda05f22344ddf2bf54776b27d4d04b798c3fbb1f
+SIZE (emersion-go-pgpmail-v0.2.1_GH0.tar.gz) = 15985
+SHA256 (emersion-go-sasl-e73c9f7bad43_GH0.tar.gz) = 93381ea17213dac9527a856d0119992dbc59fd5fb845716732a6ba300ad54fd1
+SIZE (emersion-go-sasl-e73c9f7bad43_GH0.tar.gz) = 7362
+SHA256 (emersion-go-smtp-v0.21.0_GH0.tar.gz) = 98fd535bf8cbdd49d4302c61db8edc915c6466e94230814bc6d351c96f420134
+SIZE (emersion-go-smtp-v0.21.0_GH0.tar.gz) = 41977
 SHA256 (emersion-go-textwrapper-65d896831594_GH0.tar.gz) = 2cd1f28952b8cd549baee90207fdaca1d81a963b1b2974c9e54ea6fb060a123a
 SIZE (emersion-go-textwrapper-65d896831594_GH0.tar.gz) = 2309
 SHA256 (fsnotify-fsevents-v0.1.1_GH0.tar.gz) = ceb77ad32fc37b9fd6ad0c58f8b355c15cea37febdb7f1696ab34af74ef59a97
 SIZE (fsnotify-fsevents-v0.1.1_GH0.tar.gz) = 12699
-SHA256 (fsnotify-fsnotify-v1.6.0_GH0.tar.gz) = 583b2b399709d04807c5c3185e7d4dc0543d532af91fdeb85eeaf803a0b7703b
-SIZE (fsnotify-fsnotify-v1.6.0_GH0.tar.gz) = 46044
+SHA256 (fsnotify-fsnotify-v1.7.0_GH0.tar.gz) = ca8175ba6bd3d0cc992200c2f44acabec05367575dc0478c5902971fe7453f35
+SIZE (fsnotify-fsnotify-v1.7.0_GH0.tar.gz) = 57502
 SHA256 (gatherstars-com-jwz-v1.4.0_GH0.tar.gz) = ee866f82a01e3d0169a4acd26f39f4db5085cfd286cda3f22b90eca51648f550
 SIZE (gatherstars-com-jwz-v1.4.0_GH0.tar.gz) = 2382370
-SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
-SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (gdamore-tcell-v2.6.0_GH0.tar.gz) = cd157929007755f69e858a97647ad9c8805184635b8774fb0f930e0282b0ae5d
-SIZE (gdamore-tcell-v2.6.0_GH0.tar.gz) = 173877
+SHA256 (go-check-check-10cb98267c6c_GH0.tar.gz) = 0a42d9d5a49ebc30174e5840238e446f5fb16899bfaa6a6f63d12ab9953df293
+SIZE (go-check-check-10cb98267c6c_GH0.tar.gz) = 32375
 SHA256 (go-ini-ini-v1.67.0_GH0.tar.gz) = 06ba51234140118d1b6064f1817aa89cc971c6e7ce04cb9d286e6660d89296c8
 SIZE (go-ini-ini-v1.67.0_GH0.tar.gz) = 53531
 SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5
 SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
-SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
-SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
-SHA256 (golang-net-v0.9.0_GH0.tar.gz) = f7f85ae52cf7dae86a30c71db6601f84bb1dd25e68e81b04deaeeb0dc3bbad1f
-SIZE (golang-net-v0.9.0_GH0.tar.gz) = 1244440
-SHA256 (golang-oauth2-v0.7.0_GH0.tar.gz) = 18407271b525c12d53d1264f13e04ed83b250b0fe78da96b4eabd687a79de260
-SIZE (golang-oauth2-v0.7.0_GH0.tar.gz) = 87761
-SHA256 (golang-protobuf-v1.5.3_GH0.tar.gz) = 48457a6a9e8c78a7556ff5ff4a4c77d7df9bf70e882491ee0f3f1ff06db2bfaa
-SIZE (golang-protobuf-v1.5.3_GH0.tar.gz) = 171822
+SHA256 (golang-appengine-v1.6.8_GH0.tar.gz) = 9f0029767e180c64ef42c448f02a247deb2980b2ba6908977ad4c53ebae1abb5
+SIZE (golang-appengine-v1.6.8_GH0.tar.gz) = 628708
+SHA256 (golang-crypto-v0.21.0_GH0.tar.gz) = 4c65ea22c4b0bc7380b4213a294698c517fe3378e0edd30c4d2b6cf7f12fc8bd
+SIZE (golang-crypto-v0.21.0_GH0.tar.gz) = 1810887
+SHA256 (golang-image-v0.15.0_GH0.tar.gz) = 90b6dbb36a61290acac3050008594203c5c094af562b8e7be5af7d3b7230f53b
+SIZE (golang-image-v0.15.0_GH0.tar.gz) = 5093053
+SHA256 (golang-mod-v0.14.0_GH0.tar.gz) = 39b576b1491cd8a092a9df5e4029b23608887e4670e7a2211c07ea786944953c
+SIZE (golang-mod-v0.14.0_GH0.tar.gz) = 122036
+SHA256 (golang-oauth2-v0.18.0_GH0.tar.gz) = 497458219c1b4c3c44f0acf33a54c68dd723dcc3a1c592f0ac712265008a182a
+SIZE (golang-oauth2-v0.18.0_GH0.tar.gz) = 99719
+SHA256 (golang-protobuf-v1.5.4_GH0.tar.gz) = d75e6960ecfabaaa83a7261b1b630d24e9c63aca79615fb15bf33e11b62fd019
+SIZE (golang-protobuf-v1.5.4_GH0.tar.gz) = 172992
 SHA256 (golang-snappy-v0.0.4_GH0.tar.gz) = 77df678795596f9dfecb5744deb984633d780460a7e9a59e0c7ecfe2052b644f
 SIZE (golang-snappy-v0.0.4_GH0.tar.gz) = 66129
-SHA256 (golang-sys-v0.7.0_GH0.tar.gz) = be9b6e1cb2fdb5822ea7fde4c3b226cfe47927c4305db9fa9fc1fae4fdf213b0
-SIZE (golang-sys-v0.7.0_GH0.tar.gz) = 1434670
-SHA256 (golang-term-v0.7.0_GH0.tar.gz) = 63a17352a6a13e61fb92b0f307d58d8e81713556f0c55f4606f58778db02cea5
-SIZE (golang-term-v0.7.0_GH0.tar.gz) = 14798
-SHA256 (golang-text-v0.12.0_GH0.tar.gz) = 223318d6bd0b76fe5cdff3499a0ad0b3bfe573336951b0b141af6cde704252da
-SIZE (golang-text-v0.12.0_GH0.tar.gz) = 8967035
-SHA256 (golang-tools-v0.6.0_GH0.tar.gz) = c7b04bc8019242f2d49067ca205aaaad116d1541923589265fb0a54d589cbfa7
-SIZE (golang-tools-v0.6.0_GH0.tar.gz) = 3307383
-SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
-SIZE (google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342
+SHA256 (golang-sys-v0.18.0_GH0.tar.gz) = cee1944ab655ddf7eab6301e15cb6d01fdd6cd0a0f0b5896050ee60b124e084c
+SIZE (golang-sys-v0.18.0_GH0.tar.gz) = 1448211
+SHA256 (golang-text-v0.14.0_GH0.tar.gz) = c80295e75bda599d17ccf74038139b0957b9915fae4e60d8b46f89454ef171a0
+SIZE (golang-text-v0.14.0_GH0.tar.gz) = 8974094
+SHA256 (golang-tools-v0.17.0_GH0.tar.gz) = cfa2b81b912142f1c923e3afb4c18618b3d28b0fa053abc3e67b75965c2e71c7
+SIZE (golang-tools-v0.17.0_GH0.tar.gz) = 3640573
 SHA256 (kr-pretty-v0.3.0_GH0.tar.gz) = c264e7939bf8d989d388c1156ea0c8bdeb3659b789e83aac6bd4689e8613f3f6
 SIZE (kr-pretty-v0.3.0_GH0.tar.gz) = 10041
-SHA256 (lithammer-fuzzysearch-v1.1.5_GH0.tar.gz) = 22cd8eb865a86452ed58d0905334946523af7e3648a72c89b0a8b1b1aada6777
-SIZE (lithammer-fuzzysearch-v1.1.5_GH0.tar.gz) = 7223
-SHA256 (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = b3ee835cc398287452377266313edcc231043bae4168f8d2706e5d34ce1ce755
-SIZE (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = 970830
-SHA256 (mattn-go-isatty-v0.0.18_GH0.tar.gz) = 5b59235986f7a917559181ff814f83f610928b444f290bed733c3f2f900b803d
-SIZE (mattn-go-isatty-v0.0.18_GH0.tar.gz) = 4675
-SHA256 (mattn-go-runewidth-v0.0.14_GH0.tar.gz) = 0e6a49d6a8f694154af2746a820d4c5f13fe3d9b0968bdf16fcf939dd461e034
-SIZE (mattn-go-runewidth-v0.0.14_GH0.tar.gz) = 18274
+SHA256 (lithammer-fuzzysearch-v1.1.8_GH0.tar.gz) = 2496ccfc16d85426eb70aaf94f773f8ca08caf96694de3ede3c29d5978e28e50
+SIZE (lithammer-fuzzysearch-v1.1.8_GH0.tar.gz) = 9373
+SHA256 (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 18fc42a278e60fb7a1dffa72f20539ae88d0e292db55b513ef514b7d369883a6
+SIZE (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 4713
+SHA256 (mattn-go-runewidth-v0.0.15_GH0.tar.gz) = 44a5d37bd7119a9d288d7ff61cf3b4d42c2902c66b0d94136d41d2eb3cf2ba85
+SIZE (mattn-go-runewidth-v0.0.15_GH0.tar.gz) = 18284
+SHA256 (mattn-go-sixel-v0.0.5_GH0.tar.gz) = a060945b47882e8e9d98591b0c465a33b0cd01c11f78665bef3645550dec010a
+SIZE (mattn-go-sixel-v0.0.5_GH0.tar.gz) = 23712
 SHA256 (onsi-gomega-v1.20.0_GH0.tar.gz) = 335cfb76e3c0662b63f8f82270a8af485cabd2ec0b18292e4bcd2e2fdff19823
 SIZE (onsi-gomega-v1.20.0_GH0.tar.gz) = 283126
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (protocolbuffers-protobuf-go-v1.30.0_GH0.tar.gz) = 3279a16ec3bdd7c53fe1599134de298ed90d9f3b6ec1c1eb5f3b76ba5aaa9f0c
-SIZE (protocolbuffers-protobuf-go-v1.30.0_GH0.tar.gz) = 1298988
-SHA256 (rivo-uniseg-v0.4.4_GH0.tar.gz) = eb2837932d0a666e13ea6b4cebf698096266d4f14740faa78c63b8291cf1fb5c
-SIZE (rivo-uniseg-v0.4.4_GH0.tar.gz) = 453399
+SHA256 (protocolbuffers-protobuf-go-v1.33.0_GH0.tar.gz) = 21661d7634e3f783b015b93ceafc0261f2f02a270799bac871602c3a2172cfbe
+SIZE (protocolbuffers-protobuf-go-v1.33.0_GH0.tar.gz) = 1482410
+SHA256 (rivo-uniseg-v0.4.7_GH0.tar.gz) = dc7aedce4a8c174b01df8406ff7d92779e2df76cee2ad17fa2ff6777feddadec
+SIZE (rivo-uniseg-v0.4.7_GH0.tar.gz) = 458088
 SHA256 (riywo-loginshell-7d26008be1ab_GH0.tar.gz) = 5a4776948b8f26adb09c051b7910fc39115305ed2efac769f99e8f2a16d7a265
 SIZE (riywo-loginshell-7d26008be1ab_GH0.tar.gz) = 2068
 SHA256 (rogpeppe-go-internal-v1.8.1_GH0.tar.gz) = 489c93e5979d4bca3bed1cb738c11b5319a746f74ed079bbfcf95619e72314c2
 SIZE (rogpeppe-go-internal-v1.8.1_GH0.tar.gz) = 131837
-SHA256 (stretchr-testify-v1.8.2_GH0.tar.gz) = b1f8aab2022b39d9263dc38ce4a974f64c0219f580a6fe9c56693beaf2702516
-SIZE (stretchr-testify-v1.8.2_GH0.tar.gz) = 98353
+SHA256 (soniakeys-quant-v1.0.0_GH0.tar.gz) = 6656199c1599fa8b334dde6ddcf09d4147aadd52ec26668130c8fdd11f8d78eb
+SIZE (soniakeys-quant-v1.0.0_GH0.tar.gz) = 11246
+SHA256 (stretchr-testify-v1.8.4_GH0.tar.gz) = 0d3e82b04a05d9428a2a2aec8776bd0a07f14f5d1b4fa0a3676526ca8259fd62
+SIZE (stretchr-testify-v1.8.4_GH0.tar.gz) = 104427
 SHA256 (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = c80191f7f77b41d6cb3d1c6de1d42a9b8177656ee49c256d2df2b95a893cf8b8
 SIZE (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = 142710
-SHA256 (xo-terminfo-abceb7e1c41e_GH0.tar.gz) = f309fc85594b3a03d622ebe275a841b97101c4189f85fff18fc051a2e5a4878c
-SIZE (xo-terminfo-abceb7e1c41e_GH0.tar.gz) = 35180
diff --git a/mail/aerc/pkg-plist b/mail/aerc/pkg-plist
index 8dc560190994..4fe69e720c06 100644
--- a/mail/aerc/pkg-plist
+++ b/mail/aerc/pkg-plist
@@ -14,6 +14,7 @@ libexec/aerc/filters/wrap
 %%DATADIR%%/stylesets/blue
 %%DATADIR%%/stylesets/default
 %%DATADIR%%/stylesets/dracula
+%%DATADIR%%/stylesets/monochrome
 %%DATADIR%%/stylesets/nord
 %%DATADIR%%/stylesets/pink
 %%DATADIR%%/stylesets/solarized
@@ -33,6 +34,7 @@ share/man/man5/aerc-maildir.5.gz
 share/man/man5/aerc-notmuch.5.gz
 share/man/man5/aerc-sendmail.5.gz
 share/man/man5/aerc-smtp.5.gz
+share/man/man7/aerc-patch.7.gz
 share/man/man7/aerc-stylesets.7.gz
 share/man/man7/aerc-templates.7.gz
 share/man/man7/aerc-tutorial.7.gz