git: 43c0fa7a8f88 - main - postgresql??-*: Build with a clean environment

From: Palle Girgensohn <girgen_at_FreeBSD.org>
Date: Sat, 11 May 2024 07:09:28 UTC
The branch main has been updated by girgen:

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

commit 43c0fa7a8f885172bf58c9af743b1aaab8237cf8
Author:     Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2024-05-11 07:04:16 +0000
Commit:     Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2024-05-11 07:09:05 +0000

    postgresql??-*: Build with a clean environment
    
    The fix in 572f236169264, PR 276478, suggest a change SETENV->SETENVI.
    Implement this for the PostgreSQL builds. This should fix builds
    problems for some when building using portmaster.
    
    PR:             278889
    Reported by:    O. Hartmann
---
 databases/postgresql16-server/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index 2adc5a60ec4a..c73f0d255be9 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -233,9 +233,9 @@ pre-build:
 .if !defined(NO_BUILD) && !target(do-build)
 
 do-build:
-	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
+	@ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
 	@ for dir in ${BUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ; \
+		cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \
 	done
 
 .  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
@@ -256,7 +256,7 @@ post-patch:
 do-install:
 	@for dir in ${INSTALL_DIRS}; do \
 	    cd ${WRKSRC}/$${dir} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
+		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
 	done
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
@@ -265,7 +265,7 @@ do-install:
 			${STAGEDIR}${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
-	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
+	@ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
 .  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\