Date: Wed, 25 Dec 2019 18:10:54 +0000 (UTC) From: Dmitri Goutnik <dmgk@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520881 - head/Mk/Uses Message-ID: <201912251810.xBPIAsMx050193@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dmgk Date: Wed Dec 25 18:10:54 2019 New Revision: 520881 URL: https://svnweb.freebsd.org/changeset/ports/520881 Log: Mk/Uses/go.mk: Warn if Go is not installed for gomod-vendor PR: 242872 Reviewed by: yuri Differential Revision: https://reviews.freebsd.org/D22923 Modified: head/Mk/Uses/go.mk Modified: head/Mk/Uses/go.mk ============================================================================== --- head/Mk/Uses/go.mk Wed Dec 25 17:55:01 2019 (r520880) +++ head/Mk/Uses/go.mk Wed Dec 25 18:10:54 2019 (r520881) @@ -165,11 +165,15 @@ do-install: .if ${go_ARGS:Mmodules} _MODULES2TUPLE_CMD= modules2tuple gomod-vendor: patch - @if type ${_MODULES2TUPLE_CMD} > /dev/null 2>&1; then \ - cd ${WRKSRC}; ${GO_CMD} mod vendor; \ - [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt; \ + @if type ${GO_CMD} > /dev/null 2>&1; then \ + if type ${_MODULES2TUPLE_CMD} > /dev/null 2>&1; then \ + cd ${WRKSRC}; ${GO_CMD} mod vendor; \ + [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt; \ + else \ + ${ECHO_MSG} "===> Please install \"ports-mgmt/modules2tuple\""; \ + fi \ else \ - ${ECHO_MSG} "===> Please install \"ports-mgmt/modules2tuple\""; \ + ${ECHO_MSG} "===> Please install \"${GO_PORT}\""; \ fi .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912251810.xBPIAsMx050193>