From owner-dev-commits-ports-all@freebsd.org Fri Apr 16 21:19:22 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 658605E119A; Fri, 16 Apr 2021 21:19:22 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FMTcB2Q4Yz4s6d; Fri, 16 Apr 2021 21:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45EA53F8F; Fri, 16 Apr 2021 21:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13GLJMZO007621; Fri, 16 Apr 2021 21:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13GLJMFd007620; Fri, 16 Apr 2021 21:19:22 GMT (envelope-from git) Date: Fri, 16 Apr 2021 21:19:22 GMT Message-Id: <202104162119.13GLJMFd007620@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b77a05bb44c2 - main - Mk/Uses/go.mk: Allow ports to have additional distfiles MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b77a05bb44c206268971d14beb92fb9cf1d28842 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 21:19:22 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b77a05bb44c206268971d14beb92fb9cf1d28842 commit b77a05bb44c206268971d14beb92fb9cf1d28842 Author: Yuri Victorovich AuthorDate: 2021-04-16 21:17:36 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-16 21:19:20 +0000 Mk/Uses/go.mk: Allow ports to have additional distfiles Some ports need to perform extra build steps for which they need additional distfiles. This commit makes go.mk to preserve MASTER_SITES,DISTFILES,EXTRACT_ONLY set by port's Makefile. PR: 255085 Approved by: dmgk (maintainer) --- Mk/Uses/go.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index 9248216f4a26..9b1e5454bbf5 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -124,9 +124,9 @@ GO_MODVERSION= ${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\2/:M@*:S/^@//:S/^$/${DISTVERSI GO_MODFILE= ${GO_MODVERSION}.mod GO_DISTFILE= ${GO_MODVERSION}.zip DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} -MASTER_SITES= ${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/ -DISTFILES= ${GO_MODFILE} ${GO_DISTFILE} -EXTRACT_ONLY= ${GO_DISTFILE} +MASTER_SITES+= ${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/ +DISTFILES+= ${GO_MODFILE} ${GO_DISTFILE} +EXTRACT_ONLY+= ${GO_DISTFILE} WRKSRC= ${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION} FETCH_DEPENDS+= ${GO_CMD}:${GO_PORT} \ ca_root_nss>0:security/ca_root_nss