From owner-svn-ports-head@freebsd.org Sun Mar 8 13:30:33 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF109269869; Sun, 8 Mar 2020 13:30:33 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48b2Kj43WJz4Qyr; Sun, 8 Mar 2020 13:30:33 +0000 (UTC) (envelope-from dmgk@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 64E29227DE; Sun, 8 Mar 2020 13:30:33 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 028DUXOn025472; Sun, 8 Mar 2020 13:30:33 GMT (envelope-from dmgk@FreeBSD.org) Received: (from dmgk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 028DUXYo025471; Sun, 8 Mar 2020 13:30:33 GMT (envelope-from dmgk@FreeBSD.org) Message-Id: <202003081330.028DUXYo025471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dmgk set sender to dmgk@FreeBSD.org using -f From: Dmitri Goutnik Date: Sun, 8 Mar 2020 13:30:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528031 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: dmgk X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 528031 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.29 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: Sun, 08 Mar 2020 13:30:33 -0000 Author: dmgk Date: Sun Mar 8 13:30:32 2020 New Revision: 528031 URL: https://svnweb.freebsd.org/changeset/ports/528031 Log: Mk/Uses/go.mk: Add the gomod-vendor-diff target Add the 'gomod-vendor-diff' target that tells the user what changes are needed in GH_TUPLE. This is in addition to the existing 'gomod-vendor' target that shows the user the whole new GH_TUPLE. PR: 244660 Submitted by: yuri Modified: head/Mk/Uses/go.mk Modified: head/Mk/Uses/go.mk ============================================================================== --- head/Mk/Uses/go.mk Sun Mar 8 12:24:16 2020 (r528030) +++ head/Mk/Uses/go.mk Sun Mar 8 13:30:32 2020 (r528031) @@ -176,17 +176,23 @@ do-test: .if ${go_ARGS:Mmodules} _MODULES2TUPLE_CMD= modules2tuple -gomod-vendor: patch - @if type ${GO_CMD} > /dev/null 2>&1; then \ - if type ${_MODULES2TUPLE_CMD} > /dev/null 2>&1; then \ - cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${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 \"${GO_PORT}\""; \ +gomod-vendor-deps: + @if ! type ${GO_CMD} > /dev/null 2>&1; then \ + ${ECHO_MSG} "===> Please install \"${GO_PORT}\""; exit 1; \ + fi; \ + if ! type ${_MODULES2TUPLE_CMD} > /dev/null 2>&1; then \ + ${ECHO_MSG} "===> Please install \"ports-mgmt/modules2tuple\""; exit 1; \ fi + +gomod-vendor: gomod-vendor-deps patch + @cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \ + [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt + +gomod-vendor-diff: gomod-vendor-deps patch + @cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \ + [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${GREP} -v "^GH_TUPLE=" | ${SED} 's| \\$$||' > ${WRKDIR}/GH_TUPLE-new.txt && \ + echo ${GH_TUPLE} | ${TR} -s " " "\n" | ${SED} "s|^| |" > ${WRKDIR}/GH_TUPLE-old.txt && \ + ${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt || exit 0 .endif .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK)