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 unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2018/06/12 17:50:27 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.14 2018/07/08 13:54:39 bsiegert Exp $
2 2
3DISTNAME= mongo-tools-3.4.4 3DISTNAME= mongo-tools-3.4.4
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/}
7 7
8MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
9HOMEPAGE= https://github.com/mongodb/mongo-tools/ 9HOMEPAGE= https://github.com/mongodb/mongo-tools/
10COMMENT= MongoDB CLI tools 10COMMENT= MongoDB CLI tools
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13GITHUB_TAG= r${PKGVERSION_NOREV} 13GITHUB_TAG= r${PKGVERSION_NOREV}
14 14
@@ -27,24 +27,24 @@ BUILDLINK_PASSTHRU_DIRS+= /tmp @@ -27,24 +27,24 @@ BUILDLINK_PASSTHRU_DIRS+= /tmp
27 27
28INSTALLATION_DIRS+= bin 28INSTALLATION_DIRS+= bin
29 29
30post-extract: 30post-extract:
31 ${MKDIR} -p ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools 31 ${MKDIR} -p ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools
32.for tool in common ${MONGO_TOOLS} 32.for tool in common ${MONGO_TOOLS}
33 ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools/${tool} 33 ${LN} -s ${WRKSRC}/${tool} ${WRKSRC}/vendor/src/github.com/mongodb/mongo-tools/${tool}
34.endfor 34.endfor
35 35
36do-build: 36do-build:
37.for tool in ${MONGO_TOOLS} 37.for tool in ${MONGO_TOOLS}
38 cd ${WRKSRC} && \ 38 cd ${WRKSRC} && \
39 ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \ 39 ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \
40 go build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go 40 ${GO} build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go
41.endfor 41.endfor
42 42
43do-install: 43do-install:
44.for tool in ${MONGO_TOOLS} 44.for tool in ${MONGO_TOOLS}
45 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool} 45 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool}
46.endfor 46.endfor
47 47
48.include "../../devel/go-sys/buildlink3.mk" 
49.include "../../lang/go/version.mk" 48.include "../../lang/go/version.mk"
 49.include "../../devel/go-sys/buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/security/vault/Makefile (expand / switch to unified 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,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.29 2018/06/12 17:50:27 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.30 2018/07/08 13:54:39 bsiegert Exp $
2 2
3DISTNAME= vault-0.10.1 3DISTNAME= vault-0.10.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
7 7
8MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
9HOMEPAGE= https://www.vaultproject.io/ 9HOMEPAGE= https://www.vaultproject.io/
10COMMENT= Tool for managing secrets 10COMMENT= Tool for managing secrets
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13GITHUB_TAG= v${PKGVERSION_NOREV} 13GITHUB_TAG= v${PKGVERSION_NOREV}
14 14
15GO_DIST_BASE= ${DISTNAME} 15GO_DIST_BASE= ${DISTNAME}
16GO_SRCPATH= github.com/hashicorp/vault 16GO_SRCPATH= github.com/hashicorp/vault
17 17
18USE_TOOLS+= bash gmake 18USE_TOOLS+= bash gmake
19 19
20INSTALLATION_DIRS+= bin 20INSTALLATION_DIRS+= bin
21 21
22do-install: 22do-install:
23 ${INSTALL_PROGRAM} ${WRKDIR}/bin/vault ${DESTDIR}${PREFIX}/bin 23 ${INSTALL_PROGRAM} ${WRKDIR}/bin/vault ${DESTDIR}${PREFIX}/bin
24 24
25do-test: 25do-test:
26 cd ${WRKSRC} && ${SETENV} GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go test -v ./vault 26 cd ${WRKSRC} && ${SETENV} GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg ${GO} test -v ./vault
27 27
28.include "../../lang/go/go-package.mk" 28.include "../../lang/go/go-package.mk"
29.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"