Index: head/lang/go-devel/Makefile
===================================================================
--- head/lang/go-devel/Makefile	(revision 526126)
+++ head/lang/go-devel/Makefile	(revision 526127)
@@ -1,121 +1,124 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	go
 PORTVERSION=	g20200205
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
 PKGNAMESUFFIX=	-devel
 DISTFILES=	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Go programming language (development version)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .ifdef QEMU_EMULATING
 IGNORE=		fails to build with qemu-user-static
 .endif
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 
 RUN_DEPENDS=	${RUN_DEPENDS_${ARCH}}
 # ld.bfd from devel/binutils is needed for working cgo on aarch64
 RUN_DEPENDS_aarch64=	binutils>0:devel/binutils
 
 TEST_DEPENDS=	${TEST_DEPENDS_${ARCH}}
 TEST_DEPENDS_aarch64=	binutils>0:devel/binutils
 
-USES=		shebangfix tar:xz
+USES=		shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
 GH_TAGNAME=	a068054af141c01df5a4519844f4b77273605f4e
 
 SHEBANG_FILES=	misc/wasm/go_js_wasm_exec \
 		src/net/http/cgi/testdata/test.cgi
 SHEBANG_GLOB=	*.bash *.pl *.sh
-SHEBANG_LANG=	sh
 sh_OLD_CMD=	/bin/bash "/usr/bin/env bash"
 sh_CMD=		${SH}
 
 CONFLICTS_INSTALL=	go
 
+# Upstream archive contains files with UTF-8 names
+EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
+
 OPTIONS_DEFINE_i386=	GO387
 
 GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
 
 GO387_VARS=	GO386=387
 
 BINARIES=	go gofmt
 BOOTSTRAP_TAG=	go1.14beta1
 
 GOARCH_aarch64=	arm64
 GOARCH_amd64=	amd64
 GOARCH_armv6=	arm
 GOARCH_armv7=	arm
 GOARCH_i386=	386
 
 GOARM_armv6=	6
 GOARM_armv7=	7
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash
 	# Needed only for untagged releases
 	${ECHO_CMD} "devel +${GH_TAGNAME}" > ${WRKSRC}/VERSION
 
+pre-build:
+	# Check that the running kernel has COMPAT_FREEBSD11 required by lang/go{,-devel} post-ino64
+	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
+		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
+
 do-build:
 	cd ${WRKSRC}/src ; ${SETENV} \
 		XDG_CACHE_HOME=${WRKDIR} \
 		GOROOT_BOOTSTRAP=${WRKDIR}/go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-bootstrap \
 		GOROOT=${WRKSRC} \
 		GOROOT_FINAL=${PREFIX}/go \
 		GOBIN= \
 		GOOS=${OPSYS:tl} \
 		GOARCH=${GOARCH_${ARCH}} \
 		GO386=${GO386} \
 		GOARM=${GOARM_${ARCH}} \
 		${SH} make.bash -v
 
 do-install:
-	cd ${WRKSRC} ; \
+	@cd ${WRKSRC} ; \
 		${RM} -r .gitattributes .gitignore .github favicon.ico robots.txt \
 		pkg/obj pkg/bootstrap pkg/${OPSYS:tl}_${GOARCH_${ARCH}}/cmd
 	@${MKDIR} ${STAGEDIR}${PREFIX}/go
 	@${CP} -a ${WRKSRC}/* ${STAGEDIR}${PREFIX}/go
 .for file in ${BINARIES}
 	@${LN} -sf ../go/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
-.endfor
-
-post-install:
-.for file in ${BINARIES}
 	@${ECHO_CMD} bin/${file} >> ${TMPPLIST}
 .endfor
-	@cd ${STAGEDIR}${PREFIX} && \
-		${FIND} go -type f >> ${TMPPLIST}
+	@cd ${STAGEDIR}${PREFIX} && ${FIND} go -type f >> ${TMPPLIST}
 
 do-test:
 	cd ${WRKSRC}/src && ${SETENV} \
 		GOROOT=${WRKSRC} \
 		PATH=${WRKSRC}/bin:${PATH} \
 		GOOS=${OPSYS:tl} \
 		GOARCH=${GOARCH_${ARCH}} \
 		GO386=${GO386} \
 		GOARM=${GOARM_${ARCH}} \
-		${SH} run.bash
+		${SH} run.bash -no-rebuild
 
 .if !defined(_GO_MAKESUM_GUARD)
 makesum:
 	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp
 .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]}
 	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch}
-	${GREP} ${GOARCH_${arch}:U${arch}} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
+	${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
 	${RM} ${DISTINFO_FILE}.${arch}
 .endfor
 	${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
 	${RM} ${DISTINFO_FILE}.tmp
 .endif
 
 .include <bsd.port.mk>