--- lang/go/Makefile	(revision 498715)
+++ lang/go/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	go
 PORTVERSION=	1.12.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://golang.org/dl/
@@ -40,6 +41,7 @@ 
 GOARCH=amd64
 .elif ${ARCH} == armv6 || ${ARCH} == armv7
 GOARCH=arm
+GOARM=${ARCH:C/armv//}
 .else
 IGNORE=		unknown arch ${ARCH}
 .endif
@@ -58,7 +60,7 @@ 
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \
 		GOROOT_BOOTSTRAP=${LOCALBASE}/go14 \
 		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
-		GO386=${GO386} \
+		GO386=${GO386} GOARM=${GOARM} CGO_ENABLED=1 \
 		${SH} make.bash -v
 	${RM} -r ${WRKSRC}/pkg/obj \
 	    ${WRKSRC}/pkg/bootstrap \