git: 92e98a2584dd - main - Uses/cabal.mk: Simplify USE_LOCALE handling.

The branch main has been updated by arrowd:

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

commit 92e98a2584dd2df4fb449c376e3f00efc6388246
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-07-27 07:28:35 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-07-27 14:55:50 +0000

    Uses/cabal.mk: Simplify USE_LOCALE handling.
---
 Mk/Uses/cabal.mk | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index 748bdced162c..ee0ee4a2856e 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -118,10 +118,6 @@ _USES_stage=	751:cabal-post-install-script
 
 BUILD_TARGET?=	${EXECUTABLES:S/^/exe:&/}
 
-.  if defined(USE_LOCALE)
-LOCALE_ENV=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
-.  endif
-
 _use_cabal=	${USE_CABAL:O:u}
 
 .  for package in ${_use_cabal}
@@ -155,7 +151,7 @@ cabal-extract: check-cabal ${WRKDIR}
 	${SETENV} HOME=${CABAL_HOME} ${CABAL_CMD} update
 .  if ${_hackage_is_default} == yes
 	cd ${WRKDIR} && \
-		${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} get ${PORTNAME}-${PORTVERSION}
+		${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} get ${PORTNAME}-${PORTVERSION}
 .  else
 	${MV} ${CABAL_HOME} /tmp/${PORTNAME}-cabal-home
 	cd ${.CURDIR} && ${MAKE} extract CABAL_BOOTSTRAP=yes
@@ -170,12 +166,12 @@ cabal-extract: check-cabal ${WRKDIR}
 # Calls cabal configure on the Haskell package located in ${WRKSRC}
 cabal-configure: check-cabal
 	cd ${WRKSRC} && \
-		${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS}
+		${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS}
 
 # Calls cabal build on the Haskell package located in ${WRKSRC}
 cabal-build: check-cabal
 	cd ${WRKSRC} && \
-		${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}
+		${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}
 
 # Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure.
 make-use-cabal: check-cabal2tuple