Index: branches/2020Q3/shells/elvish/Makefile
===================================================================
--- branches/2020Q3/shells/elvish/Makefile	(revision 545229)
+++ branches/2020Q3/shells/elvish/Makefile	(revision 545230)
@@ -1,25 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	elvish
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.13.1
+DISTVERSION=	0.14.1
 CATEGORIES=	shells
 
 MAINTAINER=	vendion@gmail.com
 COMMENT=	Friendly Interactive Shell and Expressive Programming Language
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	go:modules
+USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	elves
+GH_TUPLE=	\
+		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
+		etcd-io:bbolt:v1.3.4:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+		golang:sys:85ca7c5b95cd:golang_sys/vendor/golang.org/x/sys \
+		kr:pty:v1.1.4:kr_pty/vendor/github.com/kr/pty \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		xiaq:persistent:a1d9ac4077fc:xiaq_persistent/vendor/github.com/xiaq/persistent
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+
 GO_BUILDFLAGS=	-ldflags="-s -w -X github.com/elves/elvish/pkg/buildinfo.Version=${DISTVERSIONPREFIX}${DISTVERSION}" \
 		-gcflags="all=-trimpath=${GO_WRKSRC}" \
 		-asmflags="all=-trimpath=${GO_WRKSRC}"
+GO_TESTFLAGS=	-race
 
 PLIST_FILES=	bin/elvish
 
 .include <bsd.port.mk>
Index: branches/2020Q3/shells/elvish/distinfo
===================================================================
--- branches/2020Q3/shells/elvish/distinfo	(revision 545229)
+++ branches/2020Q3/shells/elvish/distinfo	(revision 545230)
@@ -1,3 +1,15 @@
-TIMESTAMP = 1586018796
-SHA256 (elves-elvish-v0.13.1_GH0.tar.gz) = 83275a4c36f66b831ba4864d1f5ffdc823616ed0a8e41b2a9a3e9fcba9279e27
-SIZE (elves-elvish-v0.13.1_GH0.tar.gz) = 1235076
+TIMESTAMP = 1597667743
+SHA256 (elves-elvish-v0.14.1_GH0.tar.gz) = 8a8113c0a1325785b212ed59410869bdea30ca2cb7400f95ebb3fbc8689eb6d8
+SIZE (elves-elvish-v0.14.1_GH0.tar.gz) = 575753
+SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
+SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
+SHA256 (etcd-io-bbolt-v1.3.4_GH0.tar.gz) = 536029610c6cd08e4a9fe2e1b0857ae539b0736850132cbbe1c18f0fbed8a4da
+SIZE (etcd-io-bbolt-v1.3.4_GH0.tar.gz) = 95404
+SHA256 (golang-sys-85ca7c5b95cd_GH0.tar.gz) = 06a5cbc446381df9653d4b410239720eea6b27461597de88f3e621664c811294
+SIZE (golang-sys-85ca7c5b95cd_GH0.tar.gz) = 1047239
+SHA256 (kr-pty-v1.1.4_GH0.tar.gz) = f69af477ac2df39246ab64f4bf61767015d493a98a74d5f4da40131f0fe6af7a
+SIZE (kr-pty-v1.1.4_GH0.tar.gz) = 5819
+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (xiaq-persistent-a1d9ac4077fc_GH0.tar.gz) = 43f431d16d4bef10b1fc6e72f61b3f60f3f0198f8384befba9742b582d2a61aa
+SIZE (xiaq-persistent-a1d9ac4077fc_GH0.tar.gz) = 19502
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 545229)
+++ branches/2020Q3	(revision 545230)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r545229