Sun Jul 8 13:54:39 2018 UTC ()
Do not use "naked" go invocations.

Use ${GO} instead.


(bsiegert)
diff -r1.13 -r1.14 pkgsrc/databases/mongo-tools/Makefile
diff -r1.29 -r1.30 pkgsrc/security/vault/Makefile

cvs diff -r1.13 -r1.14 pkgsrc/databases/mongo-tools/Makefile (expand / switch to context diff)
--- pkgsrc/databases/mongo-tools/Makefile 2018/06/12 17:50:27 1.13
+++ pkgsrc/databases/mongo-tools/Makefile 2018/07/08 13:54:39 1.14
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/06/12 17:50:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/08 13:54:39 bsiegert Exp $
 
 DISTNAME=	mongo-tools-3.4.4
 PKGREVISION=	1
@@ -37,7 +37,7 @@
 .for tool in ${MONGO_TOOLS}
 	cd ${WRKSRC} && \
 	  ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \
-	  go build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go
+	  ${GO} build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go
 .endfor
 
 do-install:
@@ -45,6 +45,6 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool}
 .endfor
 
-.include "../../devel/go-sys/buildlink3.mk"
 .include "../../lang/go/version.mk"
+.include "../../devel/go-sys/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

cvs diff -r1.29 -r1.30 pkgsrc/security/vault/Makefile (expand / switch to context diff)
--- pkgsrc/security/vault/Makefile 2018/06/12 17:50:27 1.29
+++ pkgsrc/security/vault/Makefile 2018/07/08 13:54:39 1.30
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/06/12 17:50:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/08 13:54:39 bsiegert Exp $
 
 DISTNAME=	vault-0.10.1
 PKGREVISION=	1
@@ -23,7 +23,7 @@
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/vault ${DESTDIR}${PREFIX}/bin
 
 do-test:
-	cd ${WRKSRC} && ${SETENV} GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go test -v ./vault
+	cd ${WRKSRC} && ${SETENV} GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg ${GO} test -v ./vault
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"