Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jul 2024 06:56:46 GMT
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 4a2d7641f38c - 2024Q3 - textproc/gitlab-elasticsearch-indexer: use new feature from go.mk to download go.mod from gitlab
Message-ID:  <202407210656.46L6ukDk069111@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4a2d7641f38ca1cd29c37fa3cdc355643345a13c

commit 4a2d7641f38ca1cd29c37fa3cdc355643345a13c
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-07-03 09:23:53 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-07-21 05:39:13 +0000

    textproc/gitlab-elasticsearch-indexer: use new feature from go.mk to download go.mod from gitlab
    
    (cherry picked from commit ec690fc8dac6ac59f9ca3b5bfb36873453012ae3)
---
 textproc/gitlab-elasticsearch-indexer/Makefile | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index ebbe675a7a0a..ffb95d022ee3 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -20,29 +20,13 @@ USES=		gmake go:modules,no_targets,1.22 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
+GO_MOD_DIST=	gitlab
+GO_MODULE=	gitlab.com/gitlab-org/gitlab-elasticsearch-indexer
 
 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/gitlab-elasticsearch-indexer/-/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)
-# ---------------------------
-
 PLIST_FILES=	bin/${PORTNAME}
 
 # add a git tag, as that is required by the build script



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407210656.46L6ukDk069111>