Index: head/devel/shfmt/Makefile
===================================================================
--- head/devel/shfmt/Makefile	(revision 520260)
+++ head/devel/shfmt/Makefile	(revision 520261)
@@ -1,24 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	shfmt
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.6.4
-PORTREVISION=	1
+DISTVERSION=	3.0.0
 CATEGORIES=	devel
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Format shell scripts
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
-GO_PKGNAME=	mvdan.cc/sh
-GO_TARGET=	mvdan.cc/sh/cmd/shfmt
+USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	mvdan
 GH_PROJECT=	sh
-
+GH_TUPLE=	go-errgo:errgo:v2.1.0:go_errgo_errgo/vendor/gopkg.in/errgo.v2 \
+		golang:crypto:34f69633bfdc:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \
+		golang:xerrors:1b5146add898:golang_xerrors/vendor/golang.org/x/xerrors \
+		kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \
+		kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \
+		mvdan:editorconfig:890940e3f00e:mvdan_editorconfig/vendor/mvdan.cc/editorconfig \
+		pkg:diff:531926345625:pkg_diff/vendor/github.com/pkg/diff \
+		rogpeppe:go-internal:v1.5.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal
+GO_TARGET=	./cmd/shfmt
 PLIST_FILES=	bin/shfmt
+
+do-test:
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} \
+		./cmd/shfmt
 
 .include <bsd.port.mk>
Index: head/devel/shfmt/distinfo
===================================================================
--- head/devel/shfmt/distinfo	(revision 520260)
+++ head/devel/shfmt/distinfo	(revision 520261)
@@ -1,3 +1,23 @@
-TIMESTAMP = 1552244727
-SHA256 (mvdan-sh-v2.6.4_GH0.tar.gz) = 72c8e5833e61a31a4595bbd8a77bfb0a8ade9c60603638be70ea801e309d39fe
-SIZE (mvdan-sh-v2.6.4_GH0.tar.gz) = 138208
+TIMESTAMP = 1576505630
+SHA256 (mvdan-sh-v3.0.0_GH0.tar.gz) = 8bfd0d4b4d532d0b6ecd77f94c91d1f6da47b26a4453ed5c7567826113424116
+SIZE (mvdan-sh-v3.0.0_GH0.tar.gz) = 182624
+SHA256 (go-errgo-errgo-v2.1.0_GH0.tar.gz) = f6b10d77db65cb5a6c425be0f695e43b98e3e10ec83340209ac5bf4bf5c1b837
+SIZE (go-errgo-errgo-v2.1.0_GH0.tar.gz) = 9927
+SHA256 (golang-crypto-34f69633bfdc_GH0.tar.gz) = c3fa0760971622af64c3b7a3319291d997f2f0d53a5c90c17d25eaeba7f0371a
+SIZE (golang-crypto-34f69633bfdc_GH0.tar.gz) = 1708053
+SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393
+SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956
+SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
+SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
+SHA256 (golang-xerrors-1b5146add898_GH0.tar.gz) = 57ba6cacc0a84a2ecbfda1169b5e9c184581dd009136f95d2fca9a5289e49ab1
+SIZE (golang-xerrors-1b5146add898_GH0.tar.gz) = 12200
+SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
+SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
+SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e
+SIZE (kr-text-v0.1.0_GH0.tar.gz) = 8686
+SHA256 (mvdan-editorconfig-890940e3f00e_GH0.tar.gz) = 0b8a49502948093f5528d40ab82800941f6ccbdff5002cf24a1e1895c619bcbe
+SIZE (mvdan-editorconfig-890940e3f00e_GH0.tar.gz) = 9254
+SHA256 (pkg-diff-531926345625_GH0.tar.gz) = 5ffa839187823adc53cc85a9f821a055f1827e276f1cc51cb17587dd80321bb0
+SIZE (pkg-diff-531926345625_GH0.tar.gz) = 11589
+SHA256 (rogpeppe-go-internal-v1.5.0_GH0.tar.gz) = a1db9f87696391f8451b2ea7c4325cf7e500c7cc24bead28f8c494dc3097ac5a
+SIZE (rogpeppe-go-internal-v1.5.0_GH0.tar.gz) = 120356