From nobody Sun Jul 21 06:56:44 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 4WRZ2j28xrz5QtRB; Sun, 21 Jul 2024 06:56:45 +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 4WRZ2j0mhBz4ZWv; Sun, 21 Jul 2024 06:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721545005; 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=8QW3ijoXZrtK/Q64PGpBiFe4WQkEHebGA1OVklRBYhA=; b=opm+AEeojJMsOzmLlFFAywM+1W3K1w+KV+e4Vevq5mMW5VzDsPDjXAHz+b8eYOQjiVTaFw 4WNcdnpaur4uEHJ52cjqGbRwRxPpI0j4Cw5+27zKN+zls3Ly3Vy7EYObEvnt5fVI94qLCb ID08jMV6YsFvYBHPnTPwAO/xkcZR7pCnP/a5nZbgWDht0YqLvP9W0jmsHcBWsdIPzq2BwM xP5hSpmJHvDi5s8nieOlmsHqMDlV7FX+zWot+luD37MfdHfVzAjwrPMXDcCHhX0Jup1Dij 93VUbuUa5Fx6QZnz785+TGPZBPV1vKSGx88r5AIfkw6/iittx4+zDo365pDK5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721545005; a=rsa-sha256; cv=none; b=OLs9aCdBrR9AxJuFPgh+0jc02SrwnbQF0ipjM9xn6f17t8+HAWUkhNtHPUg891Vrgg0baI UTL8WuXo55VU3sDLi7txJUgq1JfLNhKExyhV93Mlp3Bubz7u3bKhV+cIEtEwjsOh3Ygz30 1Zc8BE52VR4STKls6hGPSGknd3bm8Wpl884U/JFme2YzesgwAfIQpyDcZmAnOx9CrdDW50 KpohWNUOTTyjq7ZCCjdk4cnxL4kWQ92pbNaSXm30JA+3fguY/n/CMxP8I4Lw+bkv0U3HnO oGMhsNbMeR2gxxqc/fbDrV+CbYIfkT1Uo31U7qM8rQqnd9Xf325m47RPPMZ67w== 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=1721545005; 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=8QW3ijoXZrtK/Q64PGpBiFe4WQkEHebGA1OVklRBYhA=; b=O8h/HT6TtGCV818PFmHdZrWyRxiraHx1zWPtbkoRySg1a4IyE9SAUP1VPJMMCacyDLPY5Y qSt6IXFsUc6VHeeNbFwiaj1v6/ZS0tfZF+3NUhfoYWp8HAXsc5/xaMWsIh/XZkMelA1Q1n WdUS9lMOBD0QXhIM3/uaKVsWycARmkU31DOLdn26gDGNO3VyZAEvS47MhyrNwYDIm8JM9u RpZB2249+eiykdd2aTlRouNCdn/73VW1PJNrRdgRPAj1gmeApaPKznblHMDxOLauYCtgp+ 6pY+w0Ntri6ezP/GIA19xjDlbQLgu1bYI3GqzKxXqIXZh6gv2k1XfS6YNjS2kA== 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 4WRZ2j037Szq4P; Sun, 21 Jul 2024 06:56:45 +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 46L6uifE069052; Sun, 21 Jul 2024 06:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46L6uidT069049; Sun, 21 Jul 2024 06:56:44 GMT (envelope-from git) Date: Sun, 21 Jul 2024 06:56:44 GMT Message-Id: <202407210656.46L6uidT069049@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: 88be22d2a6ab - 2024Q3 - 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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 88be22d2a6ab5c35259f89876e0d43a0d4e3c43f Auto-Submitted: auto-generated The branch 2024Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=88be22d2a6ab5c35259f89876e0d43a0d4e3c43f commit 88be22d2a6ab5c35259f89876e0d43a0d4e3c43f Author: Matthias Fechner AuthorDate: 2024-07-03 09:23:22 +0000 Commit: Matthias Fechner CommitDate: 2024-07-21 05:39:05 +0000 devel/gitlab-shell: use new feature from go.mk to download go.mod from gitlab (cherry picked from commit f1ff7793f1812ccc1faf02c62f780514738040b4) --- 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