git: 74f60cecc5f6 - main - devel/build2: use SETENVI

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=74f60cecc5f6ee5421694d92dc8cd10936911095

commit 74f60cecc5f6ee5421694d92dc8cd10936911095
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-09-20 14:16:59 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-09-25 06:28:02 +0000

    devel/build2: use SETENVI
    
    Apparently this is needed when building with portmaster.
    
    PR:             281554
    Reported by:    O. Hartmann <ohartmann@walstatt.org>
    Event:          EuroBSDcon 2024
---
 devel/build2/Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/devel/build2/Makefile b/devel/build2/Makefile
index 7362c764a0e8..f25d04389f2b 100644
--- a/devel/build2/Makefile
+++ b/devel/build2/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	build2
 DISTVERSION=	0.17.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://download.build2.org/${DISTVERSION}/
 DISTNAME=	build2-toolchain-${DISTVERSION}
@@ -30,11 +31,13 @@ OPTIONS_DEFINE=	DOCS
 
 pre-build:
 # phase 1
-	@cd ${WRKSRC}/build2 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} bootstrap.gmake ${_MAKE_JOBS}
+	@cd ${WRKSRC}/build2 && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_FLAGS} bootstrap.gmake ${_MAKE_JOBS}
 
 do-build:
 # phase 2
-	@cd ${WRKSRC}/build2 && ${SETENV} ${MAKE_ENV} ./build2/b-boot \
+	@cd ${WRKSRC}/build2 && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
+		./build2/b-boot \
 		config.cxx=${CXX} \
 		config.cxx.coptions="${CXXFLAGS}" \
 		config.cxx.loptions="${LDFLAGS} -s" \
@@ -45,7 +48,8 @@ do-build:
 
 do-install:
 # "stage" (local installation)
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build2/build2/b-boot configure \
+	@cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
+		./build2/build2/b-boot configure \
 		config.cxx=${CXX} \
 		config.cxx.coptions="${CXXFLAGS}" \
 		config.cxx.loptions="${LDFLAGS} -s" \
@@ -54,9 +58,11 @@ do-install:
 		config.bin.rpath=${PREFIX}/lib \
 		config.install.chroot=${STAGEDIR} \
 		config.install.root=${PREFIX}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build2/build2/b-boot install: build2/ bpkg/ bdep/ \
+	@cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
+		./build2/build2/b-boot install: build2/ bpkg/ bdep/ \
 		-V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build2/build2/b-boot install: '!config.install.scope=project' libbuild2-*/ \
+	@cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
+		./build2/build2/b-boot install: '!config.install.scope=project' libbuild2-*/ \
 		-V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.mk>