git: 716f3144c04a - main - Mk/Uses/cran.mk: Use SETENVI and WRK_ENV
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 23 Mar 2025 03:12:23 UTC
The branch main has been updated by jrm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=716f3144c04aa33cd116bf441cf895ca08b2d365
commit 716f3144c04aa33cd116bf441cf895ca08b2d365
Author: Chad Jacob Milios <milios@ccsys.com>
AuthorDate: 2025-03-23 00:27:15 +0000
Commit: Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2025-03-23 03:10:12 +0000
Mk/Uses/cran.mk: Use SETENVI and WRK_ENV
PR: 283343
---
Mk/Uses/cran.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
index e357f296ad8e..722f55d7e916 100644
--- a/Mk/Uses/cran.mk
+++ b/Mk/Uses/cran.mk
@@ -36,7 +36,7 @@ R_POSTCMD_CHECK_OPTIONS+= --no-manual --no-build-vignettes
do-test:
@${FIND} ${WRKSRC} \( -name '*.o' -o -name '*.so' \) -delete
- @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \
+ @cd ${WRKDIR} ; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \
${R_COMMAND} ${R_PRECMD_CHECK_OPTIONS} CMD check \
${R_POSTCMD_CHECK_OPTIONS} ${PORTNAME}
. endif
@@ -51,7 +51,7 @@ R_POSTCMD_INSTALL_OPTIONS+= --no-docs --no-html
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
- @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} ${R_COMMAND} \
+ @cd ${WRKDIR} ; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${R_COMMAND} \
${R_PRECMD_INSTALL_OPTIONS} CMD INSTALL \
${R_POSTCMD_INSTALL_OPTIONS} ${PORTNAME}
. endif