Date: Fri, 16 Apr 2021 21:19:22 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b77a05bb44c2 - main - Mk/Uses/go.mk: Allow ports to have additional distfiles Message-ID: <202104162119.13GLJMFd007620@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b77a05bb44c206268971d14beb92fb9cf1d28842 commit b77a05bb44c206268971d14beb92fb9cf1d28842 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-04-16 21:17:36 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104162119.13GLJMFd007620>