git: a84e7439678b - main - lang/fpc*: Fix build cleaning env before sub-gmake

The branch main has been updated by acm:

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

commit a84e7439678b937db4b481fc340ee43af71eea9d
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-11-18 04:36:55 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-11-18 04:36:55 +0000

    lang/fpc*: Fix build cleaning env before sub-gmake
    
    Arguments passed to make for the top level port build for lang/fpc
    can be consumed by gmake used to build the actual upstream project
    (vs the ports infrastructure 'make' operations).
    
    For instance, make -DNO_DEPENDS stage will pass
    "MAKEFLAGS= -D NO_DEPENDS ..." in the environment
    to the gmake invocation.  gmake chokes on that with the following:
    
    : invalid option -- D
    
    A fix for that is to clear the environment as with the ports
    572f2361692640bc27729191b1267aa3fcc354a7 commit that added SETENVI
    and WRK_ENV.
    
    PR:              291061
    Reported by:    jcfyecrayz __at__ liamekaens.com
---
 lang/fpc-devel/Makefile |  8 ++++----
 lang/fpc/Makefile       | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lang/fpc-devel/Makefile b/lang/fpc-devel/Makefile
index 03e7988a47ca..2487a07e2886 100644
--- a/lang/fpc-devel/Makefile
+++ b/lang/fpc-devel/Makefile
@@ -170,14 +170,14 @@ post-patch:
 do-build:
 # build fpc compiler
 	@${ECHO_MSG} "##### STARTING COMPILER AND UNITS #####"
-	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} all ${MAKE_ARGS} ${BOOTPPC})
+	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} all ${MAKE_ARGS} ${BOOTPPC})
 	@${ECHO_MSG} "##### COMPLETE COMPILER AND UNITS #####"
 
 do-install:
 	# Installing fpc compiler
-	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} install ${MAKE_ARGS} ${BOOTPPC})
+	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} install ${MAKE_ARGS} ${BOOTPPC})
 
 	# Installing manpages
 	${INSTALL_MAN} ${WRKDIR}/man/man1/* ${STAGEDIR}${PREFIX}/share/man/man1
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index e9f49f1f4bb7..7de10957d5b8 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -157,20 +157,20 @@ post-patch:
 do-build:
 # build fpc compiler
 	@${ECHO_MSG} "##### STARTING COMPILER #####"
-	(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} cycle ${MAKE_ARGS} ${BOOTPPC})
+	(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENVI} ${WRK_ENV}  \
+		${MAKE_ENV} ${MAKE_CMD} cycle ${MAKE_ARGS} ${BOOTPPC})
 	@${ECHO_MSG} "##### COMPLETE COMPILER #####"
 
 # build units
 	@${ECHO_MSG} "##### STARTING UNITS #####"
-	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} build ${MAKE_ARGS} ${BOOTPPC})
+	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} build ${MAKE_ARGS} ${BOOTPPC})
 	@${ECHO_MSG} "##### COMPLETE UNITS #####"
 
 do-install:
 	# Installing fpc compiler
-	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} install ${MAKE_ARGS} ${BOOTPPC})
+	(cd ${WRKDIR}/${FPCSRCDIR} && ${SETENVI} ${WRK_ENV} \
+		${MAKE_ENV} ${MAKE_CMD} install ${MAKE_ARGS} ${BOOTPPC})
 
 	# Installing manpages
 	${INSTALL_MAN} ${WRKDIR}/man/man1/* ${STAGEDIR}${PREFIX}/share/man/man1