From nobody Thu Jul 11 13:37:05 2024 X-Original-To: dev-commits-ports-all@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 4WKbPG0VpZz5QgDW; Thu, 11 Jul 2024 13:37:06 +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 4WKbPF4ckbz4sWK; Thu, 11 Jul 2024 13:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720705025; 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=xrR1psZQkU+wBod8xDK2xH1+4BeKBKj91gSdx6llC3g=; b=HSTw7HpNBMfdgN8zXsrvLl41/JKoyt1w+GIOr2uI1Em/CTVxtki7N348HOhY+IKM8Sdi0w izDxOO2Hjx/nCiR/JuDIrilVUamwXesibgkn9/gBY+OVFLdUCe7Jropkg0SlfrvQ9iF02H XV5oM+cQJ1BIE5k4hi8w3lXZEK+fpPyKQLPZ1mWhWxP3aIxH0OjLq0itXBmqNjoxuXCdMF zJkCa2uL45J09HLK0SQnrXjF6aKAwoAcHQszD158KjdzTcxPoNzFne9jUrGvFL36gN2kLu lrA9j+QZ05iehrvKFIx1ZJGF4SzJWCm4TKbwqYeQJn1/3a4MM3eDeKEbvifrvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720705025; a=rsa-sha256; cv=none; b=BI9fUGtaInHZxyME+4AW2unNMtIK6az+GYfFeZ/eusoPlxUpuhE8dJR8sP397tSsLtQwN+ q93xKcTbHRR2l0k6YcXW1JmOyraOwxr+we9r5obLP0hwXXGirtpfqp67n0+zj3VxYWDUVP bSjF97gRycRn2kQw/IPmTiLEYFq4LeG+x2HJh8L/FQOM/kJwdyIesh7iokWc8wMTNVfebo KeUQWPNTcRiMIUTU/3qkKWcSfBFS3LspweBSInjZHCZ3Y34BkmWrqI3kPiOa2D+U9j3fgw EteiHDYLMQf8qZzjhEWbRDXewwBV+KfKGqvTwZ0rqZ7Q+xF6em7r7i1wX7YqQg== 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=1720705025; 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=xrR1psZQkU+wBod8xDK2xH1+4BeKBKj91gSdx6llC3g=; b=nXPG4o6ciMiWHz6XaC4oiAORU9e80lNr71EwqKZKMbqzz+LFez17QlXQGPhVpreKGhzJB9 3uHGNYksTINauGCJhNSRTJ+A6MaEQ3tE/djn49aLFOBNbHjRXYPs4R1uPAwprlmj1K9VK2 dnzqXCdDg0hcB4E/eSsWp6jWSHwoLP1qYsmA+jZNk7X5PeeyXhMz20Bx2kSBCdpakbWt6X RE/F8vgm5uyYvUQO261z7Unw86MqsgF3LBeXS26avAFoKVWV+Xqpk0deaJ23nop2jNNE2f zGH1TAySQtH6mUPHli4wWn4NUTlgozE1bF6snXIO552qBTFvkgeLnP1LpPhpBg== 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 4WKbPF3cWFz12Sm; Thu, 11 Jul 2024 13:37:05 +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 46BDb5GY063008; Thu, 11 Jul 2024 13:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46BDb5LC063005; Thu, 11 Jul 2024 13:37:05 GMT (envelope-from git) Date: Thu, 11 Jul 2024 13:37:05 GMT Message-Id: <202407111337.46BDb5LC063005@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: f1ff7793f181 - main - devel/gitlab-shell: use new feature from go.mk to download go.mod from gitlab List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: f1ff7793f1812ccc1faf02c62f780514738040b4 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1ff7793f1812ccc1faf02c62f780514738040b4 commit f1ff7793f1812ccc1faf02c62f780514738040b4 Author: Matthias Fechner AuthorDate: 2024-07-03 09:23:22 +0000 Commit: Matthias Fechner CommitDate: 2024-07-11 13:36:42 +0000 devel/gitlab-shell: use new feature from go.mk to download go.mod from gitlab --- devel/gitlab-shell/Makefile | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 814f47ad695d..256e37e42f64 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -14,10 +14,12 @@ LICENSE= MIT # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720 #BUILD_DEPENDS= heimdal>=0:security/heimdal -USES= gmake go:modules,no_targets,1.22 pkgconfig +USES= gmake go:modules,no_targets,1.21 pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org +GO_MOD_DIST= gitlab +GO_MODULE= gitlab.com/gitlab-org/gitlab-shell/v14 MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process @@ -27,31 +29,6 @@ ALL_TARGET= build USERS= git GROUPS= git -# 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-shell/-/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: - @if [ ! -e ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done ]; then\ - ${ECHO_MSG} "Copy go.mod as go mod download will modify it, which breaks checksum check" ;\ - (cd ${DISTDIR}/${DIST_SUBDIR}; ${CP} go.mod go.mod.orig) ;\ - ${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) ;\ - ${ECHO_MSG} "Restore previous go.mod" ;\ - (cd ${DISTDIR}/${DIST_SUBDIR}; ${MV} go.mod.orig go.mod) ;\ - ${TOUCH} ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done;\ - fi; -# --------------------------- - VARLOGDIR= /var/log/gitlab-shell PLIST_FILES+= "@dir(git,,755) ${VARLOGDIR}" @@ -85,11 +62,4 @@ post-install: ${SED} -E -e '/sample$$/ s#^#@sample #; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} -go-pre-delete-distfiles: - @if [ -e ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done ]; then\ - ${RM} ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done || ${TRUE};\ - fi - -.include -delete-distfiles: go-pre-delete-distfiles -.include +.include