Hi Johannes, "Johannes Thyssen Tishman" <johan...@thyssentishman.com> wrote: > Please find below a diff to update mail/aerc to version 0.17.0. > There's quite a lot of new features as well as better CVS and OpenBSD > support. > > Changelog: https://git.sr.ht/~rjarry/aerc/refs/0.17.0 > > Cc'd maintainer. > > Kind regards, > Johannes
Thank you Johannes. Funnily enough I was just about to send a patch myself but I guess by chance, I just glanced at the inbox and noticed your mail. Funny how that works sometimes. Anyways, I have tested it a bit on amd64, without notmuch might I add, and all seems to be working right, no hiccups of any sorts. Best Regards, Thim Cederlund > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/mail/aerc/Makefile,v > retrieving revision 1.14 > diff -u -p -r1.14 Makefile > --- Makefile 15 Nov 2023 16:13:03 -0000 1.14 > +++ Makefile 1 Feb 2024 16:22:36 -0000 > @@ -4,11 +4,10 @@ ONLY_FOR_ARCHS = aarch64 arm amd64 i386 > COMMENT = terminal email client > > MODGO_MODNAME = git.sr.ht/~rjarry/aerc > -MODGO_VERSION = v0.0.0-20230927211642-61bca76423ee > +MODGO_VERSION = v0.0.0-20240201001117-6ea74eb30457 > > -V = 0.16.0 > +V = 0.17.0 > DISTNAME = aerc-$V > -REVISION = 0 > > CATEGORIES = mail > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/mail/aerc/distinfo,v > retrieving revision 1.10 > diff -u -p -r1.10 distinfo > --- distinfo 28 Sep 2023 20:59:23 -0000 1.10 > +++ distinfo 1 Feb 2024 16:22:36 -0000 > @@ -1,12 +1,12 @@ > -SHA256 (aerc-0.16.0.zip) = qxB3rG5bd654Wr553+1Cs/yfDXRzXXT17YtwXeqa/Zo= > +SHA256 (aerc-0.17.0.zip) = kZfFtrQmuiy7+ncgCJviRC+MaFXZR8YvdsQOSgeXRl8= > SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.mod) = > ZmAMRI0rXFR3BnNIkO0YGJyCgLII2Gua8qsIENW2HSE= > SHA256 (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.zip) = > v36mmm629lvSsa2TebXRmQQP81Rk3+iLEKPFL30ROq8= > +SHA256 (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.mod) = > 4J9cxBhy4n5N/YRcoMwoVBs2K4xVoPWd0HOjF5qtnrE= > +SHA256 (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.zip) = > pK/so6R6i1R7BSCG1CAIXLuvJmkEaKx92ADcf9aHPL0= > SHA256 (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.mod) = > h/nX5diHqfkDrJbpZuGw5gE+IgaclgqZgm7kmVLa2jw= > SHA256 (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.zip) = > qB6fVqXORSSINci0xvMisPSucvo2ufZLg8O1JGR9wgg= > -SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.mod) = > 8kRq6lakDTvyokkg1NpGgMeU8Bp4sR1Cf62IhtKWbaM= > -SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.zip) = > dhiTK2f00tfMiBXlpyz8WGHzlJIVhiTkpkY4ZWeMNZU= > -SHA256 (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.mod) = > JKqQcy+IHLONXXl/PBB8RU7ygm2ZbHGoSCP45a2scPI= > -SHA256 (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.zip) = > 4NfbE0Q1547T0PtdB97FPTP6bCB8qYk4lEMNlaaxEck= > +SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.mod) = > 8kRq6lakDTvyokkg1NpGgMeU8Bp4sR1Cf62IhtKWbaM= > +SHA256 (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.zip) = > SgWDKQ8e+h0JoFbMtMt4tbOrox/BVVwePeJsp11w4Xg= > SHA256 > (go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.mod) > = DMa3izbWgj9dYhfIZi8gZzx06hpm99rTKMmFvQJyhjU= > SHA256 > (go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.zip) > = +ctdhKExtFrfAEM5TCDVDtDUKOWMIHMwUwRJD6KzSco= > SHA256 > (go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20211112122917-428f8eabeeb3.mod) > = YS0PzpOZlNH/uEOMpQbQh04XnAFAh1/Xr65Z65d3ROU= > @@ -36,8 +36,8 @@ SHA256 (go_modules/github.com/emersion/g > SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.0.5.mod) = > zTnypeCA7vmr+hUlnboJXXoUvGK52f5DBS1Aw3wGPgg= > SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.2.1.mod) = > CUokz+EHmJaAQ2go2iC2w8rGTTaPK9cwgoSSd+XYSlY= > SHA256 (go_modules/github.com/emersion/go-imap/@v/v1.2.1.zip) = > ubZudBptu/WHym+OYYpmsXZQeI+pTuQAz6zGDDSPxJo= > -SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.mod) = > VFWPA3hpzllHihNQJH2RumxUFdTrCW+aM3zntHp0sZc= > -SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.zip) = > 5mRlTH398xrgF9GEN4ygX+1+Kq74iTD2sKDBcixlz34= > +SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.mod) = > FJb3TEH40qSUtZd0v6154aHWYFQrSN53ga7CGRjRcRo= > +SHA256 (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.zip) = > N/ozWlIPaO2Ju99A7xoYJP7KLNaQgkYbz5WrKf86kKg= > SHA256 (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.mod) = > 4yv9gnZhVZlD1HDmPNzNV5E4WTeTtkmP4m5gcD5cnSI= > SHA256 (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.zip) = > B5QA+dvLBbwUS0Hr66U2EDNsPA55+nmBlOWP7abW96w= > SHA256 (go_modules/github.com/emersion/go-message/@v/v0.11.1.mod) = > c6hi3jK0N1pJeLMkBz1iZ6Jq69AU98qcnrXLlNQV88g= > @@ -91,8 +91,6 @@ SHA256 (go_modules/github.com/golang/sna > SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) = > QDarVjaqQr0xMpbNO/y0yIkSdgxWqeZlWuQi2HZ8gNo= > SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = > 58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0= > SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.8.zip) = > 0XV01abqn2Bu1zURcXDgKu/C8R+K4V44mO2Z0lW0bwY= > -SHA256 > (go_modules/github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod) > = hMaYCNIbxoSOGteNa2SWVDO1uqumZVSDOLfao5+qcL4= > -SHA256 > (go_modules/github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip) > = G/cL20yIm0exl2Nwgy2nkGDDbK0oLyePJ5YDIAYjd1w= > SHA256 (go_modules/github.com/hpcloud/tail/@v/v1.0.0.mod) = > AAXJlVGZWApblQ4qA0FlVcwN2NNi7ZqRm0oma4N+IJo= > SHA256 (go_modules/github.com/hpcloud/tail/@v/v1.0.0.zip) = > PLpIR0ji4pGdcmY1mbjMZFQFiXb7ypb5rHjYTxlbkio= > SHA256 > (go_modules/github.com/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.mod) > = 5ZSRBlwEQPtkFvUGd8n2B17yxQqC1CkDIU+vu1vCOG8= > @@ -162,7 +160,8 @@ SHA256 (go_modules/github.com/stretchr/t > SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = > //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78= > SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = > 4HYHTBVgrR3amLiwD+pjCMS2zNBt3QiNIttGJu1o9zg= > SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.2.mod) = > rxpdyzMazno/n8G11+7pwLyCtKKhgv5M7CrdIX4oU9Y= > -SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.2.zip) = > QA4YyI5cS+t+zKXWdQSPGRWm5nWzD8A/j1Y+tN/eB5o= > +SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.4.mod) = > BeJs0GkoWjPPKvRv2s3vVp1a4YXnljp2wBeDKPaOl/k= > +SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) = > 4gbart4L0D3gYL3765hKwsSbgwWHU//8k/4MIg6odTI= > SHA256 (go_modules/github.com/syndtr/goleveldb/@v/v1.0.0.mod) = > uTyCqRqL3sdPqRMoWcxlUqDHn79rkBw2+5UPVyEzYZI= > SHA256 (go_modules/github.com/syndtr/goleveldb/@v/v1.0.0.zip) = > pnq/gUGvQKJwkvRm06bfWmkeGW0xfiT18bzK2HvxMdE= > SHA256 > (go_modules/github.com/xo/terminfo/@v/v0.0.0-20220910002029-abceb7e1c41e.mod) > = cZ1TOX9e56KopHsGrNndrgY8vj1srzjt7KR3wtH+LM4= > @@ -264,15 +263,15 @@ SHA256 (go_modules/gopkg.in/yaml.v3/@v/v > SHA256 > (go_modules/gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod) = > IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= > SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = > IVeYYKIDBvz0OxvSNNH7oxlJnHdhG3HAX5vzupDauTk= > SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = > qrj7xOYwDqCOav4crqGKIckMefSJ9SxT4vIEMfGpoBU= > -SIZE (aerc-0.16.0.zip) = 588840 > +SIZE (aerc-0.17.0.zip) = 640912 > SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.mod) = 53 > SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.0.zip) = 19434 > +SIZE (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.mod) = 232 > +SIZE (go_modules/git.sr.ht/~rjarry/go-opt/@v/v1.3.0.zip) = 19615 > SIZE (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.mod) = 450 > SIZE (go_modules/git.sr.ht/~rockorager/go-jmap/@v/v0.3.0.zip) = 105054 > -SIZE (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.mod) = 386 > -SIZE (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.8.0.zip) = 134447 > -SIZE (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.mod) = 78 > -SIZE (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v1.0.0.zip) = 14195 > +SIZE (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.mod) = 386 > +SIZE (go_modules/git.sr.ht/~rockorager/tcell-term/@v/v0.10.0.zip) = 136735 > SIZE > (go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.mod) > = 155 > SIZE > (go_modules/github.com/!proton!mail/crypto/@v/v0.0.0-20200420072808-71bec3603bf3.zip) > = 2174772 > SIZE > (go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20211112122917-428f8eabeeb3.mod) > = 112 > @@ -302,8 +301,8 @@ SIZE (go_modules/github.com/emersion/go- > SIZE (go_modules/github.com/emersion/go-imap/@v/v1.0.5.mod) = 187 > SIZE (go_modules/github.com/emersion/go-imap/@v/v1.2.1.mod) = 187 > SIZE (go_modules/github.com/emersion/go-imap/@v/v1.2.1.zip) = 155667 > -SIZE (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.mod) = 47 > -SIZE (go_modules/github.com/emersion/go-maildir/@v/v0.3.0.zip) = 8258 > +SIZE (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.mod) = 47 > +SIZE (go_modules/github.com/emersion/go-maildir/@v/v0.4.1.zip) = 10243 > SIZE (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.mod) = 44 > SIZE (go_modules/github.com/emersion/go-mbox/@v/v1.0.3.zip) = 7735 > SIZE (go_modules/github.com/emersion/go-message/@v/v0.11.1.mod) = 291 > @@ -357,8 +356,6 @@ SIZE (go_modules/github.com/golang/snapp > SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.5.mod) = 105 > SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.8.mod) = 41 > SIZE (go_modules/github.com/google/go-cmp/@v/v0.5.8.zip) = 131550 > -SIZE > (go_modules/github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod) > = 40 > -SIZE > (go_modules/github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip) > = 8977 > SIZE (go_modules/github.com/hpcloud/tail/@v/v1.0.0.mod) = 31 > SIZE (go_modules/github.com/hpcloud/tail/@v/v1.0.0.zip) = 24894 > SIZE > (go_modules/github.com/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.mod) > = 38 > @@ -428,7 +425,8 @@ SIZE (go_modules/github.com/stretchr/tes > SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.1.mod) = 216 > SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 188 > SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.2.mod) = 188 > -SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.2.zip) = 114188 > +SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.4.mod) = 188 > +SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.4.zip) = 120537 > SIZE (go_modules/github.com/syndtr/goleveldb/@v/v1.0.0.mod) = 207 > SIZE (go_modules/github.com/syndtr/goleveldb/@v/v1.0.0.zip) = 194781 > SIZE > (go_modules/github.com/xo/terminfo/@v/v0.0.0-20220910002029-abceb7e1c41e.mod) > = 100 > Index: modules.inc > =================================================================== > RCS file: /cvs/ports/mail/aerc/modules.inc,v > retrieving revision 1.7 > diff -u -p -r1.7 modules.inc > --- modules.inc 28 Sep 2023 20:59:23 -0000 1.7 > +++ modules.inc 1 Feb 2024 16:22:36 -0000 > @@ -1,8 +1,8 @@ > MODGO_MODULES = \ > cloud.google.com/go/compute/metadata v0.2.0 \ > + git.sr.ht/~rjarry/go-opt v1.3.0 \ > git.sr.ht/~rockorager/go-jmap v0.3.0 \ > - git.sr.ht/~rockorager/tcell-term v0.8.0 \ > - git.sr.ht/~sircmpwn/getopt v1.0.0 \ > + git.sr.ht/~rockorager/tcell-term v0.10.0 \ > github.com/!proton!mail/crypto > v0.0.0-20200420072808-71bec3603bf3 \ > github.com/!proton!mail/go-crypto > v0.0.0-20230417170513-8ee5748c52b5 \ > github.com/arran4/golang-ical > v0.0.0-20230318005454-19abf92700cc \ > @@ -14,7 +14,7 @@ MODGO_MODULES = \ > github.com/davecgh/go-spew v1.1.1 \ > github.com/emersion/go-imap v1.2.1 \ > github.com/emersion/go-imap-sortthread v1.2.0 \ > - github.com/emersion/go-maildir v0.3.0 \ > + github.com/emersion/go-maildir v0.4.1 \ > github.com/emersion/go-mbox v1.0.3 \ > github.com/emersion/go-message v0.17.0 \ > github.com/emersion/go-milter v0.3.3 \ > @@ -34,7 +34,6 @@ MODGO_MODULES = \ > github.com/golang/protobuf v1.5.3 \ > github.com/golang/snappy v0.0.4 \ > github.com/google/go-cmp v0.5.8 \ > - github.com/google/shlex > v0.0.0-20191202100458-e7afc7fbc510 \ > github.com/hpcloud/tail v1.0.0 \ > github.com/jaytaylor/html2text > v0.0.0-20211105163654-bc68cce691ba \ > github.com/jhillyerd/enmime v0.11.0 \ > @@ -60,7 +59,7 @@ MODGO_MODULES = \ > github.com/rogpeppe/go-internal v1.8.1 \ > github.com/ssor/bom > v0.0.0-20170718123548-6386211fdfcf \ > github.com/stretchr/objx v0.5.0 \ > - github.com/stretchr/testify v1.8.2 \ > + github.com/stretchr/testify v1.8.4 \ > github.com/syndtr/goleveldb v1.0.0 \ > github.com/xo/terminfo > v0.0.0-20220910002029-abceb7e1c41e \ > github.com/yuin/goldmark v1.4.13 \ > @@ -83,6 +82,7 @@ MODGO_MODULES = \ > gopkg.in/tomb.v1 > v1.0.0-20141024135613-dd632973f1e7 \ > gopkg.in/yaml.v2 v2.2.1 \ > gopkg.in/yaml.v3 v3.0.1 > + > MODGO_MODFILES = \ > github.com/!proton!mail/go-crypto > v0.0.0-20211112122917-428f8eabeeb3 \ > github.com/bwesterb/go-ristretto v1.2.0 \ > @@ -124,6 +124,7 @@ MODGO_MODFILES = \ > github.com/stretchr/testify v1.7.0 \ > github.com/stretchr/testify v1.7.1 \ > github.com/stretchr/testify v1.8.0 \ > + github.com/stretchr/testify v1.8.2 \ > golang.org/x/crypto > v0.0.0-20190308221718-c2843e01d9a2 \ > golang.org/x/crypto > v0.0.0-20210322153248-0c34fe9e7dc2 \ > golang.org/x/crypto > v0.0.0-20210921155107-089bfa567519 \ > @@ -181,3 +182,4 @@ MODGO_MODFILES = \ > gopkg.in/check.v1 > v1.0.0-20200227125254-8fa46927fb4f \ > gopkg.in/yaml.v3 > v3.0.0-20200313102051-9f266ea9e77c \ > gopkg.in/yaml.v3 > v3.0.0-20210107192922-496545a6307b > + > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/mail/aerc/pkg/PLIST,v > retrieving revision 1.7 > diff -u -p -r1.7 PLIST > --- pkg/PLIST 28 Sep 2023 20:59:30 -0000 1.7 > +++ pkg/PLIST 1 Feb 2024 16:22:36 -0000 > @@ -22,6 +22,7 @@ libexec/aerc/filters/show-ics-details.py > @man man/man5/aerc-notmuch.5 > @man man/man5/aerc-sendmail.5 > @man man/man5/aerc-smtp.5 > +@man man/man7/aerc-patch.7 > @man man/man7/aerc-stylesets.7 > @man man/man7/aerc-templates.7 > @man man/man7/aerc-tutorial.7