MFH: r505749 r506788 r507394 r507648

mail/aerc: Update to 0.2.1

Changes:	https://git.sr.ht/~sircmpwn/aerc/refs/

Approved by:	ports-secteam blanket (bug fixes, snapshot to release)

3 files changed, 61 insertions, 42 deletions

diff --git a/mail/aerc/Makefile b/mail/aerc/Makefile
index b9b725e4db20..00f54b71dd91 100644
--- a/mail/aerc/Makefile
+++ b/mail/aerc/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aerc
-DISTVERSION=	0.1.1-77
-DISTVERSIONSUFFIX=	-g61ef404
+DISTVERSION=	0.2.1
 CATEGORIES=	mail
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -19,34 +18,40 @@ GH_TUPLE=	danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.c
 		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-idle:2704abd7050e:emersion_go_imap_idle/vendor/github.com/emersion/go-imap-idle \
-		emersion:go-imap:v1.0.0-beta.6:emersion_go_imap/vendor/github.com/emersion/go-imap \
-		emersion:go-message:v0.10.3:emersion_go_message/vendor/github.com/emersion/go-message \
-		emersion:go-sasl:47d427600317:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
-		emersion:go-smtp:v0.11.1:emersion_go_smtp/vendor/github.com/emersion/go-smtp \
+		emersion:go-imap:v1.0.0:emersion_go_imap/vendor/github.com/emersion/go-imap \
+		emersion:go-maildir:941194b0ac70:emersion_go_maildir/vendor/github.com/emersion/go-maildir \
+		emersion:go-message:v0.10.5:emersion_go_message/vendor/github.com/emersion/go-message \
+		emersion:go-sasl:36b50694675c:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
+		emersion:go-smtp:v0.11.2:emersion_go_smtp/vendor/github.com/emersion/go-smtp \
 		emersion:go-textwrapper:d0e65e56babe:emersion_go_textwrapper/vendor/github.com/emersion/go-textwrapper \
+		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
-		go-ini:ini:v1.42.0:go_ini_ini/vendor/github.com/go-ini/ini \
-		golang:sys:4c4f7f33c9ed:golang_sys/vendor/golang.org/x/sys \
+		go-ini:ini:v1.44.0:go_ini_ini/vendor/github.com/go-ini/ini \
+		golang:appengine:v1.6.1:golang_appengine/vendor/google.golang.org/appengine \
+		golang:net:ca1201d0de80:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:0f29369cfe45:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:fc99dfbffb4e:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
 		google:shlex:c34317bd91bf:google_shlex/vendor/github.com/google/shlex \
 		kyoh86:xdg:v1.0.0:kyoh86_xdg/vendor/github.com/kyoh86/xdg \
 		lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		martinlindhe:base36:7c6542dfbb41:martinlindhe_base36/vendor/github.com/martinlindhe/base36 \
+		martinlindhe:base36:v1.0.0:martinlindhe_base36/vendor/github.com/martinlindhe/base36 \
 		mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-pointer:49522c3f3791:mattn_go_pointer/vendor/github.com/mattn/go-pointer \
 		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		miolini:datacounter:fd4e42a1d5e0:miolini_datacounter/vendor/github.com/miolini/datacounter \
+		miolini:datacounter:aa48df3a02c1:miolini_datacounter/vendor/github.com/miolini/datacounter \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		riywo:loginshell:c2f4167b2303:riywo_loginshell/vendor/github.com/riywo/loginshell \
+		riywo:loginshell:2ed199a032f6:riywo_loginshell/vendor/github.com/riywo/loginshell \
 		stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify
 
 # Additional distfiles to fetch from https://git.sr.ht
-SRHT_TUPLE=	sircmpwn aerc ${DISTVERSIONFULL} "" \
-		sircmpwn getopt e7e23d1cd3a3 vendor/git.sr.ht/~sircmpwn/getopt \
-		sircmpwn pty 3a43678975a9 vendor/git.sr.ht/~sircmpwn/pty \
-		sircmpwn tcell 1f7dcc638286 vendor/github.com/gdamore/tcell
+_SRHT_TUPLE=	sircmpwn:aerc:${DISTVERSIONFULL}:"" \
+		sircmpwn:getopt:292febf82fd0:vendor/git.sr.ht/~sircmpwn/getopt \
+		sircmpwn:pty:3a43678975a9:vendor/git.sr.ht/~sircmpwn/pty \
+		sircmpwn:tcell:0abd73a30946:vendor/github.com/gdamore/tcell
 
 MAKE_ARGS=	MANDIR=${STAGEDIR}${PREFIX}/man
 MAKE_ENV=	${GO_ENV} \
