Date: Sun, 18 Mar 2018 03:55:14 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464866 - in head: audio/pms-devel benchmarks/bombardier net-mgmt/alertmanager net-mgmt/prometheus2 net-mgmt/pushgateway net/nsq security/ssh-vault sysutils/consul-alerts sysutils/docke... Message-ID: <201803180355.w2I3tECq080882@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sun Mar 18 03:55:13 2018 New Revision: 464866 URL: https://svnweb.freebsd.org/changeset/ports/464866 Log: Made 14 Go ports respect MAKE_ENV. This is expected to unbreak them. Ports: www/fabio benchmarks/bombardier www/go-www net-mgmt/prometheus2 sysutils/immortal sysutils/docker-freebsd audio/pms-devel sysutils/consul-alerts net-mgmt/pushgateway net/nsq textproc/jid net-mgmt/alertmanager sysutils/nomad security/ssh-vault Approved by: portmgr (port compliance, infrastructure) Modified: head/audio/pms-devel/Makefile head/benchmarks/bombardier/Makefile head/net-mgmt/alertmanager/Makefile head/net-mgmt/prometheus2/Makefile head/net-mgmt/pushgateway/Makefile head/net/nsq/Makefile head/security/ssh-vault/Makefile head/sysutils/consul-alerts/Makefile head/sysutils/docker-freebsd/Makefile head/sysutils/immortal/Makefile head/sysutils/nomad/Makefile head/textproc/jid/Makefile head/www/fabio/Makefile head/www/go-www/Makefile Modified: head/audio/pms-devel/Makefile ============================================================================== --- head/audio/pms-devel/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/audio/pms-devel/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -45,7 +45,7 @@ post-extract: do-build: @cd ${WRKSRC}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.buildVersion=${DISTVERSION}" + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.buildVersion=${DISTVERSION}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pms-${GH_TAGNAME} ${STAGEDIR}${PREFIX}/bin/${GO_PKGNAME} Modified: head/benchmarks/bombardier/Makefile ============================================================================== --- head/benchmarks/bombardier/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/benchmarks/bombardier/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -20,7 +20,7 @@ PLIST_FILES= bin/${PORTNAME} do-build: cd ${WRKSRC}; \ ${LN} -s vendor src; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.version=${PORTVERSION}" . + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.version=${PORTVERSION}" . do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/net-mgmt/alertmanager/Makefile ============================================================================== --- head/net-mgmt/alertmanager/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/net-mgmt/alertmanager/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -23,8 +23,8 @@ USERS= alertmanager GROUPS= alertmanager do-build: - @cd ${GO_WRKSRC}/cmd/alertmanager && ${SETENV} ${GO_ENV} go install - @cd ${GO_WRKSRC}/cmd/amtool && ${SETENV} ${GO_ENV} go install + @cd ${GO_WRKSRC}/cmd/alertmanager && ${SETENV} ${MAKE_ENV} ${GO_ENV} go install + @cd ${GO_WRKSRC}/cmd/amtool && ${SETENV} ${MAKE_ENV} ${GO_ENV} go install do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/alertmanager ${STAGEDIR}${PREFIX}/bin Modified: head/net-mgmt/prometheus2/Makefile ============================================================================== --- head/net-mgmt/prometheus2/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/net-mgmt/prometheus2/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -36,7 +36,7 @@ PROMETHEUS_BINARIES= prometheus promtool do-build: .for bin in ${PROMETHEUS_BINARIES} ( cd ${GO_WRKSRC}/cmd/${bin} ; \ - ${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) + ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) .endfor do-install: Modified: head/net-mgmt/pushgateway/Makefile ============================================================================== --- head/net-mgmt/pushgateway/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/net-mgmt/pushgateway/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -24,7 +24,7 @@ USERS= prometheus GROUPS= prometheus do-build: - (cd ${GO_WRKSRC} ; ${SETENV} ${GO_ENV} go install) + @(cd ${GO_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} go install) do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/pushgateway ${STAGEDIR}${PREFIX}/bin Modified: head/net/nsq/Makefile ============================================================================== --- head/net/nsq/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/net/nsq/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -42,7 +42,7 @@ TARGETS= nsqd nsqlookupd nsqadmin nsq_pubsub nsq_to_ns .for _t in ${TARGETS} build-${_t}: cd ${GO_WRKSRC}/apps/${_t}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${_t} install-${_t}: ${INSTALL_PROGRAM} ${GO_WRKSRC}/apps/${_t}/bin/${_t} \ Modified: head/security/ssh-vault/Makefile ============================================================================== --- head/security/ssh-vault/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/security/ssh-vault/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -28,7 +28,7 @@ post-patch: do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.version=${PORTVERSION}" -o ssh-vault cmd/ssh-vault/main.go; do-install: Modified: head/sysutils/consul-alerts/Makefile ============================================================================== --- head/sysutils/consul-alerts/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/sysutils/consul-alerts/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -27,7 +27,7 @@ USE_RC_SUBR= ${PORTNAME} do-build: cd ${GO_WRKSRC} && \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${PORTNAME} do-install: Modified: head/sysutils/docker-freebsd/Makefile ============================================================================== --- head/sysutils/docker-freebsd/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/sysutils/docker-freebsd/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -28,7 +28,7 @@ PLIST_FILES= bin/docker USE_RC_SUBR= docker do-build: - @cd ${WRKSRC} && export AUTO_GOPATH=1 && export DOCKER_GITCOMMIT=${GH_TAGNAME} && ./hack/make.sh binary + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} AUTO_GOPATH=1 DOCKER_GITCOMMIT=${GH_TAGNAME} ./hack/make.sh binary do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin Modified: head/sysutils/immortal/Makefile ============================================================================== --- head/sysutils/immortal/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/sysutils/immortal/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -24,13 +24,13 @@ GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.version=${PORTVERSION}" -o immortal cmd/immortal/main.go; @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.version=${PORTVERSION}" -o immortalctl cmd/immortalctl/main.go; @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.version=${PORTVERSION}" -o immortaldir cmd/immortaldir/main.go; do-install: Modified: head/sysutils/nomad/Makefile ============================================================================== --- head/sysutils/nomad/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/sysutils/nomad/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -27,7 +27,7 @@ GROUPS= nomad do-build: @cd ${WRKSRC}/src/github.com/hashicorp/nomad && \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/nomad do-install: Modified: head/textproc/jid/Makefile ============================================================================== --- head/textproc/jid/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/textproc/jid/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -27,6 +27,6 @@ PLIST_FILES= bin/jid do-build: @(cd ${WRKSRC}; \ - ${SETENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${GO_WRKDIR_BIN}/jid cmd/jid/jid.go) + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${GO_WRKDIR_BIN}/jid cmd/jid/jid.go) .include <bsd.port.mk> Modified: head/www/fabio/Makefile ============================================================================== --- head/www/fabio/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/www/fabio/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -21,7 +21,7 @@ USE_RC_SUBR= fabio do-build: @cd ${WRKSRC}/src/github.com/fabiolb/fabio; \ - ${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/fabio do-install: Modified: head/www/go-www/Makefile ============================================================================== --- head/www/go-www/Makefile Sun Mar 18 03:54:15 2018 (r464865) +++ head/www/go-www/Makefile Sun Mar 18 03:55:13 2018 (r464866) @@ -27,7 +27,7 @@ post-patch: do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w" -o www; do-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803180355.w2I3tECq080882>