Index: head/mail/aerc/Makefile
===================================================================
--- head/mail/aerc/Makefile	(revision 504420)
+++ head/mail/aerc/Makefile	(revision 504421)
@@ -1,92 +1,92 @@
 # $FreeBSD$
 
 PORTNAME=	aerc
-DISTVERSION=	0.1.1-37
-DISTVERSIONSUFFIX=	-gd22a914
+DISTVERSION=	0.1.1-53
+DISTVERSIONSUFFIX=	-gdfe114b
 CATEGORIES=	mail
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Email client for your terminal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	scdoc:textproc/scdoc
 
 USES=		go:modules
 USE_GITHUB=	nodefault
 GH_TUPLE=	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-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-textwrapper:d0e65e56babe:emersion_go_textwrapper/vendor/github.com/emersion/go-textwrapper \
 		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
-		gdamore:tcell:b5d0c1ac5702:gdamore_tcell/vendor/github.com/gdamore/tcell \
 		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 \
 		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 \
 		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 \
 		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 \
 		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 \
-		sircmpwn pty 3a43678975a9
+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
 
 MAKE_ARGS=	MANDIR=${STAGEDIR}${PREFIX}/man
 MAKE_ENV=	${GO_ENV} \
 		GOFLAGS="${GO_BUILDFLAGS}"
 
 OPTIONS_DEFINE=		HTML_FILTER
 OPTIONS_DEFAULT=	HTML_FILTER
 OPTIONS_SUB=		yes
 
 HTML_FILTER_DESC=	Install HTML filter (depends on w3m and socksify)
 
 HTML_FILTER_RUN_DEPENDS=	socksify:net/dante \
 				w3m:www/w3m
 
 .include <bsd.port.pre.mk>
 
-.for account project tag in ${SRHT_TUPLE}
+.for account project tag subdir in ${SRHT_TUPLE}
 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 in ${SRHT_TUPLE:[4..-1]}
-	@${MKDIR} ${WRKSRC}/vendor/git.sr.ht/~${account}
-	@${MV} ${WRKDIR}/${project}-${tag} ${WRKSRC}/vendor/git.sr.ht/~${account}/${project}
+.for account project tag subdir in ${SRHT_TUPLE:[5..-1]}
+	@${MKDIR} ${WRKSRC}/${subdir:H}
+	@${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
 
 # Prevent USES=go do-{build,install} targets.  We do want the
 # environmental setup USES=go does though.
 do-build:
 	@${DO_MAKE_BUILD} -C ${WRKSRC} ${ALL_TARGET}
 
 do-install:
 	@${DO_MAKE_BUILD} -C ${WRKSRC} DESTDIR=${STAGEDIR} ${INSTALL_TARGET}
 
 .include <bsd.port.post.mk>
Index: head/mail/aerc/distinfo
===================================================================
--- head/mail/aerc/distinfo	(revision 504420)
+++ head/mail/aerc/distinfo	(revision 504421)
@@ -1,61 +1,61 @@
-TIMESTAMP = 1560184690
-SHA256 (sircmpwn-aerc-0.1.1-37-gd22a914_SRHT0.tar.gz) = c47fd1923594e932db31d770e9099b06b7a79b6307e1f1e13ef6b3d3c56e668f
-SIZE (sircmpwn-aerc-0.1.1-37-gd22a914_SRHT0.tar.gz) = 63661
+TIMESTAMP = 1560777630
+SHA256 (sircmpwn-aerc-0.1.1-53-gdfe114b_SRHT0.tar.gz) = 081241511fe7a80a96c64acf5b4edc4773f8a63817dc3b4ce0ae7ac5c801671d
+SIZE (sircmpwn-aerc-0.1.1-53-gdfe114b_SRHT0.tar.gz) = 65212
 SHA256 (sircmpwn-getopt-e7e23d1cd3a3_SRHT0.tar.gz) = 39ce05a3d7f58fdc5cca2c3413a326a5a3e4fb8025470d875818353cb0007ea7
 SIZE (sircmpwn-getopt-e7e23d1cd3a3_SRHT0.tar.gz) = 3715
 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 (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-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-textwrapper-d0e65e56babe_GH0.tar.gz) = 2fab0e25c645d347171890d71f48e5ca4e796fe6740e03c169d2f5865d713ceb
 SIZE (emersion-go-textwrapper-d0e65e56babe_GH0.tar.gz) = 2168
 SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
 SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (gdamore-tcell-b5d0c1ac5702_GH0.tar.gz) = f6bae2233826d53b880a462357ab49667b5e124c633e0f1177a8d97e0bc7dd9f
-SIZE (gdamore-tcell-b5d0c1ac5702_GH0.tar.gz) = 745939
 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 (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
 SIZE (google-shlex-c34317bd91bf_GH0.tar.gz) = 7234
 SHA256 (kyoh86-xdg-v1.0.0_GH0.tar.gz) = 33e7cf4fbc63b98c9da44a9c846d2340752fcf733fdc97d8dff175c43fdd9083
 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 (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 (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 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5
 SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859