@@ -63,13 +68,13 @@ HTML_FILTER_RUN_DEPENDS=	socksify:net/dante \
 
 .include <bsd.port.pre.mk>
 
-.for account project tag subdir in ${SRHT_TUPLE}
+.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}
 .endfor
 
 post-extract:
-.for account project tag subdir in ${SRHT_TUPLE:[5..-1]}
+.for account project tag subdir in ${_SRHT_TUPLE:S/:/ /g:[5..-1]}
 	@${MKDIR} ${WRKSRC}/${subdir:H}
 	@${MV} ${WRKDIR}/${project}-${tag} ${WRKSRC}/${subdir}
 .endfor
diff --git a/mail/aerc/distinfo b/mail/aerc/distinfo
index 5e3a67ba883a..78146849a7cd 100644
--- a/mail/aerc/distinfo
+++ b/mail/aerc/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1562155931
-SHA256 (sircmpwn-aerc-0.1.1-77-g61ef404_SRHT0.tar.gz) = 677929d9aa656f8d2e633fa2e27ec293084fbac2c1089fd4c4f39f419d1cbbdc
-SIZE (sircmpwn-aerc-0.1.1-77-g61ef404_SRHT0.tar.gz) = 67676
-SHA256 (sircmpwn-getopt-e7e23d1cd3a3_SRHT0.tar.gz) = 39ce05a3d7f58fdc5cca2c3413a326a5a3e4fb8025470d875818353cb0007ea7
-SIZE (sircmpwn-getopt-e7e23d1cd3a3_SRHT0.tar.gz) = 3715
+TIMESTAMP = 1564498670
+SHA256 (sircmpwn-aerc-0.2.1_SRHT0.tar.gz) = 560cee4e284ed35623d28a5e793db79c5e4700296b0aa6ac2c8e92b20ab5c1cf
+SIZE (sircmpwn-aerc-0.2.1_SRHT0.tar.gz) = 89448
+SHA256 (sircmpwn-getopt-292febf82fd0_SRHT0.tar.gz) = c00ce65497649a786737098986543a22845c9168dcc21ddcaabd56f04969373c
+SIZE (sircmpwn-getopt-292febf82fd0_SRHT0.tar.gz) = 8429
 SHA256 (sircmpwn-pty-3a43678975a9_SRHT0.tar.gz) = 3cdfaff4ef27553045417a28e9d8d916ab23a6f32fb565c1dc39246c970094bf
 SIZE (sircmpwn-pty-3a43678975a9_SRHT0.tar.gz) = 5834
-SHA256 (sircmpwn-tcell-1f7dcc638286_SRHT0.tar.gz) = 597bdd77df220022b7df64b0f139267e97e6af9de7390781d9086c06b8260157
-SIZE (sircmpwn-tcell-1f7dcc638286_SRHT0.tar.gz) = 744326
+SHA256 (sircmpwn-tcell-0abd73a30946_SRHT0.tar.gz) = 0132fe99c45c514f9b537a04bbe111fa2d4582a5a58ab5b113abe37db06dee9e
+SIZE (sircmpwn-tcell-0abd73a30946_SRHT0.tar.gz) = 745186
 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
@@ -15,22 +15,34 @@ SHA256 (ddevault-go-libvterm-b7d861da3810_GH0.tar.gz) = b2bee30000a0c7b26a519910
 SIZE (ddevault-go-libvterm-b7d861da3810_GH0.tar.gz) = 112723
 SHA256 (emersion-go-imap-idle-2704abd7050e_GH0.tar.gz) = f4858fd23b7a40010a0598c38bb5a24af9b85bc09f4923888efb9d6ff007e99a
 SIZE (emersion-go-imap-idle-2704abd7050e_GH0.tar.gz) = 3632
