From nobody Fri May 17 06:43:38 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 4Vgcqb0w45z5KZXD; Fri, 17 May 2024 06:43:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vgcqb0FHbz4m2Z; Fri, 17 May 2024 06:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715928219; 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=J34c83nDzUnDE2FwAoBf5t5SR/MbsiCZ6oSB0GQG09Y=; b=l2hrHhp9r4FrBGJgHfB1WcY7hHUtbkRXgyVHhoUe6Ly9WmGAov9eMI7IvvxQaa0d6VdR6y NE+d/t2VCdzjSYetPpMcbJUSSnOpRogKNDJB+o1NOzintFq07FnBO5Te1P6gD5pLTAOTEX LQTAAYJlRnPt8CNN3IEgTZjAf1V+cExdC+q1+dZPMM1j4ZmJ25Gma0h2yIzRUUdXyll28M dhHbw/byR7fvFbhLgrlI5MO+vOsHn1xRHK1C2SkL1cjdt0Ts6CnkWSMFyMCq9R77GKqdTZ +d9FFzmOcJd/SIGSPjOcsB7ahg+xnBoAtoBrSsQxm78wwRB0XjUJST0KmWvV7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715928219; a=rsa-sha256; cv=none; b=yVP7qGtjD2/hLqxhIjSBRjgI63t946TvES6rOjecYyuaIY73Pha3fMnd3c2R7BqkCDWWy4 4KoNtsT0IkmfeRZlCyQLHkfyqxdebiuxZiX1lFA70255dT3MVYSYbhc8Q/6wyU8lSXKhAG 3HbGCyuip6rjcMAZtRjap8bs2xAeCGm+cCTCnq6ygAC2nGiaxskDSg8caNahg6Elx7c7Vr OO2zttC3lRL2S0d+fq+yjNwxIK9XCIh27FUG/RzAs4Fjy494j462LkzlXD1GaPxbj5m091 W7LLvKxso++uMhCGYP/jrawoSiN0pdC+6a7nTBUnuH2m1lImaXCXq8ylkn/Kkw== 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=1715928219; 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=J34c83nDzUnDE2FwAoBf5t5SR/MbsiCZ6oSB0GQG09Y=; b=Y8HQVs+UNTVPw/Dus5IP808f/UAJWSI2NNOzwKYhAQL+tUxlHTPvaVgZtlJgPbn+4vwAnt qmOqxq+Vfgajg6Io5Oc3XV8MIN8DETsnTsQ1mBfUyxOGQvRcZ/xajeLAposI2lDUi2mFa5 x8ArwKRSlVXCbU2Q6JXUexhnD7kuRQZ4PCk1IOn6oaGpii82LUyrD+Qv3YWFq37As2H2MO P4s2q4wi8u3aBuk75REnwAZI6OTny2h3LEznOSOIeVKIXNTdHJb5wVWR6RNtbTWng5zr2r +thlEdCcoz/Oq5UXigeLBpoa61Ug0zZPKbeRz+2la7OsqUAWW30JkNwYug4jjA== 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 4VgcqZ6xkczY7p; Fri, 17 May 2024 06:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44H6hcHA003359; Fri, 17 May 2024 06:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44H6hcu1003356; Fri, 17 May 2024 06:43:38 GMT (envelope-from git) Date: Fri, 17 May 2024 06:43:38 GMT Message-Id: <202405170643.44H6hcu1003356@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: 3c8fd2ac242a - main - devel/gitlab-shell: fix build as non-root user in poudriere 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: 3c8fd2ac242ab03120b5d7eb4a02f84d346a0475 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c8fd2ac242ab03120b5d7eb4a02f84d346a0475 commit 3c8fd2ac242ab03120b5d7eb4a02f84d346a0475 Author: Yasuhito FUTATSUKI AuthorDate: 2024-05-16 11:19:29 +0000 Commit: Matthias Fechner CommitDate: 2024-05-17 06:42:56 +0000 devel/gitlab-shell: fix build as non-root user in poudriere PR: 278710 --- devel/gitlab-shell/Makefile | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 7936f330b809..e58abc4d9107 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -39,14 +39,17 @@ 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} "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) + @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 @@ -82,4 +85,11 @@ post-install: ${SED} -E -e '/sample$$/ s#^#@sample #; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} -.include +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