git: c559a8b10be6 - main - mail/aerc: Update to 0.16.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Wed, 11 Oct 2023 06:05:17 UTC
The branch main has been updated by fuz:

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

commit c559a8b10be66a8d4f65979ec5bb2547442e55ae
Author:     Yuvakiran Rayapureddy <iamsleepy@ryuki.me>
AuthorDate: 2023-10-10 04:22:06 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-10-11 06:04:38 +0000

    mail/aerc: Update to 0.16.0
    
     - clean up and improve port
    
    Submitter becomes maintainer.
    
    Changelog: https://git.sr.ht/~rjarry/aerc/refs/0.16.0
    
    PR:             274383
---
 mail/aerc/Makefile                     | 119 +++++++++++++++------------
 mail/aerc/distinfo                     | 146 ++++++++++++++++++---------------
 mail/aerc/files/patch-filters_colorize |   8 --
 mail/aerc/pkg-plist                    |  26 ++++--
 4 files changed, 165 insertions(+), 134 deletions(-)

diff --git a/mail/aerc/Makefile b/mail/aerc/Makefile
index 71a2f8c11372..6e687ebe73e9 100644
--- a/mail/aerc/Makefile
+++ b/mail/aerc/Makefile
@@ -1,75 +1,85 @@
 PORTNAME=	aerc
-DISTVERSION=	0.10.0
-PORTREVISION=	11
+DISTVERSION=	0.16.0
 CATEGORIES=	mail
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	iamsleepy@ryuki.me
 COMMENT=	Email client for your terminal
 WWW=		https://aerc-mail.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	scdoc:textproc/scdoc
+BUILD_DEPENDS=	base64:converters/base64 \
+		scdoc:textproc/scdoc
 
-USES=		desktop-file-utils go:modules,no_targets ncurses:port python \
+USES=		desktop-file-utils gmake go:modules ncurses:port python \
 		shebangfix
-SHEBANG_FILES=	filters/colorize \
-		filters/show-ics-details.py
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	\
-		ProtonMail:go-crypto:71bec3603bf3:protonmail_crypto/vendor/golang.org/x/crypto \
-		ProtonMail:go-crypto:a4f6767435ab:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
-		brunnre8:go.notmuch:caa2daf7093c:brunnre8_go_notmuch/vendor/github.com/zenhack/go.notmuch \
-		creack:pty:v1.1.17:creack_pty/vendor/github.com/creack/pty \
+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 \
 		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 \
-		ddevault:go-libvterm:b7d861da3810:ddevault_go_libvterm/vendor/github.com/ddevault/go-libvterm \
 		emersion:go-imap-sortthread:v1.2.0:emersion_go_imap_sortthread/vendor/github.com/emersion/go-imap-sortthread \
-		emersion:go-imap:v1.2.0:emersion_go_imap/vendor/github.com/emersion/go-imap \
-		emersion:go-maildir:v0.2.0:emersion_go_maildir/vendor/github.com/emersion/go-maildir \
-		emersion:go-message:v0.15.0:emersion_go_message/vendor/github.com/emersion/go-message \
+		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-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:0b9dcfb154ac:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
-		emersion:go-smtp:v0.15.0:emersion_go_smtp/vendor/github.com/emersion/go-smtp \
+		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-textwrapper:65d896831594:emersion_go_textwrapper/vendor/github.com/emersion/go-textwrapper \
-		fsnotify:fsnotify:v1.5.1:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
-		gatherstars-com:jwz:v1.3.0:gatherstars_com_jwz/vendor/github.com/gatherstars-com/jwz \
+		fsnotify:fsevents:v0.1.1:fsnotify_fsevents/vendor/github.com/fsnotify/fsevents \
+		fsnotify:fsnotify:v1.6.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.4.0:gdamore_tcell_v2/vendor/github.com/gdamore/tcell/v2 \
-		go-ini:ini:v1.63.2:go_ini_ini/vendor/github.com/go-ini/ini \
-		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gdamore:tcell:v2.6.0:gdamore_tcell_v2/vendor/github.com/gdamore/tcell/v2 \
+		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:99673261e6eb:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:ba495a64dcb5:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:b3129d9d1021:golang_sys/vendor/golang.org/x/sys \
-		golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \
-		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
+		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: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 \
-		imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \
-		kyoh86:xdg:v1.2.0:kyoh86_xdg/vendor/github.com/kyoh86/xdg \
-		lithammer:fuzzysearch:v1.1.3:lithammer_fuzzysearch/vendor/github.com/lithammer/fuzzysearch \
+		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.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-pointer:v0.0.1:mattn_go_pointer/vendor/github.com/mattn/go-pointer \
-		mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		miolini:datacounter:v1.0.2:miolini_datacounter/vendor/github.com/miolini/datacounter \
-		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
+		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 \
+		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.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
+		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 \
 		riywo:loginshell:7d26008be1ab:riywo_loginshell/vendor/github.com/riywo/loginshell \