-SHA256 (emersion-go-imap-v1.0.0-beta.6_GH0.tar.gz) = f60d6205193c5477e618085d93987cce3dfdf5ef7d814a74c7080720ff4e3d7f
-SIZE (emersion-go-imap-v1.0.0-beta.6_GH0.tar.gz) = 89833
-SHA256 (emersion-go-message-v0.10.3_GH0.tar.gz) = fa6bcf5a14e9642e1c0f61e253837a3e581202ebf159cfb2e046d4097f2e3c20
-SIZE (emersion-go-message-v0.10.3_GH0.tar.gz) = 25153
-SHA256 (emersion-go-sasl-47d427600317_GH0.tar.gz) = 44f80bb73cabe49f9dbd44cbf57cb8209b211558ac341f1af658106887639f2c
-SIZE (emersion-go-sasl-47d427600317_GH0.tar.gz) = 4602
-SHA256 (emersion-go-smtp-v0.11.1_GH0.tar.gz) = 1614c548ba2c6c175dfbc158b30ce03b562ec268cef1c6d95671aafb257599c9
-SIZE (emersion-go-smtp-v0.11.1_GH0.tar.gz) = 21764
+SHA256 (emersion-go-imap-v1.0.0_GH0.tar.gz) = 317ade221c617e7611309c6843538a602a28792daed360c38453b46b0b614935
+SIZE (emersion-go-imap-v1.0.0_GH0.tar.gz) = 93253
+SHA256 (emersion-go-maildir-941194b0ac70_GH0.tar.gz) = 56978d5c54edb56150f403cc790c98414f2ae7856320ceb75e025f984378296b
+SIZE (emersion-go-maildir-941194b0ac70_GH0.tar.gz) = 6449
+SHA256 (emersion-go-message-v0.10.5_GH0.tar.gz) = 23007271dba2ca4eb36969862e89325fca7c31287fe1d45ef0412843c71f3ac2
+SIZE (emersion-go-message-v0.10.5_GH0.tar.gz) = 25688
+SHA256 (emersion-go-sasl-36b50694675c_GH0.tar.gz) = 388f74bce9cf8203d6a474549951fb9c5ac49254acebb00619d785c2b75c1568
+SIZE (emersion-go-sasl-36b50694675c_GH0.tar.gz) = 5504
+SHA256 (emersion-go-smtp-v0.11.2_GH0.tar.gz) = 8ff2245d939e20d284e2db3060b75dc9fde7eff6b59a47c0c81f7dd7ed5f965f
+SIZE (emersion-go-smtp-v0.11.2_GH0.tar.gz) = 24309
 SHA256 (emersion-go-textwrapper-d0e65e56babe_GH0.tar.gz) = 2fab0e25c645d347171890d71f48e5ca4e796fe6740e03c169d2f5865d713ceb
 SIZE (emersion-go-textwrapper-d0e65e56babe_GH0.tar.gz) = 2168
+SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
+SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139
 SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
 SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (go-ini-ini-v1.42.0_GH0.tar.gz) = 49136717e5db9000e02f86807cfd9faa98f943553a3c40319020b7c32e7c142c
