From nobody Sun Jul 21 06:56:42 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WRZ2f6pfpz5QtLl; Sun, 21 Jul 2024 06:56:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRZ2f6KVbz4Yc1; Sun, 21 Jul 2024 06:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721545002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMAVA8ImBoRzSmizvXTdR+pgCX1KX+DgqgMNzu5BYSY=; b=KgkGcM5CdriDaPsJWHNLpbb/nXC1uZAryofsIUsm1Y40sKzl+2bvdxYkmjY5Z3qHucu+5S hM0tOggnP34GRiUZWu1VM9YeKU+XHjZqhhUxYEUvtGtKDIPon6pPjopc53FJQSYwQWqsSA ul3LmLEo6BkX9/BwN7yyv+rs/DZHj0tdu3DlTmCCFODZy+qhcYzNeOiRyPRlqoGYkL/Mld AfXdqXDFUdhBussN/vQITfjmifZdJ83kmmJWm2cNo0qnfNZf9C8OrV7c3g0SsUkwpxmigo /cSrzrdvInXoqsGy9DP3C/bGEh8xj1JXLYTOkezTd30Z0jdcR7REiIFh+dEijg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721545002; a=rsa-sha256; cv=none; b=EibQ/Xhi7ljDFaavOVpw2lMMoGiZz9VJYsYZOXTzv+Q3t01Sl4P+c7/0xbXssZzJ5KS9GM h7ALW79Po6wbKScjwV1jKOlRGNXAjFypbOyA+7112p64Lbaqnkxdo4f0WozSpLCrFIycp3 0Nj+Y+yB+Aif87oOk39oj4DoE7KEKW/5Pjdkr6BK4t/OSshAY+1FWfbRFTys2Wrmys7YoU yPD47JpsK2+nkjFMnpu3s2Lbw/zVjiv2hGSfN7eFl/JZtJ7S14PVF24NdK9nrq28zfQqPe Y6dpyAt2zKH22AwlSCv9vCPFvCwaKmB9f+CfcdCNGEpT1RJIWTfjtXXIzb3kVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721545002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMAVA8ImBoRzSmizvXTdR+pgCX1KX+DgqgMNzu5BYSY=; b=u4Xy1tmy1J5CRLmGqYZF5I/lvtkquY47ypmbgIegN6iNC7hjztEW3gv6NwAZWbhm35ThVg zT8vOgOradR84mG2H6f4KPhM48WtUldtIkSZOq84bL5USdyOB/hrg+oLPI30JK4E/LgwSy ALIkvcqwnCui66XXC1x7fPrSSWoQ3b5HgrPHsHTo6Szjd5w63HnECEhcqFkL3w8YXFuONX hazbcMFD3//Zy9PA3XAS2Jqc72JJURl5EI/4Fe7jl9783Mx+q1fWDnzgbXShvYbn8TKu88 TAPEsm0wniMMrrtVo/3Fr9KEO013piYyhzgdKJF0ZQVPOKs+7rbUdj6sem2MCg== 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 4WRZ2f4y9vzq4N; Sun, 21 Jul 2024 06:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46L6ugsa068926; Sun, 21 Jul 2024 06:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46L6ugaf068923; Sun, 21 Jul 2024 06:56:42 GMT (envelope-from git) Date: Sun, 21 Jul 2024 06:56:42 GMT Message-Id: <202407210656.46L6ugaf068923@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 5f2443c474fc - 2024Q3 - devel/gitaly: use new feature from go.mk to download go.mod from gitlab List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 5f2443c474fc4983a2f6b7c596296bf7d692929c Auto-Submitted: auto-generated The branch 2024Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f2443c474fc4983a2f6b7c596296bf7d692929c commit 5f2443c474fc4983a2f6b7c596296bf7d692929c Author: Matthias Fechner AuthorDate: 2024-06-19 09:23:03 +0000 Commit: Matthias Fechner CommitDate: 2024-07-21 05:38:45 +0000 devel/gitaly: use new feature from go.mk to download go.mod from gitlab (cherry picked from commit 235662c48e66534de2a9db7e9c924e172ae26d04) --- devel/gitaly/Makefile | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 1a98c0ab91ff..e83df9830150 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -26,29 +26,13 @@ CPE_VENDOR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org +GO_MOD_DIST= gitlab +GO_MODULE= gitlab.com/gitlab-org/gitaly/v16 MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} -# for go dependencies -# Gitlab hosts there dependencies on their own platform and not on go-proxy -# so we download the required go.mod file from gitlab -# lines are taken from go.mk -# --------------------------- -FETCH_DEPENDS= ${GO_CMD}:${GO_PORT} -MASTER_SITES+= https://gitlab.com/gitlab-org/gitaly/-/raw/v${DISTVERSION}/ -DISTFILES+= go.mod -DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} -EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} -_USES_fetch+= 800:go-post-fetch -go-post-fetch: - @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; - @(cd ${DISTDIR}/${DIST_SUBDIR}; \ - [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ - ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) -# --------------------------- - post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample