From owner-svn-ports-head@freebsd.org Wed Mar 7 08:06:29 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33881F37A69; Wed, 7 Mar 2018 08:06:29 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8E8A8546E; Wed, 7 Mar 2018 08:06:28 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF14C1EBDB; Wed, 7 Mar 2018 08:06:28 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2786SrH052877; Wed, 7 Mar 2018 08:06:28 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2786Obi052836; Wed, 7 Mar 2018 08:06:24 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201803070806.w2786Obi052836@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Wed, 7 Mar 2018 08:06:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463776 - in head: benchmarks/hey benchmarks/vegeta databases/influxdb devel/arduino-builder devel/arduinoOTA devel/awless devel/git-codereview devel/git-town devel/gitlab-runner devel/... X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head: benchmarks/hey benchmarks/vegeta databases/influxdb devel/arduino-builder devel/arduinoOTA devel/awless devel/git-codereview devel/git-town devel/gitlab-runner devel/grv devel/hub devel/jfrog... X-SVN-Commit-Revision: 463776 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2018 08:06:29 -0000 Author: yuri Date: Wed Mar 7 08:06:24 2018 New Revision: 463776 URL: https://svnweb.freebsd.org/changeset/ports/463776 Log: Make 41 Go ports respect MAKE_ENV. This is expected to unbreak them. Ports: benchmarks/hey benchmarks/vegeta databases/influxdb devel/arduino-builder devel/arduinoOTA devel/awless devel/git-codereview devel/git-town devel/gitlab-runner devel/grv devel/hub devel/jfrog-cli editors/micro finance/fixc misc/exercism net-mgmt/intel-snap net-mgmt/kapacitor net-mgmt/telegraf net/goreplay net/syncthing net/syncthing-cli net/syncthing-discosrv net/syncthing-inotify print/cups-connector security/sops security/vault sysutils/amazon-ssm-agent sysutils/circonus-agent sysutils/consul sysutils/consul_exporter sysutils/envconsul sysutils/serf textproc/consul-template textproc/spiff www/gobuffalo www/grafana2 www/grafana3 www/mattermost-server www/minio www/minio-client www/uchiwa Approved by: tcberner (mentor, implicit) Approved by: portmgr (port compliance, infrastructure) Modified: head/benchmarks/hey/Makefile head/benchmarks/vegeta/Makefile head/databases/influxdb/Makefile head/devel/arduino-builder/Makefile head/devel/arduinoOTA/Makefile head/devel/awless/Makefile head/devel/git-codereview/Makefile head/devel/git-town/Makefile head/devel/gitlab-runner/Makefile head/devel/grv/Makefile head/devel/hub/Makefile head/devel/jfrog-cli/Makefile head/editors/micro/Makefile head/finance/fixc/Makefile head/misc/exercism/Makefile head/net-mgmt/intel-snap/Makefile head/net-mgmt/kapacitor/Makefile head/net-mgmt/telegraf/Makefile head/net/goreplay/Makefile head/net/syncthing-cli/Makefile head/net/syncthing-discosrv/Makefile head/net/syncthing-inotify/Makefile head/net/syncthing/Makefile head/print/cups-connector/Makefile head/security/sops/Makefile head/security/vault/Makefile head/sysutils/amazon-ssm-agent/Makefile head/sysutils/circonus-agent/Makefile head/sysutils/consul/Makefile head/sysutils/consul_exporter/Makefile head/sysutils/envconsul/Makefile head/sysutils/serf/Makefile head/textproc/consul-template/Makefile head/textproc/spiff/Makefile head/www/gobuffalo/Makefile head/www/grafana2/Makefile head/www/grafana3/Makefile head/www/mattermost-server/Makefile head/www/minio-client/Makefile head/www/minio/Makefile head/www/uchiwa/Makefile Modified: head/benchmarks/hey/Makefile ============================================================================== --- head/benchmarks/hey/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/benchmarks/hey/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -24,7 +24,7 @@ do-build: cd src/github.com/rakyll/hey; \ ${LN} -s ../../../../requester . ) ( cd ${WRKSRC}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} CC=clang \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} CC=clang \ go build ${BUILD_FLAGS} ) do-install: Modified: head/benchmarks/vegeta/Makefile ============================================================================== --- head/benchmarks/vegeta/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/benchmarks/vegeta/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -27,7 +27,7 @@ do-build: @${RLN} ${WRKSRC} ${WRKSRC}/github.com/${GH_ACCOUNT}/${PORTNAME} @${RLN} ${WRKSRC} ${WRKSRC}/src @cd ${WRKSRC} && \ - ${SETENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ + ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ go build -ldflags "-X main.Version=${DISTVERSION}" -o bin/${PORTNAME} do-install: Modified: head/databases/influxdb/Makefile ============================================================================== --- head/databases/influxdb/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/databases/influxdb/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -107,7 +107,7 @@ post-patch: do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \ - ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./... + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./... do-build-MANPAGES-on: @cd ${WRKSRC}/src/github.com/influxdata/influxdb/man && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} Modified: head/devel/arduino-builder/Makefile ============================================================================== --- head/devel/arduino-builder/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/arduino-builder/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -41,7 +41,7 @@ do-patch-TOOLS-on: ${WRKSRC}/arduino-builder.options do-build: - @( cd ${WRKSRC} ; ${SETENV} ${GO_ENV} go build arduino.cc/arduino-builder ) + @( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} go build arduino.cc/arduino-builder ) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/devel/arduinoOTA/Makefile ============================================================================== --- head/devel/arduinoOTA/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/arduinoOTA/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -19,7 +19,7 @@ PLIST_FILES= bin/${PORTNAME} COMPILEINFO= ${OPSYS}${OSREL}-${ARCH}-${GH_TAGNAME} do-build: - (cd ${WRKSRC} && ${SETENV} ${GO_ENV} go build -o ${PORTNAME} -ldflags "-X main.compileInfo=${COMPILEINFO}" main.go) + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} go build -o ${PORTNAME} -ldflags "-X main.compileInfo=${COMPILEINFO}" main.go do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/devel/awless/Makefile ============================================================================== --- head/devel/awless/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/awless/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -24,7 +24,7 @@ PLIST_FILES= bin/awless PORTDOCS= README.md CHANGELOG.md do-build: - @(cd ${WRKSRC} && ${SETENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} ) + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} ) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/devel/git-codereview/Makefile ============================================================================== --- head/devel/git-codereview/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/git-codereview/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -24,7 +24,7 @@ post-patch: .endfor do-build: - cd ${WRKSRC}/src/golang.org/x/review ; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go install ./... + @cd ${WRKSRC}/src/golang.org/x/review ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go install ./... do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/devel/git-town/Makefile ============================================================================== --- head/devel/git-town/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/git-town/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * do-build: - @cd ${WRKSRC}/${GH_SUBDIR} && ${SETENV} GOPATH=${WRKSRC} go build + @cd ${WRKSRC}/${GH_SUBDIR} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ Modified: head/devel/gitlab-runner/Makefile ============================================================================== --- head/devel/gitlab-runner/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/gitlab-runner/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -66,7 +66,7 @@ do-build: @${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org @${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-runner @cd ${WRKSRC} && \ - ${SETENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build \ + ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build \ -ldflags="${GO_LDFLAGS}" \ -o gitlab-runner Modified: head/devel/grv/Makefile ============================================================================== --- head/devel/grv/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/grv/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -37,7 +37,7 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * do-build: - @cd ${WRKSRC} && ${SETENV} GOPATH=${WRKSRC} go build ./cmd/${PORTNAME} + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build ./cmd/${PORTNAME} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/devel/hub/Makefile ============================================================================== --- head/devel/hub/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/hub/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -22,7 +22,7 @@ PLIST_FILES= bin/hub \ share/zsh/site-functions/_hub \ man/man1/hub.1.gz do-build: - @cd ${WRKSRC} ; ${SETENV} ${LOCALBASE}/bin/bash script/build + @cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/bash script/build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/hub ${STAGEDIR}${PREFIX}/bin Modified: head/devel/jfrog-cli/Makefile ============================================================================== --- head/devel/jfrog-cli/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/devel/jfrog-cli/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -21,8 +21,8 @@ post-extract: @${MV} ${WRKSRC}/jfrog-cli ${WRKSRC}/jfrog-client ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go do-build: - cd ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go ; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go install ./... + @cd ${WRKSRC}/src/github.com/jfrogdev/jfrog-cli-go ; \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go install ./... do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/jfrog ${STAGEDIR}${PREFIX}/bin/jfrog Modified: head/editors/micro/Makefile ============================================================================== --- head/editors/micro/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/editors/micro/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -42,7 +42,7 @@ PORTDOCS= README.md do-build: @(cd ${WRKSRC} ; \ - ${SETENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.Version=${PORTVERSION} -X main.CommitHash=${BUILD_HASH} -X 'main.CompileDate=${BUILD_DATE}' " ./cmd/micro ) do-install: Modified: head/finance/fixc/Makefile ============================================================================== --- head/finance/fixc/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/finance/fixc/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -15,8 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= blttll do-build: - cd ${WRKSRC} && \ - go build -o fixc main.go + @cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} go build -o fixc main.go do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fixc ${STAGEDIR}${PREFIX}/bin Modified: head/misc/exercism/Makefile ============================================================================== --- head/misc/exercism/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/misc/exercism/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -25,7 +25,7 @@ post-patch: do-build: @(cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ - ${SETENV} GO15VENDOREXPERIMENT=1 GOPATH=${WRKSRC} go build -o bin/exercism exercism/main.go) + ${SETENV} ${MAKE_ENV} GO15VENDOREXPERIMENT=1 GOPATH=${WRKSRC} go build -o bin/exercism exercism/main.go) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/bin/exercism ${STAGEDIR}${PREFIX}/bin Modified: head/net-mgmt/intel-snap/Makefile ============================================================================== --- head/net-mgmt/intel-snap/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net-mgmt/intel-snap/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -50,13 +50,13 @@ PLIST_FILES= bin/snapctl bin/snapd do-build: ( cd ${WRKSRC}; ${LN} -s ${WRKSRC} ${WRKSRC}/src/github.com/intelsdi-x/snap ) ( cd ${WRKSRC}/src/github.com/appc/spec; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} CC=clang \ + ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ go build -o bin/actool github.com/appc/spec/actool ) ( cd ${WRKSRC}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} CC=clang \ + ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ go build ${BUILD_FLAGS} -o bin/snapd ) ( cd ${WRKSRC}/cmd/snapctl; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} CC=clang \ + ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ go build ${BUILD_FLAGS} -o bin/snapctl ) do-install: Modified: head/net-mgmt/kapacitor/Makefile ============================================================================== --- head/net-mgmt/kapacitor/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net-mgmt/kapacitor/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -51,8 +51,8 @@ post-patch: do-build: @cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} \ - && ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME} \ - && ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME}d + && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME} \ + && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME}d do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/net-mgmt/telegraf/Makefile ============================================================================== --- head/net-mgmt/telegraf/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net-mgmt/telegraf/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -126,7 +126,7 @@ post-patch: do-build: @cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} && \ - ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./... + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./... do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/net/goreplay/Makefile ============================================================================== --- head/net/goreplay/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net/goreplay/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -25,7 +25,7 @@ GH_SUBDIR= src/github.com/buger/goreplay PLIST_FILES= bin/${PORTNAME} do-build: - @cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} GOPATH=${WRKSRC} go build + @cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/goreplay \ Modified: head/net/syncthing-cli/Makefile ============================================================================== --- head/net/syncthing-cli/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net/syncthing-cli/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -17,7 +17,7 @@ GH_TAGNAME= 9594d39 PLIST_FILES= bin/syncthing-cli do-build: - @cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC}/Godeps/_workspace:${WRKSRC} go build + @cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}/Godeps/_workspace:${WRKSRC} go build @${MV} ${WRKSRC}/syncthing-cli-${GH_TAGNAME} ${WRKSRC}/syncthing-cli do-install: Modified: head/net/syncthing-discosrv/Makefile ============================================================================== --- head/net/syncthing-discosrv/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net/syncthing-discosrv/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -30,7 +30,7 @@ post-patch: do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ - ${SETENV} GOPATH=${WRKSRC} go build + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build @${MV} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/discosrv ${WRKSRC}/syncthing-discosrv do-install: Modified: head/net/syncthing-inotify/Makefile ============================================================================== --- head/net/syncthing-inotify/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net/syncthing-inotify/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -16,7 +16,7 @@ GH_SUBDIR= src/github.com/syncthing/syncthing-inotify PLIST_FILES= bin/syncthing-inotify do-build: - @cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build + @cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/syncthing-inotify ${STAGEDIR}${PREFIX}/bin/ Modified: head/net/syncthing/Makefile ============================================================================== --- head/net/syncthing/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/net/syncthing/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -22,7 +22,7 @@ GROUPS= syncthing do-build: @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; \ - ${SETENV} go run build.go -no-upgrade=true -version v${PORTVERSION} + ${SETENV} ${MAKE_ENV} go run build.go -no-upgrade=true -version v${PORTVERSION} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/syncthing \ Modified: head/print/cups-connector/Makefile ============================================================================== --- head/print/cups-connector/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/print/cups-connector/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -37,7 +37,7 @@ post-patch: do-build: .for bin in ${BIN_FILES} @cd ${WRKSRC}/src/github.com/google/cups-connector; ${SETENV} \ - ${BUILD_ENV} GOPATH=${WRKSRC} go build -o \ + ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o \ ${WRKSRC}/bin/${bin} ./${bin} .endfor Modified: head/security/sops/Makefile ============================================================================== --- head/security/sops/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/security/sops/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -23,7 +23,7 @@ PORTDOCS= README.rst CHANGELOG.rst do-build: @cd ${WRKSRC}/${GH_SUBDIR} && \ - ${SETENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} ./cmd/sops + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} ./cmd/sops do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/security/vault/Makefile ============================================================================== --- head/security/vault/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/security/vault/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -27,7 +27,7 @@ PLIST_FILES= bin/${PORTNAME} do-build: @cd ${WRKSRC}; \ - ${SETENV} ${BUILD_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ go build \ -ldflags "\ -X github.com/hashicorp/vault/version.Version=${PORTVERSION} \ Modified: head/sysutils/amazon-ssm-agent/Makefile ============================================================================== --- head/sysutils/amazon-ssm-agent/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/sysutils/amazon-ssm-agent/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -26,7 +26,7 @@ USE_RC_SUBR= amazon-ssm-agent do-build: @cd ${WRKSRC}; \ - ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ go build -ldflags "-s -w" -o amazon-ssm-agent \ agent/agent.go agent/agent_unix.go agent/agent_parser.go Modified: head/sysutils/circonus-agent/Makefile ============================================================================== --- head/sysutils/circonus-agent/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/sysutils/circonus-agent/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -51,7 +51,7 @@ PLIST_FILES= bin/circonus-agentd "@dir ${ETCDIR}" do-build: ( cd ${WRKSRC}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ go build ${BUILD_FLAGS} -o bin/circonus-agentd ) do-install: Modified: head/sysutils/consul/Makefile ============================================================================== --- head/sysutils/consul/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/sysutils/consul/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -29,7 +29,7 @@ post-extract: @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ do-build: - @cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ + @cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ -ldflags "\ -X github.com/hashicorp/consul/version.Version=${PORTVERSION} \ -X github.com/hashicorp/consul/version.VersionPrerelease= \ Modified: head/sysutils/consul_exporter/Makefile ============================================================================== --- head/sysutils/consul_exporter/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/sysutils/consul_exporter/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -26,7 +26,7 @@ post-extract: @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ do-build: - @cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ + @cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ -ldflags "\ -X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION} \ -X github.com/prometheus/consul_exporter/version.VersionPrerelease= \ Modified: head/sysutils/envconsul/Makefile ============================================================================== --- head/sysutils/envconsul/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/sysutils/envconsul/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -30,7 +30,7 @@ GO_LDFLAGS= -ldflags="-s -w \ do-build: @cd ${WRKSRC}/src/github.com/hashicorp/envconsul; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ go build ${GO_LDFLAGS}\ -o bin/envconsul Modified: head/sysutils/serf/Makefile ============================================================================== --- head/sysutils/serf/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/sysutils/serf/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -27,7 +27,7 @@ PLIST_FILES= bin/serf do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \ - ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor/ \ + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor/ \ go build -o bin/${PORTNAME} ./cmd/serf/ do-install: Modified: head/textproc/consul-template/Makefile ============================================================================== --- head/textproc/consul-template/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/textproc/consul-template/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -24,7 +24,7 @@ USE_RC_SUBR= consul-template do-build: @cd ${WRKSRC}/src/github.com/hashicorp/consul-template ; \ - ${SETENV} GOPATH=${WRKSRC} go build + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build do-install: ${INSTALL_PROGRAM} \ Modified: head/textproc/spiff/Makefile ============================================================================== --- head/textproc/spiff/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/textproc/spiff/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -30,7 +30,7 @@ post-patch: do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ - ${SETENV} GOPATH=${WRKSRC} go build spiff.go + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build spiff.go do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${PORTNAME} \ Modified: head/www/gobuffalo/Makefile ============================================================================== --- head/www/gobuffalo/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/www/gobuffalo/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -82,7 +82,7 @@ GH_SUBDIR= src/github.com/gobuffalo/buffalo PLIST_FILES= bin/buffalo do-build: - @cd ${WRKSRC}/${GH_SUBDIR}/buffalo ; ${SETENV} GOPATH=${WRKSRC} go build + @cd ${WRKSRC}/${GH_SUBDIR}/buffalo ; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build post-build: @${STRIP_CMD} ${WRKSRC}/${GH_SUBDIR}/buffalo/buffalo Modified: head/www/grafana2/Makefile ============================================================================== --- head/www/grafana2/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/www/grafana2/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -81,8 +81,8 @@ post-extract: ${RM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/public/app/._.DS_Store do-build: - cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go run build.go build + @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}; \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go run build.go build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/grafana-server \ Modified: head/www/grafana3/Makefile ============================================================================== --- head/www/grafana3/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/www/grafana3/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -116,7 +116,7 @@ post-extract: do-build: cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go run build.go build + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go run build.go build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \ Modified: head/www/mattermost-server/Makefile ============================================================================== --- head/www/mattermost-server/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/www/mattermost-server/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -43,7 +43,7 @@ pre-build: do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \ - ${SETENV} GOPATH=${WRKSRC} go install -ldflags="${GO_LDFLAGS}" ./... + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags="${GO_LDFLAGS}" ./... do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/platform ${STAGEDIR}${PREFIX}/bin/mattermostd Modified: head/www/minio-client/Makefile ============================================================================== --- head/www/minio-client/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/www/minio-client/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -35,7 +35,7 @@ PLIST_FILES= bin/${MC} do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ -ldflags "-X main.GitDescribe=v${PORTVERSION}" -o bin/${MC} do-install: Modified: head/www/minio/Makefile ============================================================================== --- head/www/minio/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/www/minio/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -30,7 +30,7 @@ SUB_LIST= USER="${USERS}" \ do-build: @cd ${WRKSRC}/${GH_SUBDIR} ; \ - ${SETENV} GOPATH=${WRKSRC} CGO_ENABLED=0 go build \ + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} CGO_ENABLED=0 go build \ --ldflags '-X github.com/minio/minio/cmd.Version=${GH_TAGNAME:C/RELEASE\.//:C|(..)-(..)-(..)Z|\1:\2:\3Z|} -X github.com/minio/minio/cmd.ReleaseTag=${GH_TAGNAME} -X github.com/minio/minio/cmd.CommitID=${COMMIT_ID} -X github.com/minio/minio/cmd.GOPATH=${WRKSRC} -s -w' -o ${WRKSRC}/bin/minio do-install: Modified: head/www/uchiwa/Makefile ============================================================================== --- head/www/uchiwa/Makefile Wed Mar 7 04:35:32 2018 (r463775) +++ head/www/uchiwa/Makefile Wed Mar 7 08:06:24 2018 (r463776) @@ -56,7 +56,7 @@ post-extract: .endfor do-build: - @cd ${WRKSRC}/src/github.com/sensu && ${SETENV} GOPATH=${WRKSRC} go install ./... + @cd ${WRKSRC}/src/github.com/sensu && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./... do-install: ${MKDIR} ${STAGEDIR}${UCHIWA_LOGDIR} \