-SIZE (go-ini-ini-v1.42.0_GH0.tar.gz) = 35078
-SHA256 (golang-sys-4c4f7f33c9ed_GH0.tar.gz) = d1e6184629bc6ad5db894fe80d2e1456f8e5721c9031574d2f721c8c2ef8b1f3
-SIZE (golang-sys-4c4f7f33c9ed_GH0.tar.gz) = 1425064
+SHA256 (go-ini-ini-v1.44.0_GH0.tar.gz) = 4ace9569814b40b7755e1395f10bbef9d4f80c0b975d5212ac4b2586ca148636
+SIZE (go-ini-ini-v1.44.0_GH0.tar.gz) = 35817
+SHA256 (golang-appengine-v1.6.1_GH0.tar.gz) = 1755aaf4c6246579337bf1bc4f834ef00c56216da87b20456863ca91985b5afa
+SIZE (golang-appengine-v1.6.1_GH0.tar.gz) = 333353
+SHA256 (golang-net-ca1201d0de80_GH0.tar.gz) = 1d0b1f44b64c6248ce65f4d78add4228f15ffbdbe4a559a6d1effa410ce01071
+SIZE (golang-net-ca1201d0de80_GH0.tar.gz) = 1099216
+SHA256 (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 468421ddfe905216454006b309ebda6e97aa6089265b995bce4259d6a9efd141
+SIZE (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 45498
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sys-fc99dfbffb4e_GH0.tar.gz) = 009b8629e6f1369c3b9376d2e5fea53c0ebc8be89895719efb09a8a605d373d5
+SIZE (golang-sys-fc99dfbffb4e_GH0.tar.gz) = 1454968
 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
 SHA256 (google-shlex-c34317bd91bf_GH0.tar.gz) = fefaae49749c42aaaf9864fc0a04326a8cc263a42ebfb18b907419b9cfc9f4f1
@@ -39,23 +51,23 @@ SHA256 (kyoh86-xdg-v1.0.0_GH0.tar.gz) = 33e7cf4fbc63b98c9da44a9c846d2340752fcf73
 SIZE (kyoh86-xdg-v1.0.0_GH0.tar.gz) = 4151
 SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140
 SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545
-SHA256 (martinlindhe-base36-7c6542dfbb41_GH0.tar.gz) = a45194f6508be30cb5464062f10f1cbc9dc24942598d824be5e29e305968b1b7
-SIZE (martinlindhe-base36-7c6542dfbb41_GH0.tar.gz) = 3161
+SHA256 (martinlindhe-base36-v1.0.0_GH0.tar.gz) = 973805ba2d2c22bc6728f818254ccc44fed5c6df8d97879bddbf4f48a427b0b0
+SIZE (martinlindhe-base36-v1.0.0_GH0.tar.gz) = 3161
 SHA256 (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 4f40edb394582f49ac6330bc807be93018216ef485eb65f00adcf61b670d4f3e
 SIZE (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 3564
 SHA256 (mattn-go-pointer-49522c3f3791_GH0.tar.gz) = d6798da24430e3d74028fcc5ee5df3d24750573b23c575f991946472512f85b9
 SIZE (mattn-go-pointer-49522c3f3791_GH0.tar.gz) = 1312
 SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
 SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
-SHA256 (miolini-datacounter-fd4e42a1d5e0_GH0.tar.gz) = 4a054d3c0cbced79d261c890bf9118f11685446943374be7bb263ca1d5b4a47a
-SIZE (miolini-datacounter-fd4e42a1d5e0_GH0.tar.gz) = 2902
+SHA256 (miolini-datacounter-aa48df3a02c1_GH0.tar.gz) = 655ac04a30a073ec11e560d2d2c08adbddac597587ab3c2e2ca5392bf5b3f803
+SIZE (miolini-datacounter-aa48df3a02c1_GH0.tar.gz) = 2890
 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
 SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
 SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (riywo-loginshell-c2f4167b2303_GH0.tar.gz) = 488d8e0cf37a978115d6fb6d46b1096652c3385c9b5f702e9c4c97187c8d8988
-SIZE (riywo-loginshell-c2f4167b2303_GH0.tar.gz) = 1236
+SHA256 (riywo-loginshell-2ed199a032f6_GH0.tar.gz) = bb0d61960149545091983d00b29a8f1da9b752a804babac985911432c3b7ad54
+SIZE (riywo-loginshell-2ed199a032f6_GH0.tar.gz) = 2018
 SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5
 SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859
diff --git a/mail/aerc/pkg-plist b/mail/aerc/pkg-plist
index fd12db3517dc..18759c3ac479 100644
--- a/mail/aerc/pkg-plist
+++ b/mail/aerc/pkg-plist
@@ -2,6 +2,8 @@ bin/aerc
 man/man1/aerc.1.gz
 man/man5/aerc-config.5.gz
 man/man5/aerc-imap.5.gz
+man/man5/aerc-maildir.5.gz
+man/man5/aerc-sendmail.5.gz
 man/man5/aerc-smtp.5.gz
 man/man7/aerc-tutorial.7.gz
 %%DATADIR%%/accounts.conf