Index: head/lang/go/Makefile
===================================================================
--- head/lang/go/Makefile	(revision 438982)
+++ head/lang/go/Makefile	(revision 438983)
@@ -1,71 +1,82 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	go
 PORTVERSION=	1.8.1
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://golang.org/dl/
 DISTNAME=	go${PORTVERSION}.src
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Go programming language
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	go14>=1.4:lang/go14
 
 USES=		shebangfix
-SHEBANG_LANG=	sh
+SHEBANG_LANG=	sh perl rc
 SHEBANG_FILES=	${WRKSRC}/src/*.bash \
-		${WRKSRC}/doc/articles/wiki/*.bash
+		${WRKSRC}/doc/articles/wiki/*.bash \
+		${WRKSRC}/lib/time/*.bash \
+		${WRKSRC}/misc/benchcmp \
+		${WRKSRC}/misc/nacl/go_nacl_*_exec \
+		${WRKSRC}/src/*.rc \
+		${WRKSRC}/src/cmd/dist/*.bash \
+		${WRKSRC}/src/cmd/go/*.sh \
+		${WRKSRC}/src/net/http/cgi/testdata/*.cgi \
+		${WRKSRC}/src/regexp/syntax/*.pl
 
 sh_OLD_CMD=	"/usr/bin/env bash"
 sh_CMD=		${SH}
+
+rc_OLD_CMD=	/bin/rc
+rc_CMD=		${LOCALBASE}/bin/rc
 
 WRKSRC=		${WRKDIR}/go
 ONLY_FOR_ARCHS=	i386 amd64 armv6
 
 OPTIONS_DEFINE=	GO387
 GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 GOARCH=386
 .elif ${ARCH} == "amd64"
 GOARCH=amd64
 .elif ${ARCH} == "armv6"
 GOARCH=arm
 .else
 IGNORE=		unknown arch ${ARCH}
 .endif
 
 .if ${PORT_OPTIONS:MGO387}
 .error wat
 GO386=387
 .endif
 
 PLIST_SUB+=	opsys_ARCH=${OPSYS:tl}_${GOARCH}
 
 post-patch:
 	@cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete
 
 do-build:
 	cd ${WRKSRC}/src && \
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \
 		GOROOT_BOOTSTRAP=${LOCALBASE}/go14 \
 		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
 		GO386=${GO386} \
 		${SH} make.bash
 
 do-install:
 	@${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX}
 .for f in go gofmt
 	@${LN} -sf ../go/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 regression-test: build
 	cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${SH} run.bash --no-rebuild --banner
 
 .include <bsd.port.post.mk>