git: 963f6387bc3e - 2024Q2 - devel/git: Fix build using SETENVI and WRK_ENV
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Jun 2024 14:35:09 UTC
The branch 2024Q2 has been updated by garga:
URL: https://cgit.FreeBSD.org/ports/commit/?id=963f6387bc3ebb5bb671d9a7d960654a5fe62175
commit 963f6387bc3ebb5bb671d9a7d960654a5fe62175
Author: Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-06-05 14:32:47 +0000
Commit: Renato Botelho <garga@FreeBSD.org>
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 <ohartmann@walstatt.org>
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