-		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		xo:terminfo:ca9a967f8778:xo_terminfo/vendor/github.com/xo/terminfo
+		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
 
 # 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
 
+SHEBANG_FILES=	contrib/carddav-query filters/show-ics-details.py
+
+MAKEFILE=	GNUmakefile
+MAKE_ARGS=	GO_BUILDFLAGS="${GO_BUILDFLAGS}" \
+		VERSION="${DISTVERSION}"
 MAKE_ENV=	${GO_ENV} \
+		CC="${CC}" \
+		CFLAGS="${CFLAGS}" \
 		GOFLAGS="${GO_BUILDFLAGS}"
 
 OPTIONS_DEFINE=		HTML_FILTER NOTMUCH
@@ -81,15 +91,14 @@ NOTMUCH_DESC=		Fast indexing and searching support via notmuch
 
 HTML_FILTER_RUN_DEPENDS=	socksify:net/dante \
 				w3m:www/w3m
-
-NOTMUCH_LIB_DEPENDS=	libnotmuch.so:mail/notmuch
-NOTMUCH_VARS=		GO_BUILDFLAGS+="-tags=notmuch"
+NOTMUCH_LIB_DEPENDS=		libnotmuch.so:mail/notmuch
+NOTMUCH_VARS=			GO_BUILDFLAGS+="-tags=notmuch"
 
 .include <bsd.port.pre.mk>
 
 .for account project tag subdir in ${_SRHT_TUPLE:S/:/ /g}
-MASTER_SITES+=	https://git.sr.ht/~${account}/${project}/archive/${tag}${EXTRACT_SUFX}?dummy=/:${account}_${project}
-DISTFILES+=	${account}-${project}-${tag}_SRHT0${EXTRACT_SUFX}:${account}_${project}
+MASTER_SITES+=	https://git.sr.ht/~${account}/${project}/archive/${tag}${EXTRACT_SUFX}?dummy=/:${account}_${project:S/-/_/g}
+DISTFILES+=	${account}-${project}-${tag}_SRHT0${EXTRACT_SUFX}:${account}_${project:S/-/_/g}
 .endfor
 
 post-extract:
@@ -98,11 +107,17 @@ post-extract:
 	@${MV} ${WRKDIR}/${project}-${tag} ${WRKSRC}/${subdir}
 .endfor
 
