CVS commit: pkgsrc

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jul  8 13:54:39 UTC 2018

Modified Files:
        pkgsrc/databases/mongo-tools: Makefile
        pkgsrc/security/vault: Makefile

Log Message:
Do not use "naked" go invocations.

Use ${GO} instead.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mongo-tools/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/vault/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mongo-tools/Makefile
diff -u pkgsrc/databases/mongo-tools/Makefile:1.13 pkgsrc/databases/mongo-tools/Makefile:1.14
--- pkgsrc/databases/mongo-tools/Makefile:1.13  Tue Jun 12 17:50:27 2018
+++ pkgsrc/databases/mongo-tools/Makefile       Sun Jul  8 13:54:39 2018
@@ -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 @@ do-build:
 .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 @@ do-install:
        ${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"

Index: pkgsrc/security/vault/Makefile
diff -u pkgsrc/security/vault/Makefile:1.29 pkgsrc/security/vault/Makefile:1.30
--- pkgsrc/security/vault/Makefile:1.29 Tue Jun 12 17:50:27 2018
+++ pkgsrc/security/vault/Makefile      Sun Jul  8 13:54:39 2018
@@ -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 @@ do-install:
        ${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"