Index: head/www/unit-go/Makefile
===================================================================
--- head/www/unit-go/Makefile	(revision 496299)
+++ head/www/unit-go/Makefile	(revision 496300)
@@ -1,33 +1,33 @@
 # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-go
 
 COMMENT=	Go module for NGINX Unit
 
 USES=		go
 
 PLIST_FILES=	# reset to empty
 PLIST_DIRS=	# reset to empty
 PLIST=		${.CURDIR}/pkg-plist
 
 USE_RC_SUBR?=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
 CGO_CFLAGS+=	-I${WRKSRC}/src -I${WRKSRC}/build
 GO_PKGNAME=	nginx/unit
 
 post-extract:
 	@true # override master's
 
 post-configure:
-	cd ${WRKSRC} && ${SETENV} ${GO_ENV} ./configure go --go-path=${WRKDIR}
+	cd ${WRKSRC} && ${SETENV} ${GO_ENV} GOCACHE=${WRKSRC}/go ./configure go --go-path=${WRKDIR}
 
 pre-build:
-	cd ${WRKSRC} && ${MAKE} && ${MAKE} go-install
+	cd ${WRKSRC} && ${MAKE_CMD} && ${SETENV} ${GO_ENV} GOCACHE=${WRKSRC}/go ${MAKE_CMD} go-install
 
 post-install:
 	@true # override master's
 
 .include "${MASTERDIR}/Makefile"