-post-patch:
-	@${REINPLACE_CMD} -e '/BINDIR/ s,install -m755,${INSTALL_PROGRAM},' \
-		-e 's,install -m755,${INSTALL_SCRIPT},' \
-		-e '/MANDIR/ s,install -m644,${INSTALL_MAN},' \
-		-e '/SHAREDIR/ s,install -m644,${INSTALL_DATA},' \
-		${WRKSRC}/Makefile
+do-build:
+	(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
+
+do-install:
+	${REINPLACE_CMD} 's,PREFIX ?=.*,PREFIX= ${STAGEDIR}${PREFIX},' \
+	    ${WRKSRC}/${MAKEFILE}
+	(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${INSTALL_TARGET})
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/aerc/filters/wrap
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/aerc/filters/colorize
 
 .include <bsd.port.post.mk>
diff --git a/mail/aerc/distinfo b/mail/aerc/distinfo
index 66cbfdf41dd1..5a6857cd0ad0 100644
--- a/mail/aerc/distinfo
+++ b/mail/aerc/distinfo
@@ -1,95 +1,107 @@
-TIMESTAMP = 1655832362
-SHA256 (rjarry-aerc-0.10.0_SRHT0.tar.gz) = 14d6c622a012069deb1a31b51ecdd187fd11041c8e46f396ac22830b00e4c114
-SIZE (rjarry-aerc-0.10.0_SRHT0.tar.gz) = 209836
+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-a4f6767435ab_GH0.tar.gz) = 418c218a466abea34d3bf18f9db1d87434bcabe7910f23b115a43a957d56edac
-SIZE (ProtonMail-go-crypto-a4f6767435ab_GH0.tar.gz) = 311790
-SHA256 (brunnre8-go.notmuch-caa2daf7093c_GH0.tar.gz) = 19fd45d3d77b93ffdb1881145a3783ab33f133f99b38dce1cec839d2a24e55e1
-SIZE (brunnre8-go.notmuch-caa2daf7093c_GH0.tar.gz) = 31500
-SHA256 (creack-pty-v1.1.17_GH0.tar.gz) = 0e80751ab6f85cccee8cb20fbeeb970d69854aa19c857a26f7fdaabfbc20d66d
-SIZE (creack-pty-v1.1.17_GH0.tar.gz) = 9960
+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
 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
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (ddevault-go-libvterm-b7d861da3810_GH0.tar.gz) = b2bee30000a0c7b26a519910cb39fdf1dda333811f5fdd1f1a690d3692f5dec9
-SIZE (ddevault-go-libvterm-b7d861da3810_GH0.tar.gz) = 112723
 SHA256 (emersion-go-imap-sortthread-v1.2.0_GH0.tar.gz) = 4e5829010b2f633b360ed11d449758e218dea2bf8c955b3d809548a78fa60a1b
 SIZE (emersion-go-imap-sortthread-v1.2.0_GH0.tar.gz) = 8976
-SHA256 (emersion-go-imap-v1.2.0_GH0.tar.gz) = ec3dc1f6b4414f4c5e10d330092a3897dfa68b3af505a32ccc644b419f1cc6e0
-SIZE (emersion-go-imap-v1.2.0_GH0.tar.gz) = 103382
-SHA256 (emersion-go-maildir-v0.2.0_GH0.tar.gz) = d9674be91c844fd8998f6e400d2c921b48cf6ffbcaa71c87f1bd793969c65a6d
-SIZE (emersion-go-maildir-v0.2.0_GH0.tar.gz) = 6859
-SHA256 (emersion-go-message-v0.15.0_GH0.tar.gz) = 2a7ec0dd4e8058ecd93c1a5a15c2160c88eed5a5bc656902b72fd09206f0623c
-SIZE (emersion-go-message-v0.15.0_GH0.tar.gz) = 42945
+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-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-0b9dcfb154ac_GH0.tar.gz) = 0be35a5cc866245422998b440736af64368b82b69fc1bdc3bf72a50bb7fe07f0
-SIZE (emersion-go-sasl-0b9dcfb154ac_GH0.tar.gz) = 7264
-SHA256 (emersion-go-smtp-v0.15.0_GH0.tar.gz) = f5e7e125739b41564de1d3616ef8ca2fa0876aa332a9b4e136ef4da8684f9a43
-SIZE (emersion-go-smtp-v0.15.0_GH0.tar.gz) = 36222
+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-textwrapper-65d896831594_GH0.tar.gz) = 2cd1f28952b8cd549baee90207fdaca1d81a963b1b2974c9e54ea6fb060a123a
 SIZE (emersion-go-textwrapper-65d896831594_GH0.tar.gz) = 2309
