From nobody Thu Jul 11 13:37:03 2024 X-Original-To: dev-commits-ports-main@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 4WKbPC2vgyz5QgBZ; Thu, 11 Jul 2024 13:37:03 +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 4WKbPC1qRFz4smj; Thu, 11 Jul 2024 13:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720705023; 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=gI/pDaeMYH6DcQexbeojVG0jkLYQ4M8G9HP2zsHDB2Y=; b=f+Wo8nEYTL+XZUY9fcn2m+bNXBHgnNiFWrQ/lnvzVcNIyumWQKWsYUVpRysJWV1lL2DHhd mxgPQHkvI6czjKRT1YDkeCr9aeD2Lq/cfM9Oq7rHnFrtQ5e8WRtN4FjrqhIgGOqUt/mRjT 6z9sN/WqJO8Ogq4sl8agx83sAEkOX3wG5GJPicMqzNvGhtSwERkCxpHIbA7ONjVEHdLfeN /Or2DfK+pRm1wrouxCxNZXs/Ri7NRldcbzm/X3EckZi3t8B5hrZuQenj4nuQpixxtnpJ/q frGgmKMOk63DtBTn6x/NRBHNWwSpzqU+bPLYoZ4S97nbDp0vLjLJYmbBLOsZxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720705023; a=rsa-sha256; cv=none; b=OkwwsyXjDib3XY6Y2ptllF/1FpbHZKI1HnVOF3eaLiKjoUZlMiv9hTdA/y2Sc5xtvstXJW 7rSswkKWgx51EwpKbqxpK1lnFiUOhtTTclFK2TanaKo5khl38AIkPx25mO8VgeWsmwaBFi H/hMsWJGhEcZ/Dbg5dAUdWSS15L25TOGTBf7b93Zz5jaby+eamqLz2X9pqy7t25osLGBqx 92r7qM8Ib5KnpZEvo7BNiDzpgxEe9wljHoE1NEfKWLEa+Ypo0dDiKTLmZIn4r1T4lCErtV Iw+0KOTmcpUAEtKoGI5ZbYa0HqwmREJ0wZ/g+3nUKDagUEpUa2amaAzzckTlcQ== 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=1720705023; 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=gI/pDaeMYH6DcQexbeojVG0jkLYQ4M8G9HP2zsHDB2Y=; b=NbynRJZ/n1miDF8h3XAD3modFgnBIcsODS5JymPLCKSbnnODRW1Xvj4U4zEwIqRrAX3gg1 IJJbEyEYS3EhhZHw/C/1BJ3DlnyPGlIqNrVnOL9VBXZl+IhKVBbszTfVE769RcMzdn+I69 h/kGiWMTeBszwHMNcCBPgOoYdkYMTqBYVLRtyVFO2KJhPWh2BXeZ3/vX4kyM7ogN0Zzg+K gEAKrrmnDL24iPMAsUSdAwdxR52KmjlCf5FI8TnpPMnqCalPfKOw4iWffU3eHkltLiNYeb CeX3yiTeYDjUId0yo+PbFk5tXcA4BVFi1UbFWUdN9HvEgrt+JNd4lvn/ZxJ+CQ== 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 4WKbPC1RL3z12Yh; Thu, 11 Jul 2024 13:37:03 +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 46BDb3ZI062887; Thu, 11 Jul 2024 13:37:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46BDb3qs062884; Thu, 11 Jul 2024 13:37:03 GMT (envelope-from git) Date: Thu, 11 Jul 2024 13:37:03 GMT Message-Id: <202407111337.46BDb3qs062884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 235662c48e66 - main - devel/gitaly: use new feature from go.mk to download go.mod from gitlab List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 235662c48e66534de2a9db7e9c924e172ae26d04 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=235662c48e66534de2a9db7e9c924e172ae26d04 commit 235662c48e66534de2a9db7e9c924e172ae26d04 Author: Matthias Fechner AuthorDate: 2024-06-19 09:23:03 +0000 Commit: Matthias Fechner CommitDate: 2024-07-11 13:36:42 +0000 devel/gitaly: use new feature from go.mk to download go.mod from gitlab --- 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