Date: Sun, 4 Mar 2018 23:14:00 +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: r463611 - in head: devel/go-bindata devel/gogs misc/cryptoballot net-mgmt/prometheus1 net/rclone security/honeybadger security/obfs4proxy-tor sysutils/epazote www/go-appengine-sdk www/g... Message-ID: <201803042314.w24NE0xO039615@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sun Mar 4 23:14:00 2018 New Revision: 463611 URL: https://svnweb.freebsd.org/changeset/ports/463611 Log: Made 10 Go ports respect MAKE_ENV. This is expected to unbreak them. Ports: www/go-appengine-sdk devel/go-bindata devel/gogs net/rclone security/obfs4proxy-tor misc/cryptoballot www/grafana4 sysutils/epazote net-mgmt/prometheus1 security/honeybadger While here, corrected PYTHON_CMD in www/go-appengine-sdk/Makefile. Approved by: tcberner (mentor, implicit) Approved by: portmgr (port compliance, infrastructure) Modified: head/devel/go-bindata/Makefile head/devel/gogs/Makefile head/misc/cryptoballot/Makefile head/net-mgmt/prometheus1/Makefile head/net/rclone/Makefile head/security/honeybadger/Makefile head/security/obfs4proxy-tor/Makefile head/sysutils/epazote/Makefile head/www/go-appengine-sdk/Makefile head/www/grafana4/Makefile Modified: head/devel/go-bindata/Makefile ============================================================================== --- head/devel/go-bindata/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/devel/go-bindata/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DOCS do-build: cd ${WRKSRC} ; \ - ${SETENV} GOPATH=${WRKSRC} go build -o bin/go-bindata ./go-bindata/ + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o bin/go-bindata ./go-bindata/ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \ Modified: head/devel/gogs/Makefile ============================================================================== --- head/devel/gogs/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/devel/gogs/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -56,7 +56,7 @@ post-patch: do-build: @(cd ${WRKSRC}/${GH_SUBDIR} && \ - ${SETENV} GOPATH=${WRKSRC} go build -tags "sqlite pam cert" -p ${MAKE_JOBS_NUMBER} -o ${PORTNAME}) + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -tags "sqlite pam cert" -p ${MAKE_JOBS_NUMBER} -o ${PORTNAME}) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} Modified: head/misc/cryptoballot/Makefile ============================================================================== --- head/misc/cryptoballot/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/misc/cryptoballot/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -36,7 +36,7 @@ PLIST_FILES= ${PROGS:C/.*\//bin\//} do-build: .for p in ${PROGS} @cd ${WRKSRC}/${GH_SUBDIR}/${p}/ && \ - ${SETENV} GOPATH=${WRKSRC} go build -o ${p:C/.*\///} + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${p:C/.*\///} .endfor do-install: Modified: head/net-mgmt/prometheus1/Makefile ============================================================================== --- head/net-mgmt/prometheus1/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/net-mgmt/prometheus1/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -34,10 +34,10 @@ LD_FLAG_STRING= -s \ do-build: ( cd ${GO_WRKSRC}/cmd/prometheus ; \ - ${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) + ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) ( cd ${GO_WRKSRC}/cmd/promtool ; \ - ${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) + ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin Modified: head/net/rclone/Makefile ============================================================================== --- head/net/rclone/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/net/rclone/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -42,7 +42,7 @@ GH_TUPLE+= \ PLIST_FILES= bin/rclone do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build . + @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build . do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/security/honeybadger/Makefile ============================================================================== --- head/security/honeybadger/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/security/honeybadger/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -31,7 +31,7 @@ LICENSE= GPLv3 do-build: .for bin in ${BIN_FILES} - cd ${WRKSRC}/src/github.com/david415/HoneyBadger/cmd/${bin}; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build + cd ${WRKSRC}/src/github.com/david415/HoneyBadger/cmd/${bin}; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build .endfor do-install: Modified: head/security/obfs4proxy-tor/Makefile ============================================================================== --- head/security/obfs4proxy-tor/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/security/obfs4proxy-tor/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -34,7 +34,7 @@ PLIST_FILES= bin/obfs4proxy \ do-build: @${RLN} ${WRKSRC} ${WRKSRC}/obfs4proxy/src/git.torproject.org/pluggable-transports/obfs4.git @cd ${WRKSRC}/obfs4proxy && \ - ${SETENV} GOPATH=${WRKSRC}/obfs4proxy go build + ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}/obfs4proxy go build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/obfs4proxy/obfs4proxy ${STAGEDIR}${PREFIX}/bin Modified: head/sysutils/epazote/Makefile ============================================================================== --- head/sysutils/epazote/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/sysutils/epazote/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -23,7 +23,7 @@ PLIST_FILES= bin/epazote 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 \ "-X main.version=${PORTVERSION}" -o epazote cmd/epazote/main.go; do-install: Modified: head/www/go-appengine-sdk/Makefile ============================================================================== --- head/www/go-appengine-sdk/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/www/go-appengine-sdk/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -54,6 +54,7 @@ PORTEXAMPLES= * do-build: @for R in ${GAEGOROOTS}; do \ (cd ${WRKSRC}/$${R}/src && \ + ${SETENV} ${MAKE_ENV} \ GOROOT_BOOTSTRAP=${LOCALBASE}/go \ GOOS=${OPSYS:tl} GOARCH=${GOARCH} \ GO386=${GO386} \ @@ -67,7 +68,7 @@ do-build: @cd ${WRKSRC} && \ for S in ${GAESCRIPTS} goapp; do \ ${ECHO} "#!/bin/sh" >> $${S%.py}-go; \ - ${ECHO} "${LOCALBASE}/bin/python2.7 ${DATADIR}/$${S} \$$*" >> $${S%.py}-go; \ + ${ECHO} "${PYTHON_CMD} ${DATADIR}/$${S} \$$*" >> $${S%.py}-go; \ done do-install: Modified: head/www/grafana4/Makefile ============================================================================== --- head/www/grafana4/Makefile Sun Mar 4 23:00:47 2018 (r463610) +++ head/www/grafana4/Makefile Sun Mar 4 23:14:00 2018 (r463611) @@ -56,8 +56,8 @@ post-extract: @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public) do-build: - @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server - @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli + @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server + @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803042314.w24NE0xO039615>