-SHA256 (fsnotify-fsnotify-v1.5.1_GH0.tar.gz) = bf4be597aef95796bec7c7def6701581c5e153376ba5a5aa31c2d04470d84f1d
-SIZE (fsnotify-fsnotify-v1.5.1_GH0.tar.gz) = 32691
-SHA256 (gatherstars-com-jwz-v1.3.0_GH0.tar.gz) = d04f1d07b578c99a783745b39b00184ec9c129fb4fc4f27f202b0ff251bf83fa
-SIZE (gatherstars-com-jwz-v1.3.0_GH0.tar.gz) = 2379126
+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 (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.4.0_GH0.tar.gz) = 45c40b7fdb61902cd86ab8ea2764584f29d2f92d25d01e70b362a8cb184b7bfc
-SIZE (gdamore-tcell-v2.4.0_GH0.tar.gz) = 155696
-SHA256 (go-ini-ini-v1.63.2_GH0.tar.gz) = c28487b3236abf9c7b4c3be7d20b99e9876f2c31fe0dc1bace7c6715c09339a6
-SIZE (go-ini-ini-v1.63.2_GH0.tar.gz) = 50698
-SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
-SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
+SHA256 (gdamore-tcell-v2.6.0_GH0.tar.gz) = cd157929007755f69e858a97647ad9c8805184635b8774fb0f930e0282b0ae5d
+SIZE (gdamore-tcell-v2.6.0_GH0.tar.gz) = 173877
+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-99673261e6eb_GH0.tar.gz) = d510c40d6888589063dd5a9c6c08aee8c6b841d7ba46098758ada330e0adc923
-SIZE (golang-net-99673261e6eb_GH0.tar.gz) = 1262432
-SHA256 (golang-oauth2-ba495a64dcb5_GH0.tar.gz) = d0c9cea41bd1dd5426dae85e87bc38d5fcbc96d054ece5d6d8ed67ce1f2fdfd9
-SIZE (golang-oauth2-ba495a64dcb5_GH0.tar.gz) = 87597
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-b3129d9d1021_GH0.tar.gz) = c50e414d20ea5a1a1c74e9659375bcba7333642c5453a67a881ba8020a3f6bae
-SIZE (golang-sys-b3129d9d1021_GH0.tar.gz) = 1221573
-SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3
-SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
-SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
-SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
+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-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 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302
-SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319
-SHA256 (kyoh86-xdg-v1.2.0_GH0.tar.gz) = 357555c7fba96cad7cd37ccc60d07bde5022d50ec468e64e9adb045dbc39ba68
-SIZE (kyoh86-xdg-v1.2.0_GH0.tar.gz) = 5085
-SHA256 (lithammer-fuzzysearch-v1.1.3_GH0.tar.gz) = cefd0f012a5491a463f8a6366979a03dcee81d9ab1b9aae016e211494e7a1d05
-SIZE (lithammer-fuzzysearch-v1.1.3_GH0.tar.gz) = 7081
+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.14_GH0.tar.gz) = e6460325edf600297cf2ef68834938fb1c5b8d5f234b3b24ec7c0a29a2d70b39
-SIZE (mattn-go-isatty-v0.0.14_GH0.tar.gz) = 4710
-SHA256 (mattn-go-pointer-v0.0.1_GH0.tar.gz) = 5630a863fa1c2516ea3d2eeab94274768463018778486dddebfcb0fa32ea50fb
-SIZE (mattn-go-pointer-v0.0.1_GH0.tar.gz) = 2035
-SHA256 (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 9b2aeafa5d95a40b32067ba22accdf42cc83414ec5b433ea7de330791beaa196
-SIZE (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 17353
-SHA256 (miolini-datacounter-v1.0.2_GH0.tar.gz) = df6bf8746c8751004b387fb39639fc02681fbab764ad03aa92de14449a3422d8
-SIZE (miolini-datacounter-v1.0.2_GH0.tar.gz) = 2827
-SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
-SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
+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 (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.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
-SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
-SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) = 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197
-SIZE (rivo-uniseg-v0.2.0_GH0.tar.gz) = 44036
+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 (riywo-loginshell-7d26008be1ab_GH0.tar.gz) = 5a4776948b8f26adb09c051b7910fc39115305ed2efac769f99e8f2a16d7a265
 SIZE (riywo-loginshell-7d26008be1ab_GH0.tar.gz) = 2068
-SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
-SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
-SHA256 (xo-terminfo-ca9a967f8778_GH0.tar.gz) = 41fedf41ec1256fb337f75719e74283cf2e03c4460fa290800a1d73f0f83c12d
-SIZE (xo-terminfo-ca9a967f8778_GH0.tar.gz) = 35429
+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 (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/files/patch-filters_colorize b/mail/aerc/files/patch-filters_colorize
deleted file mode 100644
index 0c9ed427f0de..000000000000
--- a/mail/aerc/files/patch-filters_colorize
+++ /dev/null
@@ -1,8 +0,0 @@
---- filters/colorize.orig	2022-07-19 17:09:54 UTC
-+++ filters/colorize
-@@ -1,4 +1,4 @@
--#!/bin/awk -f
-+#!/usr/bin/awk -f
- # Copyright (c) 2022 Robin Jarry
- 
- BEGIN {
diff --git a/mail/aerc/pkg-plist b/mail/aerc/pkg-plist
index 56fc55e05350..8dc560190994 100644
--- a/mail/aerc/pkg-plist
+++ b/mail/aerc/pkg-plist
@@ -1,24 +1,36 @@
 bin/aerc
+bin/carddav-query
+libexec/aerc/filters/calendar
+libexec/aerc/filters/colorize
+libexec/aerc/filters/hldiff
+libexec/aerc/filters/html
+libexec/aerc/filters/html-unsafe
+libexec/aerc/filters/plaintext
+libexec/aerc/filters/show-ics-details.py
+libexec/aerc/filters/wrap
 %%DATADIR%%/accounts.conf
 %%DATADIR%%/aerc.conf
 %%DATADIR%%/binds.conf
-%%DATADIR%%/filters/colorize
-%%DATADIR%%/filters/hldiff
-%%HTML_FILTER%%%%DATADIR%%/filters/html
-%%HTML_FILTER%%%%DATADIR%%/filters/html-unsafe
-%%DATADIR%%/filters/plaintext
-%%DATADIR%%/filters/show-ics-details.py
+%%DATADIR%%/stylesets/blue
 %%DATADIR%%/stylesets/default
+%%DATADIR%%/stylesets/dracula
+%%DATADIR%%/stylesets/nord
+%%DATADIR%%/stylesets/pink
+%%DATADIR%%/stylesets/solarized
 %%DATADIR%%/templates/forward_as_body
 %%DATADIR%%/templates/new_message
 %%DATADIR%%/templates/quoted_reply
 share/applications/aerc.desktop
 share/man/man1/aerc-search.1.gz
 share/man/man1/aerc.1.gz
+share/man/man1/carddav-query.1.gz
+share/man/man5/aerc-accounts.5.gz
+share/man/man5/aerc-binds.5.gz
 share/man/man5/aerc-config.5.gz
 share/man/man5/aerc-imap.5.gz
+share/man/man5/aerc-jmap.5.gz
 share/man/man5/aerc-maildir.5.gz
-%%NOTMUCH%%share/man/man5/aerc-notmuch.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-stylesets.7.gz