From nobody Wed Jun 5 14:35:09 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 4VvVNt1r10z5N6jF; Wed, 05 Jun 2024 14:35:10 +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 4VvVNt1M92z42WY; Wed, 5 Jun 2024 14:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717598110; 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=fXqA8/kLMQ/e8iwLllkSf+9Ud0GxX95Bp9+Y/+Pjijg=; b=N2V09nd1WT3kRYME4BM61YXODxsvKpcBZYvXZcCYzPY05XLiL3TVyxOX/EJ2KGQwNeXmc9 M2Zqu2up1Y8c/yw3Sv7hUpy6edFc6mHKdrEkFn7ILTwDp5RI3FKAmK7KUHNcJSf0fd77Eh U55stV9liJEJTNruMd7PgqYP0Sc7Hipg9lXLvzvzP3jwHkNjfXc7XmpsqTtEiYiprYsaBe RPTYGaIuYyFrrKfbUzJa2hflGkW8NV7tRyIVyaJuvrvfAOVqwNBeqrTEoLKTCptSQaW5Wf qpzVjA+45q+9Xl8try+wSK2C9RY42ierLhXjM9C3drRzZQ49RtBLsAc42TgHuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717598110; a=rsa-sha256; cv=none; b=MvZV+bzuTEcuZUwhj0EQYNYjSBaE43ZTnEto2AvmRRwM0Aqc5IxdLXe/F630hI0rKKV9Sf R3KCUFpPMro/a3iwBbKO9PPf1l1jMZdRTf7og8QGOixlp9cw8w2IwwLdye4wLUX+L6/SSP +u2/yjR0nTO783cIUsGX6eS+fGBOCZdXIsuZFLPSn3jKKR1xhoEmpB/JP673gkIdBpb8f1 RPX5W46inBzY9H7ZgaxYaT62CvXf1sXDjcEJFN1Zq+sk/h+P4wC3LmYnZTyzdkjc4l3Nbx KLMP8XpUtCO6t6NZFUj0po5B1LOZNf5qsDWFRq4B3CqkYWhFdj7zzaJEXT/KAQ== 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=1717598110; 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=fXqA8/kLMQ/e8iwLllkSf+9Ud0GxX95Bp9+Y/+Pjijg=; b=Zzo4gLgQZBoHPYwxJVG3UYCSHcegFS/a7X7wHPjD2eD8/55myg8gbmKGsAThOZgzGWPoX9 F5OQjRTI3qeAR4cu0s1RvN75764aVN0n6aIDYPmoC4jyuHZ+tU6yQmPrgIR14FRgCD1s2E X4t7IrLCDK50YyB0lDdyRoKqDPQWHpl/BECEVV2CPRcw4YNl/bE/HmPtFsG4fXS0Fe1oiG tKfwOMwKrmSW/PhZfnwGnDN+qRtxwfQOIMPavLmD410fD5STSVke8bkSX6ZogfGXm3onuh n8jr4DiB9iIlyg9eRwBo1aSY2pK8ccQmxePV/v2c6JZMeXfF+H7y6RY+EIumGw== 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 4VvVNt0yySz15PJ; Wed, 5 Jun 2024 14:35:10 +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 455EZAkk052680; Wed, 5 Jun 2024 14:35:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 455EZ9IM052677; Wed, 5 Jun 2024 14:35:09 GMT (envelope-from git) Date: Wed, 5 Jun 2024 14:35:09 GMT Message-Id: <202406051435.455EZ9IM052677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Renato Botelho Subject: git: 963f6387bc3e - 2024Q2 - devel/git: Fix build using SETENVI and WRK_ENV 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: garga X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 963f6387bc3ebb5bb671d9a7d960654a5fe62175 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=963f6387bc3ebb5bb671d9a7d960654a5fe62175 commit 963f6387bc3ebb5bb671d9a7d960654a5fe62175 Author: Renato Botelho AuthorDate: 2024-06-05 14:32:47 +0000 Commit: Renato Botelho CommitDate: 2024-06-05 14:35:05 +0000 devel/git: Fix build using SETENVI and WRK_ENV Followup needed changes after 572f23616926 and call upstream build scripts properly PR: 279527 Reported by: O. Hartmann MFH: 2024Q2 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bc5cba2753c702214cfd9b7ed51385f6f2b8428f) --- devel/git/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index ac58758f9044..fc1593d460b6 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,6 @@ PORTNAME= git DISTVERSION= 2.45.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -240,7 +241,8 @@ post-build: .if ${SUBPORT} == core post-build-CONTRIB-on: - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/contrib/diff-highlight + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} \ + -C ${WRKSRC}/contrib/diff-highlight ${RM} ${WRKSRC}/contrib/diff-highlight/shebang.perl post-install: @@ -272,7 +274,7 @@ post-install-HTMLDOCS-on: ${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html post-install-SUBTREE-on: - cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \ + cd ${WRKSRC}/contrib/subtree && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \ ${MAKE_ARGS} install install-doc