diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2026-06-07 16:50:32 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2026-06-30 20:03:57 +0000 |
| commit | b6ec06f079e1c883d32c788c0285c6d492eeb1c0 (patch) | |
| tree | 509443009511a71c8ffc164a16f37b20c4a29293 | |
| parent | d26c01fde278a05fcc2c9c8f865055db361083e3 (diff) | |
*/*: Use C.UTF-8 locale
Ports 02f27a83b44d fixed the ports tree to the C locale so it would work
correctly in environments where users use a locale that isn't compatible
with the C locale, e.g. xx_YY.UTF-8 where [A-Z] includes more than just
upper case letters. USE_LOCALE was introduced to let ports use another
locale if they needed it. The C.UTF-8 locale was created later on to be
mostly compatible with the C locale.
Switch the ports tree locale to C.UTF-8 and remove USE_LOCALE. The
world has moved to Unicode so all ports either require it or know how to
build correctly in a Unicode environment.
PR: 295945
Exp-run by: antoine
144 files changed, 73 insertions, 285 deletions
diff --git a/Mk/Scripts/dialog4ports.sh b/Mk/Scripts/dialog4ports.sh index ba8dbb7cd48d..de62a91b583f 100644 --- a/Mk/Scripts/dialog4ports.sh +++ b/Mk/Scripts/dialog4ports.sh @@ -42,9 +42,9 @@ fi # Clear environment of PKGNAME or the dialog will show on older versions # that do not understand -v. if ! env -u PKGNAME ${DIALOG4PORTS} -v > /dev/null 2>&1; then - exec env LC_ALL=C.UTF-8 $DIALOG4PORTS > $OPTIONSFILE 2>&1 + exec $DIALOG4PORTS > $OPTIONSFILE 2>&1 fi # Newer versions use stderr to work around a jail issue # http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082383.html -exec env LC_ALL=C.UTF-8 $DIALOG4PORTS 2> $OPTIONSFILE +exec $DIALOG4PORTS 2> $OPTIONSFILE diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk index 89d29aa9c46d..c179e87fa3aa 100644 --- a/Mk/Uses/elixir.mk +++ b/Mk/Uses/elixir.mk @@ -10,7 +10,6 @@ # ELIXIR_LIB_ROOT - Elixir default library path # ELIXIR_APP_ROOT - Root directory for this Elixir app # ELIXIR_HIDDEN - Applications to be hidden from the code path; usually ${PORTNAME} -# ELIXIR_LOCALE - An UTF-8 locale to be used by Elixir during builds (any UTF-8 locale is good) # MIX_CMD - The "mix" command # MIX_COMPILE - The "mix" command used to compile an Elixir app # MIX_REWRITE - Automatically replace Mix dependencies with code paths @@ -40,9 +39,8 @@ ELIXIR_APP_NAME?= ${PORTNAME} ELIXIR_LIB_ROOT?= ${LOCALBASE}/lib/elixir/lib ELIXIR_APP_ROOT?= ${PREFIX}/lib/elixir/lib/${ELIXIR_APP_NAME} ELIXIR_HIDDEN?= "^${ELIXIR_APP_NAME}$$" -ELIXIR_LOCALE?= en_US.UTF-8 MIX_CMD?= ${LOCALBASE}/bin/mix -MIX_COMPILE?= ${SETENVI} ${WRK_ENV} ${MIX_ENV} LANG=${ELIXIR_LOCALE} LC_ALL=${ELIXIR_LOCALE} MIX_ENV=${MIX_ENV_NAME} ELIXIR_HIDDEN=${ELIXIR_HIDDEN} ${MIX_CMD} ${MIX_TARGET} +MIX_COMPILE?= ${SETENVI} ${WRK_ENV} ${MIX_ENV} MIX_ENV=${MIX_ENV_NAME} ELIXIR_HIDDEN=${ELIXIR_HIDDEN} ${MIX_CMD} ${MIX_TARGET} MIX_REWRITE?= MIX_BUILD_DEPS?= MIX_RUN_DEPS?= diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk index e085c45fcab0..c542de25e2c6 100644 --- a/Mk/Uses/gem.mk +++ b/Mk/Uses/gem.mk @@ -46,9 +46,6 @@ GEM_CACHE?= ${CACHE_DIR}/${GEM_NAME}.gem GEMSPEC= ${PORTNAME}.gemspec GEM_ENV+= RB_USER_INSTALL=yes -USE_LOCALE?= en_US.UTF-8 -GEM_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} - PLIST_SUB+= PORTVERSION="${PORTVERSION}" \ REV="${RUBY_GEM}" \ GEMS_BASE_DIR="${GEMS_BASE_DIR}" \ diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 0589811d2825..349263b79fad 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -83,10 +83,6 @@ _USE_GNOME_ALL+=atkmm cairomm cairomm11 glibmm glibmm26 gtkmm24 \ gtkmm30 gtkmm40 gtksourceviewmm3 libxml++26 libsigc++20 \ libsigc++30 pangomm pangomm24 -# glib-mkenums often fails with C locale -# https://gitlab.gnome.org/GNOME/glib/issues/1430 -USE_LOCALE?= en_US.UTF-8 - GNOME_HTML_DIR?= ${PREFIX}/share/doc GCONF_CONFIG_OPTIONS?= merged GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index a5b8c2d2defb..6daacb7e2eab 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -239,8 +239,6 @@ IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #' . endif #defined(_KDE_CATEGORY) # ============================================================================== -# === SET UP LOCALE ENVIRONMENT ================================================= -USE_LOCALE?= en_US.UTF-8 # === SET UP CMAKE ENVIRONMENT ================================================= # Help cmake to find files when testing ports with non-default PREFIX. diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk index 3a5aa9d7eba9..c48f08a84199 100644 --- a/Mk/Uses/meson.mk +++ b/Mk/Uses/meson.mk @@ -45,9 +45,6 @@ BUILD_DEPENDS+= meson:devel/meson # meson uses ninja .include "${USESDIR}/ninja.mk" -# meson might have issues with non-unicode locales -USE_LOCALE?= en_US.UTF-8 - # Enable muon's meson compatibility mode . if !empty(meson_ARGS:Mmuon) CONFIGURE_ARGS+= meson diff --git a/Mk/Uses/npm.mk b/Mk/Uses/npm.mk index 769d7c9e07d7..730d9c2d3ca8 100644 --- a/Mk/Uses/npm.mk +++ b/Mk/Uses/npm.mk @@ -240,8 +240,7 @@ npm-fetch-node-package-manager: ${SETENV} SCRIPTSDIR=${SCRIPTSDIR} WRKDIR=${WRKDIR} \ ${SH} ${SCRIPTSDIR}/npm-create-mtree.sh ${NPM_CMDNAME} > \ ${NPM_CMDNAME}.mtree && \ - ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ - ${TAR} -cz --options 'gzip:!timestamp' \ + ${TAR} -cz --options 'gzip:!timestamp' \ -f ${DISTDIR}/${DIST_SUBDIR}/${NPM_CMDNAME}-${NPM_VER}.tgz @${NPM_CMDNAME}.mtree; \ fi @${SETENV} ${MAKE_ENV} corepack install -g ${DISTDIR}/${DIST_SUBDIR}/${NPM_CMDNAME}-${NPM_VER}.tgz @@ -292,8 +291,7 @@ npm-archive-node-modules: ${SH} ${SCRIPTSDIR}/npm-create-mtree.sh $${dir} >> \ ${WRKDIR}/node-modules-cache.mtree; \ done; \ - ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ - ${TAR} -cz --options 'gzip:!timestamp' \ + ${TAR} -cz --options 'gzip:!timestamp' \ -f ${DISTDIR}/${DIST_SUBDIR}/${_DISTFILE_prefetch} \ -C ${WRKDIR} @node-modules-cache.mtree; \ if [ ${TMPDIR} != ${WRKDIR} ]; then \ @@ -409,8 +407,7 @@ npm-archive-node-modules: ${SETENV} SCRIPTSDIR=${SCRIPTSDIR} WRKDIR=${WRKDIR} \ ${SH} ${SCRIPTSDIR}/npm-create-mtree.sh ${NPM_MODULE_CACHE} > \ node-modules-cache.mtree && \ - ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ - ${TAR} -cz --options 'gzip:!timestamp' \ + ${TAR} -cz --options 'gzip:!timestamp' \ -f ${DISTDIR}/${DIST_SUBDIR}/${_DISTFILE_prefetch} @node-modules-cache.mtree; \ if [ ${TMPDIR} != ${WRKDIR} ]; then \ ${RM} -r ${WRKDIR}; \ diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 805804e30d17..4316034ca2cd 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -122,11 +122,6 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endif . endfor -# Suppress warnings from rcc about not using a UTF-8 locale. -. if ${_QT_VER:M6} -USE_LOCALE?= C.UTF-8 -. endif - CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME} MAKE_ENV+= QT_SELECT=${_QT_RELNAME} diff --git a/Mk/bsd.licenses.mk b/Mk/bsd.licenses.mk index e66d223b7e4c..ac47582c3f2c 100644 --- a/Mk/bsd.licenses.mk +++ b/Mk/bsd.licenses.mk @@ -648,7 +648,7 @@ ${_LICENSE_COOKIE}: . if !defined(NO_LICENSES_DIALOGS) # Dialog interface . if ${_LICENSE_COMB} == "single" - @${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \ + @${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \ --yes-label Accept --no-label Reject --yesno \ "$$(${CAT} ${_LICENSE_FILE})" 21 76 @@ -665,13 +665,13 @@ ${_LICENSE_COOKIE}: done; \ menu_cmd="$${menu_cmd} REJECT \"Reject the licenses (all)\""; \ while true; do \ - ${SH} -c "${SETENV} LC_ALL=C.UTF-8 $${menu_cmd} 2>\"$${tmpfile}\""; \ + ${SH} -c "$${menu_cmd} 2>\"$${tmpfile}\""; \ result=$$(${CAT} "$${tmpfile}"); \ case $${result} in \ REJECT) exit 1;; \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ - ${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --textbox "$${file}" 21 75 ;; \ + ${DIALOG} --textbox "$${file}" 21 75 ;; \ USE_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^USE_//'); \ ${ECHO_CMD} $${name} > ${_LICENSE_COOKIE}; \ break ;; \ @@ -683,7 +683,7 @@ ${_LICENSE_COOKIE}: . for lic in ${_LICENSE_TO_ASK} @${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA} . endfor - @menu_cmd="${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \ + @menu_cmd="${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \ trap '${RM} $$tmpfile' EXIT INT TERM; \ tmpfile=$$(mktemp -t portlicenses); \ for lic in ${_LICENSE_TO_ASK}; do \ @@ -698,7 +698,7 @@ ${_LICENSE_COOKIE}: REJECT) exit 1 ;; \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ - ${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --textbox "$${file}" 21 75 ;; \ + ${DIALOG} --textbox "$${file}" 21 75 ;; \ esac; \ done . endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 9e2f1ffb0285..4b5aa3978325 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -343,9 +343,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # can be used in Makefiles by port maintainers # if a port breaks with it. ## -# USE_LOCALE - LANG and LC_ALL are set to the value of this variable in -# CONFIGURE_ENV and MAKE_ENV. Example: USE_LOCALE=en_US.UTF-8 -## # USE_GCC - If set, this port requires this version of gcc, either in # the system or installed from a port. # USE_CSTD - Override the default C language standard (gnu89, gnu99) @@ -681,6 +678,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # For extract: # # EXTRACT_ENV - Environment to pass to ${EXTRACT_CMD} +# Default: none # EXTRACT_CMD - Command for extracting archive # Default: ${TAR} # EXTRACT_BEFORE_ARGS @@ -994,8 +992,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Most port authors should not need to understand anything after this point. # -LANG= C -LC_ALL= C +LANG= C.UTF-8 +LC_ALL= C.UTF-8 .export LANG LC_ALL # These need to be absolute since we don't know how deep in the ports @@ -1589,6 +1587,7 @@ PKG_NOTE_flavor= ${FLAVOR} # GIT_CEILING_DIRECTORIES prevents ports that try to find their version # using git from finding the ports tree's git repository. WRK_ENV+= HOME=${WRKDIR} \ + LANG=C.UTF-8 \ MACHINE_ARCH=${MACHINE_ARCH} \ PWD="$${PWD}" \ GIT_CEILING_DIRECTORIES=${WRKDIR} \ @@ -1988,10 +1987,6 @@ ERROR+= "Unknown USES=${f:C/\:.*//}" . endif . endif -. if defined(USE_LOCALE) -WRK_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} -. endif - # Macro for doing in-place file editing using regexps. REINPLACE_ARGS may only # be used to set or override the -i argument. Any other use is considered # invalid. @@ -2144,7 +2139,6 @@ PATCH_DIST_ARGS+= --suffix .orig TAR?= /usr/bin/tar # EXTRACT_SUFX is defined in .pre.mk section -EXTRACT_ENV?= LC_ALL=C.UTF-8 EXTRACT_CMD?= ${TAR} EXTRACT_BEFORE_ARGS?= -xf EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions diff --git a/Tools/scripts/add-port-to-category-makefile.sh b/Tools/scripts/add-port-to-category-makefile.sh index f77c46b0c90c..fcd6a48c7c35 100755 --- a/Tools/scripts/add-port-to-category-makefile.sh +++ b/Tools/scripts/add-port-to-category-makefile.sh @@ -7,7 +7,7 @@ PORT="$1" set -e set -o pipefail -export LC_ALL=C +export LC_ALL=C.UTF-8 ## ## add-port-to-category-makefile.sh: adds a new port to {category}/Makefile diff --git a/Tools/scripts/git-diff-ports.sh b/Tools/scripts/git-diff-ports.sh index 9870dfd38913..fd207b5eb874 100755 --- a/Tools/scripts/git-diff-ports.sh +++ b/Tools/scripts/git-diff-ports.sh @@ -3,7 +3,7 @@ # MAINTAINER: yuri@FreeBSD.org set -o pipefail -export LC_ALL=C +export LC_ALL=C.UTF-8 # ----- Dependency check ---------------------------------------------- for dep in git; do diff --git a/Tools/scripts/git-get-latest-remote-version.sh b/Tools/scripts/git-get-latest-remote-version.sh index 692a4fb1c8ef..a67a1df9e1da 100755 --- a/Tools/scripts/git-get-latest-remote-version.sh +++ b/Tools/scripts/git-get-latest-remote-version.sh @@ -5,7 +5,7 @@ set -e set -o pipefail -export LC_ALL=C +export LC_ALL=C.UTF-8 ## ## git-get-latest-remote-version.sh: retrieves the latest version of a remote project at the given Git URL diff --git a/Tools/scripts/hackage-get-latest-version.sh b/Tools/scripts/hackage-get-latest-version.sh index 3ad21fcbd73a..0f0bb84a86b2 100755 --- a/Tools/scripts/hackage-get-latest-version.sh +++ b/Tools/scripts/hackage-get-latest-version.sh @@ -5,7 +5,7 @@ set -e set -o pipefail -export LC_ALL=C +export LC_ALL=C.UTF-8 ## ## hackage-get-latest-version.sh: retrieves the latest version of a given Haskell package as registered on https://hackage.haskell.org diff --git a/Tools/scripts/npmjs-fetch-with-dependencies.sh b/Tools/scripts/npmjs-fetch-with-dependencies.sh index d2c95ccb095e..ee44fb2c7cad 100755 --- a/Tools/scripts/npmjs-fetch-with-dependencies.sh +++ b/Tools/scripts/npmjs-fetch-with-dependencies.sh @@ -14,7 +14,7 @@ set -eu -o pipefail set -o pipefail -export LC_ALL=C +export LC_ALL=C.UTF-8 ## ## npmjs-get-latest-version.sh: retrieves the latest version of a given Node.js package as registered on https://registry.npmjs.org diff --git a/Tools/scripts/npmjs-get-latest-version.sh b/Tools/scripts/npmjs-get-latest-version.sh index 122211f03df8..8b5152f5efcd 100755 --- a/Tools/scripts/npmjs-get-latest-version.sh +++ b/Tools/scripts/npmjs-get-latest-version.sh @@ -5,7 +5,7 @@ set -e set -o pipefail -export LC_ALL=C +export LC_ALL=C.UTF-8 ## ## npmjs-get-latest-version.sh: retrieves the latest version of a given Node.js package as registered on https://registry.npmjs.org diff --git a/Tools/scripts/pypi-get-latest-version.sh b/Tools/scripts/pypi-get-latest-version.sh index ce7143042367..38b4ee7a44f3 100755 --- a/Tools/scripts/pypi-get-latest-version.sh +++ b/Tools/scripts/pypi-get-latest-version.sh @@ -5,7 +5,7 @@ set -e set -o pipefail -export LC_ALL=C +export LC_ALL=C.UTF-8 ## ## pypi-get-latest-version.sh: retrieves the latest version of a given Python package as registered on https://pypi.org diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 63ff64f9ee97..8549d771207f 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -23,10 +23,6 @@ USE_LDCONFIG= yes CPE_VENDOR= flac_project -# Preserve UTF-8 filenames in test/flac-to-flac-metadata-test-files/. -# They are referenced by the test suite. -EXTRACT_CMD= ${SETENV} LC_ALL=C.UTF-8 ${TAR} - USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ diff --git a/audio/flacon/Makefile b/audio/flacon/Makefile index 0551b5c6c1e3..1787ba5a19f9 100644 --- a/audio/flacon/Makefile +++ b/audio/flacon/Makefile @@ -29,8 +29,7 @@ USE_QT= buildtools:build concurrent:build qmake:build testlib:build \ CMAKE_ARGS= -DBUILD_TESTS:BOOL=YES do-test: - @cd ${TEST_WRKSRC} && LC_ALL=C.UTF-8 ctest -C ${CMAKE_BUILD_TYPE} \ - ${_MAKE_JOBS} + @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} @${CAT} ${TEST_WRKSRC}/Testing/Temporary/LastTest.log .include <bsd.port.mk> diff --git a/audio/picard/Makefile b/audio/picard/Makefile index 563d9e816381..8dd96f6e76d5 100644 --- a/audio/picard/Makefile +++ b/audio/picard/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=1.0:audio/py-discid@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0:www/py-pyjwt@${PY_FLAVOR} USES= desktop-file-utils gettext-tools pyqt:5 python -USE_LOCALE= en_US.UTF-8 USE_PYQT= pyqt5:run USE_PYTHON= autoplist noflavors pep517 unittest diff --git a/audio/synthpod-lv2/Makefile b/audio/synthpod-lv2/Makefile index 462a2c117e21..7963b1692356 100644 --- a/audio/synthpod-lv2/Makefile +++ b/audio/synthpod-lv2/Makefile @@ -74,7 +74,7 @@ do-fetch: git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \ (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${GIT_TAGNAME} && ${RM} -r .git) && \ ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | ${SORT} -z | \ ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \ fi diff --git a/biology/gatk/Makefile b/biology/gatk/Makefile index fa897c4fbe39..428542024b3c 100644 --- a/biology/gatk/Makefile +++ b/biology/gatk/Makefile @@ -77,7 +77,7 @@ do-fetch: ${RM} -r ${WRKDIR} \ ) && \ ${FIND} ${PORTNAME}-${DISTVERSION} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - ${FIND} ${PORTNAME}-${DISTVERSION} -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${PORTNAME}-${DISTVERSION} -print0 | ${SORT} -z | \ ${SETENV} -i ${TAR} czf ${DISTNAME}${EXTRACT_SUFX} --format=cpio --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ ${RM} -r ${PORTNAME}-${DISTVERSION}; \ fi diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile index a8bf6c6e9e5e..690e2871c72e 100644 --- a/biology/jalview/Makefile +++ b/biology/jalview/Makefile @@ -21,8 +21,6 @@ JAVA_VERSION= 11 WRKSRC= ${WRKDIR}/${PORTNAME} -USE_LOCALE= en_US.UTF-8 - DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= jalview.sh SUB_LIST= JAVA=${JAVA} diff --git a/deskutils/R-cran-exams/Makefile b/deskutils/R-cran-exams/Makefile index e47eb49641f7..efb29d876e16 100644 --- a/deskutils/R-cran-exams/Makefile +++ b/deskutils/R-cran-exams/Makefile @@ -30,7 +30,6 @@ TEST_DEPENDS= pdftex:print/tex-formats \ USES= cran:auto-plist -MAKE_ENV= LC_ALL=C.UTF-8 \ - R_ZIPCMD=${LOCALBASE}/bin/zip +MAKE_ENV= R_ZIPCMD=${LOCALBASE}/bin/zip .include <bsd.port.mk> diff --git a/deskutils/joplin-desktop/Makefile b/deskutils/joplin-desktop/Makefile index dc2a64d5f3be..75288b2e741d 100644 --- a/deskutils/joplin-desktop/Makefile +++ b/deskutils/joplin-desktop/Makefile @@ -76,8 +76,7 @@ pre-fetch: ${SETENV} SCRIPTSDIR=${SCRIPTSDIR} WRKDIR=${WRKDIR} \ ${SH} ${SCRIPTSDIR}/electron-create-mtree.sh node-modules-cache > \ node-modules-cache.mtree && \ - ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ - ${TAR} -cz --options 'gzip:!timestamp' \ + ${TAR} -cz --options 'gzip:!timestamp' \ -f ${DISTDIR}/${DEFAULT_PLUGINS_NODE_MODULES_FILE} @node-modules-cache.mtree; \ ${RM} -r ${WRKDIR}/node-modules-cache; \ fi @@ -93,8 +92,7 @@ pre-fetch: ${SETENV} SCRIPTSDIR=${SCRIPTSDIR} WRKDIR=${WRKDIR} \ ${SH} ${SCRIPTSDIR}/electron-create-mtree.sh node-modules-cache-app-clipper > \ node-modules-cache-app-clipper.mtree && \ - ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ - ${TAR} -cz --options 'gzip:!timestamp' \ + ${TAR} -cz --options 'gzip:!timestamp' \ -f ${DISTDIR}/${APP_CLIPPER_NODE_MODULES_FILE} @node-modules-cache-app-clipper.mtree; \ ${RM} -r ${WRKDIR}/node-modules-cache-app-clipper; \ fi diff --git a/devel/R-cran-data.table/Makefile b/devel/R-cran-data.table/Makefile index b255de9c2250..bd7b271fc289 100644 --- a/devel/R-cran-data.table/Makefile +++ b/devel/R-cran-data.table/Makefile @@ -16,10 +16,6 @@ TEST_DEPENDS= R-cran-bit64>0:devel/R-cran-bit64 \ USES= cran:auto-plist,compiles pkgconfig -# Tests needs /etc/locatime symlink defined to succeed -# and C.UTF-8 env set: -MAKE_ENV= LC_ALL=C.UTF-8 - NO_ARCH_IGNORE= data_table.so post-install: diff --git a/devel/R-cran-lintr/Makefile b/devel/R-cran-lintr/Makefile index c9584b44dd16..92f7fc5d6271 100644 --- a/devel/R-cran-lintr/Makefile +++ b/devel/R-cran-lintr/Makefile @@ -31,8 +31,6 @@ TEST_DEPENDS= R-cran-cyclocomp>0:devel/R-cran-cyclocomp \ USES= cran:auto-plist -MAKE_ENV= LC_ALL=C.UTF-8 - post-install: @${ECHO_CMD} "@dir ${R_MOD_DIR}/help/figures" >> ${TMPPLIST} diff --git a/devel/R-cran-sessioninfo/Makefile b/devel/R-cran-sessioninfo/Makefile index 50ee2d99ffcd..c5383d937351 100644 --- a/devel/R-cran-sessioninfo/Makefile +++ b/devel/R-cran-sessioninfo/Makefile @@ -19,6 +19,4 @@ TEST_DEPENDS= R-cran-callr>0:devel/R-cran-callr \ USES= cran:auto-plist -MAKE_ENV+= LC_ALL="C.UTF-8" - .include <bsd.port.mk> diff --git a/devel/R-cran-testthat/Makefile b/devel/R-cran-testthat/Makefile index 60812deb6a8c..fcf2ba06bba4 100644 --- a/devel/R-cran-testthat/Makefile +++ b/devel/R-cran-testthat/Makefile @@ -31,8 +31,6 @@ RUN_DEPENDS= R-cran-brio>=1.1.5:devel/R-cran-brio \ USES= cran:auto-plist,compiles -MAKE_ENV= LC_ALL=C.UTF-8 - do-test: @${FIND} ${WRKSRC} \( -name '*.o' -o -name '*.so' \) -delete @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \ diff --git a/devel/R-cran-vctrs/Makefile b/devel/R-cran-vctrs/Makefile index c7d95a62cc66..2081862ed7b3 100644 --- a/devel/R-cran-vctrs/Makefile +++ b/devel/R-cran-vctrs/Makefile @@ -35,8 +35,6 @@ TEST_DEPENDS= R-cran-bit64>0:devel/R-cran-bit64 \ USES= compiler:c++11-lang cran:auto-plist,compiles -MAKE_ENV= LC_ALL=C.UTF-8 - do-test: @${FIND} ${WRKSRC} \( -name '*.o' -o -name '*.so' \) -delete @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \ diff --git a/devel/aarch64-none-elf-gcc/Makefile b/devel/aarch64-none-elf-gcc/Makefile index dbc898bba0e0..a8cac18526a4 100644 --- a/devel/aarch64-none-elf-gcc/Makefile +++ b/devel/aarch64-none-elf-gcc/Makefile @@ -51,15 +51,6 @@ INSTALL_TARGET= install-gcc install-target-libgcc .include <bsd.port.pre.mk> -# Extraction fails with poudriere on aarch64 for GCC 11. -# It seems that the bug is specific to lang/gcc11 and lang/gcc12 only. -# No other GCC port is affected. -# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271052 -# and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246670 -.if ${ARCH} == aarch64 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar -.endif - post-patch: @${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \ ${WRKSRC}//gcc/cp/g++spec.c diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile index a5df89a190da..34bb3c3d4c95 100644 --- a/devel/cmake-doc/Makefile +++ b/devel/cmake-doc/Makefile @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} USES= cmake python:build qt:6 -USE_LOCALE= en_US.UTF-8 USE_QT= sqldriver-sqlite:build tools:build CMAKE_ARGS= -DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \ diff --git a/devel/cmake-man/Makefile b/devel/cmake-man/Makefile index 63fd86fe2433..d8bc71bf3ad5 100644 --- a/devel/cmake-man/Makefile +++ b/devel/cmake-man/Makefile @@ -12,7 +12,6 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} USES= cmake python:build -USE_LOCALE= en_US.UTF-8 CMAKE_ARGS= -DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \ -DCMAKE_MAN_DIR:STRING="share/man" diff --git a/devel/hs-cabal-plan/Makefile b/devel/hs-cabal-plan/Makefile index 75442be58d87..748ff739bd8a 100644 --- a/devel/hs-cabal-plan/Makefile +++ b/devel/hs-cabal-plan/Makefile @@ -11,8 +11,6 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.GPLv2 USES= cabal -USE_LOCALE= en_US.UTF-8 - USE_CABAL= OneTuple-0.4.2_1 \ QuickCheck-2.16.0.0 \ StateVar-1.2.2 \ diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile index c4e8727c808c..86076c6611e2 100644 --- a/devel/hs-git-annex/Makefile +++ b/devel/hs-git-annex/Makefile @@ -14,7 +14,6 @@ BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} USES= cabal perl5 -USE_LOCALE= en_US.UTF-8 USE_PERL5= build USE_CABAL= DAV-1.3.4 \ diff --git a/devel/hs-hadolint/Makefile b/devel/hs-hadolint/Makefile index 813f74e21b53..72e0b0c293da 100644 --- a/devel/hs-hadolint/Makefile +++ b/devel/hs-hadolint/Makefile @@ -12,8 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ghc:lang/ghc USES= cabal -USE_LOCALE= en_US.UTF-8 - USE_CABAL= Diff-1.0.2 \ HsYAML-0.2.1.5_1 \ OneTuple-0.4.3 \ diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile index 18fbf2638f70..9d937db0641f 100644 --- a/devel/hs-haskell-language-server/Makefile +++ b/devel/hs-haskell-language-server/Makefile @@ -31,8 +31,6 @@ GHC_VERSION= 9.8.4 USES= cabal -USE_LOCALE= C.UTF-8 - .for flavor in ${FLAVORS} . include "Makefile.cabal.${flavor}" .endfor diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile index 6ccd08f8a922..ca2047bf2b12 100644 --- a/devel/hs-hlint/Makefile +++ b/devel/hs-hlint/Makefile @@ -9,8 +9,6 @@ WWW= https://github.com/ndmitchell/hlint LICENSE= BSD3CLAUSE USES= cabal - -USE_LOCALE= C.UTF-8 USE_CABAL= OneTuple-0.4.2_1 \ QuickCheck-2.15.0.1_1 \ StateVar-1.2.2 \ diff --git a/devel/hs-ormolu/Makefile b/devel/hs-ormolu/Makefile index e5de8ebf9f34..60ab24e54cd4 100644 --- a/devel/hs-ormolu/Makefile +++ b/devel/hs-ormolu/Makefile @@ -11,8 +11,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= cabal -USE_LOCALE= C.UTF-8 - post-patch: ${REINPLACE_CMD} 's|jobs: 1|jobs: 2|' ${CABAL_HOME}/.cabal/config diff --git a/devel/ice37/Makefile b/devel/ice37/Makefile index 8fe6005fd70b..2936c28126b4 100644 --- a/devel/ice37/Makefile +++ b/devel/ice37/Makefile @@ -127,7 +127,7 @@ do-test-TEST-on: .for CONFIG in ${CONFIGS} @${ECHO} Testing configuration ${CONFIG} cd ${BUILD_WRKSRC} && \ - ${SETENV} LC_ALL=en_US.UTF-8 ${PYTHON_CMD} ./allTests.py \ + ${PYTHON_CMD} ./allTests.py \ --config=${CONFIG} \ $$(${TEST} $$(${IS_JAILED_CMD}) -eq 1 \ && ${ECHO} ${JAILED_FILTER}) diff --git a/devel/meson-python/Makefile b/devel/meson-python/Makefile index e0ce97139ac8..1fb79a480e0e 100644 --- a/devel/meson-python/Makefile +++ b/devel/meson-python/Makefile @@ -32,8 +32,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} \ USES= python USE_PYTHON= autoplist concurrent cython_test pep517 pytest -# tarball has UTF-8 filenames -EXTRACT_CMD= env LANG=C.UTF-8 LC_ALL=C.UTF-8 ${TAR} NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/py-appdirs/Makefile b/devel/py-appdirs/Makefile index 233a6d324c10..0b79793144f0 100644 --- a/devel/py-appdirs/Makefile +++ b/devel/py-appdirs/Makefile @@ -19,6 +19,5 @@ USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -USE_LOCALE= en_US.UTF-8 .include <bsd.port.mk> diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index 679ebc4f31c0..c7ab03b539f6 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -76,6 +76,6 @@ do-test: # Old invocation that we will probably need later # ${MKDIR} ${WRKDIR}/tmp -# cd ${WRKDIR}/tmp && TZ=UTC LANG=C PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot.test +# cd ${WRKDIR}/tmp && TZ=UTC PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot.test .include <bsd.port.mk> diff --git a/devel/py-configparser/Makefile b/devel/py-configparser/Makefile index 5c353617a0b2..4c9be3a0f0a5 100644 --- a/devel/py-configparser/Makefile +++ b/devel/py-configparser/Makefile @@ -15,7 +15,6 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR} USES= python -USE_LOCALE= en_US.UTF-8 USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile index 4786e6d5bdce..2459d5f1be3c 100644 --- a/devel/py-cookiecutter/Makefile +++ b/devel/py-cookiecutter/Makefile @@ -35,13 +35,8 @@ CPE_VENDOR= cookiecutter_project NO_ARCH= yes -# pytest needs a UTF-8 environment, and it will try and write outside -# ${WRKDIR} unless told not to. - -TEST_ENV= HOME=${WRKDIR} \ - LANG=C.UTF-8 \ - LC_ALL=C.UTF-8 \ - TMPDIR=${WRKDIR} +# pytest will try and write outside ${WRKDIR} unless told not to. +TEST_ENV= TMPDIR=${WRKDIR} # Windows specific test PYTEST_IGNORED_TESTS= test_run_shell_hooks_win diff --git a/devel/py-jupyter_console/Makefile b/devel/py-jupyter_console/Makefile index f760f07c2689..a78589cee28d 100644 --- a/devel/py-jupyter_console/Makefile +++ b/devel/py-jupyter_console/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter-core>=4.12:devel/py-jupyter-core@${P ${PYTHON_PKGNAMEPREFIX}traitlets>=5.4:devel/py-traitlets@${PY_FLAVOR} USES= python -USE_LOCALE= en_US.UTF-8 USE_PYTHON= autoplist pep517 NO_ARCH= yes diff --git a/devel/py-molecule/Makefile b/devel/py-molecule/Makefile index 468f09a18b95..1ee08fd368ea 100644 --- a/devel/py-molecule/Makefile +++ b/devel/py-molecule/Makefile @@ -48,10 +48,6 @@ USE_PYTHON= autoplist concurrent pep517 pytest # # Test failures. Only three tests fail: # test/unit/test_util.py ......FFF....................... [ 23%] -# -# The click module demands a UTF-8 locale when used with python-3.x -TEST_ENV= LANG=en_US.UTF-8 \ - LC_ALL=en_US.UTF-8 NO_ARCH= yes diff --git a/devel/py-pytest-plus/Makefile b/devel/py-pytest-plus/Makefile index 7a06cfb626da..1d90baafe081 100644 --- a/devel/py-pytest-plus/Makefile +++ b/devel/py-pytest-plus/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=7.4.2:devel/py-pytest@${PY_FLAVOR} USES= python USE_PYTHON= autoplist pep517 pytest -TEST_ENV= LC_ALL=C.UTF-8 PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/ +TEST_ENV= PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/ NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/py-python-magic/Makefile b/devel/py-python-magic/Makefile index 2d2c09cf8aca..3c898577a9d0 100644 --- a/devel/py-python-magic/Makefile +++ b/devel/py-python-magic/Makefile @@ -18,7 +18,7 @@ USES= python USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -TEST_ENV= LC_ALL=en_US.UTF-8 PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} USE_GITHUB= yes GH_ACCOUNT= ahupp diff --git a/devel/py-qt6-qscintilla2/Makefile b/devel/py-qt6-qscintilla2/Makefile index d54fb9b69139..040856689762 100644 --- a/devel/py-qt6-qscintilla2/Makefile +++ b/devel/py-qt6-qscintilla2/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libqscintilla2_qt6.so:devel/qscintilla2@qt6 USES= python pyqt:6 gl qt:6 USE_GL= gl -USE_LOCALE= C.UTF-8 USE_PYQT= pyqt6 qtbuilder:build sip:build USE_PYTHON= concurrent flavors USE_QT= base diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile index ac86d221bd61..9b85ba66c3a6 100644 --- a/devel/py-wheel/Makefile +++ b/devel/py-wheel/Makefile @@ -25,8 +25,6 @@ USE_PYTHON+= pytest TEST_ENV= PYTHONPATH="${STAGEDIR}${PYTHON_SITELIBDIR}" .endif -# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268500 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/py-wheel044/Makefile b/devel/py-wheel044/Makefile index b74ea431f96a..5befbd05c55e 100644 --- a/devel/py-wheel044/Makefile +++ b/devel/py-wheel044/Makefile @@ -20,8 +20,6 @@ USE_PYTHON= allflavors autoplist concurrent pep517 PORTSCOUT= ignore:1 -# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268500 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar NO_ARCH= yes post-install: diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 22ccf4bc25d1..98dc60c299f7 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -40,7 +40,6 @@ USES= cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \ USE_GL= egl opengl USE_GNOME= cairo gdkpixbuf glib20 gtk30 pango USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -USE_LOCALE= C.UTF-8 SHEBANG_FILES= ${WRKSRC}/libexec/qt-android-runner.py \ ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ diff --git a/devel/radicle/Makefile b/devel/radicle/Makefile index 27389fd96554..726f64b09e3d 100644 --- a/devel/radicle/Makefile +++ b/devel/radicle/Makefile @@ -47,7 +47,7 @@ generate-tarball: ${GIT_HEAD} | ${TAR} xf - ${FIND} ${DISTNAME} -print0 | \ ${XARGS} -0r ${TOUCH} -d '1970-01-01T00:00:00Z' - ${FIND} ${DISTNAME} -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${DISTNAME} -print0 | ${SORT} -z | \ sudo ${TAR} --owner=0 --group=0 --numeric-owner --no-recursion \ --null -T - -cf - ${DISTNAME} | \ ${GZIP_CMD} -9n >${DISTNAME}.tar.gz diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile index 586229157369..bf4580cf5b3a 100644 --- a/devel/tcllib/Makefile +++ b/devel/tcllib/Makefile @@ -16,7 +16,6 @@ OPTIONS_DEFINE?=DOCS MANPAGES OPTIONS_SUB= yes USES+= tcl tar:xz -USE_LOCALE= en_US.UTF-8 GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}" TEST_TARGET= test diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile index f41ce20c3713..26d34851f816 100644 --- a/dns/libpsl/Makefile +++ b/dns/libpsl/Makefile @@ -21,7 +21,6 @@ MESON_ARGS= --default-library=both \ -Dpsl_file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \ -Dpsl_testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt USE_LDCONFIG= yes -USE_LOCALE= en_US.UTF-8 SHEBANG_FILES= src/psl-make-dafsa TEST_TARGET= test diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile index 3451d82a0156..07eaf546a23d 100644 --- a/editors/kakoune/Makefile +++ b/editors/kakoune/Makefile @@ -22,7 +22,6 @@ OPTIONS_DEFINE= DEBUG DOCS DEBUG_MAKE_ARGS= debug=yes TEST_TARGET= test -TEST_ENV+= LC_ALL=en_US.UTF-8 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/kak diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index fc8c6a343d21..93243bd79088 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -137,7 +137,6 @@ USE_GL= gl glew glu USE_GNOME= cairo glib20 libxml2 libxslt USE_PERL5= build USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender -USE_LOCALE?= en_US.UTF-8 USES+= elfctl ELF_FEATURES= +wxneeded:instdir/program/soffice.bin diff --git a/editors/tea/Makefile b/editors/tea/Makefile index 039754a7ca8a..eb2cacaff3c5 100644 --- a/editors/tea/Makefile +++ b/editors/tea/Makefile @@ -19,7 +19,6 @@ SPELL_DESC= Spell checker backend USE_QT= base USE_GL= opengl -USE_LOCALE= en_US.UTF-8 USE_GITHUB= yes GH_ACCOUNT= psemiletov diff --git a/emulators/elliott-803/Makefile b/emulators/elliott-803/Makefile index 33eaa0a00dc5..7cd0a6385720 100644 --- a/emulators/elliott-803/Makefile +++ b/emulators/elliott-803/Makefile @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++17-lang ncurses MAKE_ARGS+= DATADIR="${DATADIR}" PREFIX="${PREFIX}" VERSION="${PKGVERSION}" MAN1_DIR="${STAGEDIR}/${PREFIX}/share/man/man1" -MAKE_ENV+= LC_ALL=en_US.UTF-8 USE_GITHUB= yes GH_ACCOUNT= hxw diff --git a/filesystems/py-dfvfs/Makefile b/filesystems/py-dfvfs/Makefile index b0bf7cf7ab53..46a700a58a07 100644 --- a/filesystems/py-dfvfs/Makefile +++ b/filesystems/py-dfvfs/Makefile @@ -47,14 +47,10 @@ RUN_DEPENDS= libbde>=a:filesystems/libbde \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR} USES= python -USE_LOCALE= en_US.UTF-8 USE_PYTHON= autoplist cryptography pep517 DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${PYTHON_CMD} TEST_TARGET= run_tests.py NO_ARCH= yes -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - .include <bsd.port.mk> diff --git a/finance/fava/Makefile b/finance/fava/Makefile index e3f7304b2ac9..3719906c5877 100644 --- a/finance/fava/Makefile +++ b/finance/fava/Makefile @@ -31,8 +31,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.11:devel/py-babel@${PY_FLAVOR} \ USES= python # same as finance/beancount USE_PYTHON= autoplist distutils noflavors -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar NO_ARCH= yes post-patch: diff --git a/finance/hs-hledger-ui/Makefile b/finance/hs-hledger-ui/Makefile index 6b2bbf2e3bf8..1d4c3ce33506 100644 --- a/finance/hs-hledger-ui/Makefile +++ b/finance/hs-hledger-ui/Makefile @@ -14,6 +14,5 @@ BROKEN_FreeBSD_16= compilation fails: ghc SEGVs, see https://bugs.freebsd.org/bu LIB_DEPENDS= libinotify.so:devel/libinotify USES= cabal -USE_LOCALE= C.UTF-8 .include <bsd.port.mk> diff --git a/finance/hs-hledger-web/Makefile b/finance/hs-hledger-web/Makefile index 4de4cf0dc4e7..034c44d00c4c 100644 --- a/finance/hs-hledger-web/Makefile +++ b/finance/hs-hledger-web/Makefile @@ -10,6 +10,5 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cabal -USE_LOCALE= en_US.UTF-8 .include <bsd.port.mk> diff --git a/finance/hs-hledger/Makefile b/finance/hs-hledger/Makefile index d2144b54d8e6..2d4acf121fba 100644 --- a/finance/hs-hledger/Makefile +++ b/finance/hs-hledger/Makefile @@ -10,6 +10,5 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cabal -USE_LOCALE= en_US.UTF-8 .include <bsd.port.mk> diff --git a/french/aster/Makefile b/french/aster/Makefile index e933c10d50e6..09c6a7933fa2 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -59,7 +59,6 @@ MAKE_ENV= INCLUDES="${LOCALBASE}/include" \ INCLUDEDIR="${LOCALBASE}/include" \ LD_PRELOAD="${LOCALBASE}/lib/gcc${_GCC_VER}/libgcc_s.so.1" \ PYTHONPATH="${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV" \ - PYTHONIOENCODING="utf-8" LANG=C LC_ALL="en_US.UTF-8" \ LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}" REINPLACE_ARGS= -i "" diff --git a/games/blackjackclient/Makefile b/games/blackjackclient/Makefile index e46d36f4fad8..1a14ce9a7bce 100644 --- a/games/blackjackclient/Makefile +++ b/games/blackjackclient/Makefile @@ -21,8 +21,7 @@ post-extract-script: @${ECHO_CMD} "Main-Class: ${PORTNAME}" > ${WRKDIR}/src/MANIFEST.MF do-build: - (cd ${WRKDIR}/src && ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ - ${JAVAC} ${PORTNAME}.java) + (cd ${WRKDIR}/src && ${JAVAC} ${PORTNAME}.java) post-build-script: @cd ${WRKDIR}/src && \ diff --git a/games/devd-controller-rules/Makefile b/games/devd-controller-rules/Makefile index c17f4ca9a430..bf5d0c1463fc 100644 --- a/games/devd-controller-rules/Makefile +++ b/games/devd-controller-rules/Makefile @@ -16,7 +16,6 @@ LICENSE= MIT ZLIB LICENSE_COMB= multi USES= ruby:build -USE_LOCALE= en_US.UTF-8 SDL_COMMIT= a882afafe55501711593d96f8f0f59f0e3adf3ee diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile index ad747036770c..f4ec3150d91c 100644 --- a/games/doomsday/Makefile +++ b/games/doomsday/Makefile @@ -31,9 +31,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} PORTSCOUT= limit:^\d+\.\d+\.\d+$$ post-patch: - # Removing (three) non-ascii bytes from the beginning of the file - @${REINPLACE_CMD} '1s,^...,,' \ - ${WRKSRC}/apps/client/src/client/cl_sound.cpp @${REINPLACE_CMD} -E -e 's|(DENG_DISTRIB_DIR /usr)|\1/local|' \ -e 's|python3|${PYTHON_VERSION}|' \ ${WRKSRC}/cmake/Config.cmake diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile index 7b5ff7f445b3..aa500fa61a8a 100644 --- a/games/jchessboard/Makefile +++ b/games/jchessboard/Makefile @@ -12,7 +12,6 @@ WWW= https://jchessboard.sourceforge.net/ LICENSE= GPLv2 USES= java:ant,run tar:tgz -USE_LOCALE= en_US.ISO8859-1 NO_ARCH= yes diff --git a/games/luanti/Makefile b/games/luanti/Makefile index 784b6ee4dd99..2974f96de93c 100644 --- a/games/luanti/Makefile +++ b/games/luanti/Makefile @@ -22,7 +22,7 @@ CMAKE_ARGS= -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \ CMAKE_ON= ENABLE_SYSTEM_JSONCPP CMAKE_OFF= BUILD_DOCUMENTATION -TEST_ENV= ${MAKE_ENV} LC_ALL=C.UTF-8 +TEST_ENV= ${MAKE_ENV} LDFLAGS_i386= -Wl,-znotext diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile index 7be45ec336a4..6a2d0f6d0510 100644 --- a/graphics/jogl/Makefile +++ b/graphics/jogl/Makefile @@ -30,7 +30,6 @@ USES= gl java:ant,run xorg zip USE_XORG= x11 xau xdamage xdmcp xext xfixes xorgproto xt xxf86vm USE_GL= gl USE_LDCONFIG= yes -USE_LOCALE= en_US.UTF-8 # gluegen/src/java/net/highteq/nativetaglet/NativeTaglet.java:3: error: package com.sun.tools.doclets does not exist JAVA_VERSION= 8 NO_SHLIB_REQUIRES_GLOB= libjawt.so libjvm.so diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile index 0d430cfaecd6..ed0054ffb9d3 100644 --- a/graphics/oidn/Makefile +++ b/graphics/oidn/Makefile @@ -65,7 +65,7 @@ pre-fetch: ${RM} -r ${WRKDIR} \ ) && \ ${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - ${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -print0 | ${SORT} -z | \ ${TAR} czf ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ ${RM} -r ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}; \ fi diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile index 7c9b8a8cc0e1..739d550f2ec1 100644 --- a/graphics/poppler-qt5/Makefile +++ b/graphics/poppler-qt5/Makefile @@ -1,9 +1,6 @@ COMMENT= Qt 5 bindings to poppler -# needed for tests -USE_LOCALE= en_US.UTF-8 - MASTERDIR= ${.CURDIR}/../../graphics/poppler _SLAVE_PORT= qt5 PLIST= ${.CURDIR}/pkg-plist diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 96e4d0f2fdcf..b7d38067f6ae 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -162,7 +162,7 @@ TESTIMAGES= ${MASTERDIR}/testimages # _check_version strips stuffixes from distnames etc. that do not appear # in the program's version numbering _check_version= ${PKGVERSION:C/.g0//} -_env= LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME="$$TMP" RT_SETTINGS=${WRKDIR}/rt-config RT_CACHE="$$TMP/rtcache" +_env= LANGUAGE= DISPLAY= HOME="$$TMP" RT_SETTINGS=${WRKDIR}/rt-config RT_CACHE="$$TMP/rtcache" post-install: @${RM} -f ${WRKDIR}/selftest.exitcodes ${WRKDIR}/selftest.expect @(set -e; _mp=$$(/bin/df -P ${STAGEDIR}${PREFIX}/bin/rawtherapee | ${AWK} 'NR==2{print $$NF}') ; \ diff --git a/japanese/fcitx5-hazkey/Makefile b/japanese/fcitx5-hazkey/Makefile index b95ea90e603f..6fea22ea0480 100644 --- a/japanese/fcitx5-hazkey/Makefile +++ b/japanese/fcitx5-hazkey/Makefile @@ -59,8 +59,7 @@ make-swift-packages-cache: extract ${SETENV} ${MAKE_ENV} ${LOCALBASE}/swift6/bin/swift package \ --scratch-path=${WRKDIR}/swift-packages-cache \ resolve - @${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ - ${TAR} -czf ${WRKDIR}/${PORTNAME}-${DISTVERSION}-swift-packages${EXTRACT_SUFX} \ + @${TAR} -czf ${WRKDIR}/${PORTNAME}-${DISTVERSION}-swift-packages${EXTRACT_SUFX} \ -C ${WRKDIR} swift-packages-cache .include <bsd.port.mk> diff --git a/japanese/font-myrica/Makefile b/japanese/font-myrica/Makefile index 012839b402b2..8948f4b633a0 100644 --- a/japanese/font-myrica/Makefile +++ b/japanese/font-myrica/Makefile @@ -22,9 +22,6 @@ SUB_FILES= pkg-install WRKSRC= ${WRKDIR}/${DISTNAME} PORTDOCS= LICENSE_M+.txt LICENSE_OFL.txt README.md -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= DOCS do-install: diff --git a/japanese/font-myricam/Makefile b/japanese/font-myricam/Makefile index 5376adae8784..df9f92dfa382 100644 --- a/japanese/font-myricam/Makefile +++ b/japanese/font-myricam/Makefile @@ -22,9 +22,6 @@ SUB_FILES= pkg-install WRKSRC= ${WRKDIR}/${DISTNAME} PORTDOCS= LICENSE_M+.txt LICENSE_OFL.txt README.md -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= DOCS do-install: diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index 46196a4589ce..eb6c4bc41e36 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -46,9 +46,6 @@ CONFIGURE_SHELL= ${bash_CMD} TEST_TARGET= check -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= DOCS PLUGIN PLUGINJAR RHINO RUST TAGSOUP OPTIONS_DEFAULT=PLUGINJAR RUST OPTIONS_SUB= yes diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile index 1935999e8323..88a76d7affe6 100644 --- a/java/jfreechart/Makefile +++ b/java/jfreechart/Makefile @@ -19,7 +19,6 @@ COMPILE_DESC= Build from source COMPILE_USES= java:ant,run COMPILE_USES_OFF= java -COMPILE_USE= LOCALE=en_US.UTF-8 COMPILE_ALL_TARGET= compile COMPILE_VARS_OFF= NO_BUILD=yes COMPILE_MAKE_ARGS+= -Dsrc.version=1.8 -Dtarget.version=1.8 diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 43303bebf2d6..f69a96e8459a 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -44,9 +44,7 @@ NO_CCACHE= yes # Suppress passing -j to do-build target via Mk/bsd.port.mk # In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N _MAKE_JOBS= # -MAKE_ENV= LANG="C" \ - LC_ALL="C" \ - CLASSPATH="" \ +MAKE_ENV= CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ CC=${CC} \ diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index f86d1ce4b6e5..1fd880c3f7f1 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -43,9 +43,7 @@ NO_CCACHE= yes # Suppress passing -j to do-build target via Mk/bsd.port.mk # In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N _MAKE_JOBS= -MAKE_ENV= LANG="C" \ - LC_ALL="C" \ - CLASSPATH="" \ +MAKE_ENV= CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ CC=${CC} \ diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile index 6a5e27a82984..4d7e9b14ffd7 100644 --- a/java/openjdk21/Makefile +++ b/java/openjdk21/Makefile @@ -44,9 +44,7 @@ NO_CCACHE= yes # Suppress passing -j to do-build target via Mk/bsd.port.mk # In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N _MAKE_JOBS= # -MAKE_ENV= LANG="C" \ - LC_ALL="C" \ - CLASSPATH="" \ +MAKE_ENV= CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ CC=${CC} \ diff --git a/korean/hunspell/Makefile b/korean/hunspell/Makefile index 5cf5460ad492..07d77b45f855 100644 --- a/korean/hunspell/Makefile +++ b/korean/hunspell/Makefile @@ -29,7 +29,7 @@ PLIST_FILES= ${DATADIR}/ko_KR.aff \ ${DATADIR}/ko_KR.dic TEST_TARGET= test -TEST_ENV+= GMAKE=${GMAKE} LC_ALL=en_US.UTF-8 +TEST_ENV+= GMAKE=${GMAKE} pre-build: .for f in Makefile tests/Makefile diff --git a/lang/bun/Makefile b/lang/bun/Makefile index 59bd8c9e5fef..bead3e24c67d 100644 --- a/lang/bun/Makefile +++ b/lang/bun/Makefile @@ -158,7 +158,7 @@ do-fetch: (cd $$_NSrc && \ ${FIND} node_modules packages/bun-error/node_modules \ src/node-fallbacks/node_modules -print0 \ - | LC_ALL=C ${SORT} -z \ + | ${SORT} -z \ | ${SETENV} -i ${TAR} czf ${DD}/bun-node-modules-${DISTVERSION}.tar.gz \ --format=cpio --gid 0 --uid 0 --options gzip:!timestamp \ --no-recursion --null -T -) && \ @@ -183,7 +183,7 @@ do-fetch: ( cd $$_DTmp && \ ${FIND} tarballs -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ ${FIND} tarballs -print0 \ - | LC_ALL=C ${SORT} -z \ + | ${SORT} -z \ | ${SETENV} -i ${TAR} czf ${DD}/bun-dep-tarballs-${DISTVERSION}.tar.gz \ --format=cpio --gid 0 --uid 0 --options gzip:!timestamp \ --no-recursion --null -T - ); \ @@ -199,7 +199,7 @@ do-fetch: ${FIND} $$_LTmp/c-api/vendor -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ ( cd $$_LTmp/c-api && \ ${FIND} vendor -print0 \ - | LC_ALL=C ${SORT} -z \ + | ${SORT} -z \ | ${SETENV} -i ${TAR} czf ${DD}/bun-cargo-vendor-lolhtml-${DISTVERSION}.tar.gz \ --format=cpio --gid 0 --uid 0 --options gzip:!timestamp \ --no-recursion --null -T - ) && \ diff --git a/lang/elixir-devel/Makefile b/lang/elixir-devel/Makefile index 9c2407a0ba2f..b976f0e315ee 100644 --- a/lang/elixir-devel/Makefile +++ b/lang/elixir-devel/Makefile @@ -20,7 +20,6 @@ USES= gmake USE_GITHUB= yes GH_ACCOUNT= elixir-lang -USE_LOCALE= en_US.UTF-8 MAKE_ENV+= MAN_PREFIX=${PREFIX}/share/man \ PATH="${LOCALBASE}/lib/erlang${_ERLANG_VER}/bin:${PATH}" ALL_TARGET= # empty diff --git a/lang/elixir/Makefile b/lang/elixir/Makefile index 4d030e12ea06..68067646eb73 100644 --- a/lang/elixir/Makefile +++ b/lang/elixir/Makefile @@ -19,7 +19,6 @@ USES= gmake USE_GITHUB= yes GH_ACCOUNT= elixir-lang -USE_LOCALE= en_US.UTF-8 MAKE_ENV+= MAN_PREFIX=${PREFIX}/share/man \ PATH="${LOCALBASE}/lib/erlang${ERLANG_VER}/bin:${PATH}" ALL_TARGET= # empty diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile index dea34f60c2e5..a4447297efcc 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -74,15 +74,6 @@ GRAPHITE_CONFIGURE_WITH+= isl CONFIGURE_ARGS+= --with-long-double-format=ieee .endif -# Extraction fails with poudriere on aarch64 for GCC 12. -# It seems that the bug is specific to lang/gcc11 and lang/gcc12 only. -# No other GCC port is affected. -# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271052 -# and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246670 -.if ${ARCH} == aarch64 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar -.endif - .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index abb7202efc1c..a8db93761b64 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -27,7 +27,6 @@ CONFIGURE_ARGS+= --docdir=${DOCSDIR} CONFIGURE_ENV= CC=${CC} CXX=${CXX} CPP=${CPP} GHC=${BOOT_GHC} \ ALEX=/usr/bin/true HAPPY=/usr/bin/true CONFIGURE_TARGET= ${GHC_ARCH}-portbld-${OPSYS:tl} -USE_LOCALE= en_US.UTF-8 NO_CCACHE= yes OPTIONS_SUB= yes SHEBANG_FILES= ${BOOT_SCRIPT} \ diff --git a/lang/go/bsd.go.mk b/lang/go/bsd.go.mk index dfa08e1a97fc..2faeedaadc4d 100644 --- a/lang/go/bsd.go.mk +++ b/lang/go/bsd.go.mk @@ -49,8 +49,6 @@ REINPLACE_ARGS= -i'' # Example: 1.24.2 matches go124, 1.25.2 matches go125, etc. PORTSCOUT?= limit:^${DISTVERSION:R:S/./\./g}\. -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} BASH?= ${LOCALBASE}/bin/bash OPTIONS_DEFINE_i386= SOFTFLOAT diff --git a/lang/kefir/Makefile b/lang/kefir/Makefile index 43fa7eb1c423..033f0404529b 100644 --- a/lang/kefir/Makefile +++ b/lang/kefir/Makefile @@ -27,7 +27,6 @@ MAKE_ARGS= prefix=${PREFIX} MAKE_ARGS+= PROFILE=debug .endif -TEST_ENV= LC_ALL=C.UTF-8 TEST_TARGET= test .include <bsd.port.mk> diff --git a/lang/purescript/Makefile b/lang/purescript/Makefile index 6f123dd0152d..797d66e936eb 100644 --- a/lang/purescript/Makefile +++ b/lang/purescript/Makefile @@ -17,8 +17,6 @@ USES= cabal USE_GITHUB= yes GH_TUPLE= purescript:cheapskate:633c69024e061ad956f1aecfc137fb99a7a7a20b:cheapskate/dist-newstyle/src/cheapskate-2b7d9040a6c99dc66a75cbbf8e892de170830ff08b4c515e8a6898af1e6b078a -USE_LOCALE= en_US.UTF-8 - BINARY_ALIAS= git=true USE_CABAL= Glob-0.10.2_3 \ diff --git a/math/apache-commons-math/Makefile b/math/apache-commons-math/Makefile index bb12067a07ad..d4f102eac40f 100644 --- a/math/apache-commons-math/Makefile +++ b/math/apache-commons-math/Makefile @@ -17,7 +17,6 @@ WWW= https://commons.apache.org/proper/commons-math/ LICENSE= APACHE20 USES= java:ant,run -USE_LOCALE= en_US.ISO8859-1 ALL_TARGET= compile jar MAKE_ARGS= -Dlibdir=${WRKDIR} -Dnoget=true diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile index 9379fafdc364..81b3d77ba1dd 100644 --- a/math/hs-Agda/Makefile +++ b/math/hs-Agda/Makefile @@ -15,9 +15,6 @@ BROKEN_i386= compiler goes out of memory BUILD_DEPENDS= emacs:editors/emacs@nox USES= cabal - -USE_LOCALE= en_US.UTF-8 - USE_CABAL= ListLike-4.7.8.4 \ OneTuple-0.4.2_1 \ QuickCheck-2.16.0.0 \ diff --git a/math/py-matplotlib-scalebar/Makefile b/math/py-matplotlib-scalebar/Makefile index fb44fdb9a68a..42cf907d365f 100644 --- a/math/py-matplotlib-scalebar/Makefile +++ b/math/py-matplotlib-scalebar/Makefile @@ -20,7 +20,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ruff>=0.5.0:devel/py-ruff@${PY_FLAVOR} USES= python -USE_LOCALE= en_US.UTF-8 USE_PYTHON= autoplist pep517 pytest NO_ARCH= yes diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile index 4607c3fc1695..b50bc94c242d 100644 --- a/math/scilab-toolbox-swt/Makefile +++ b/math/scilab-toolbox-swt/Makefile @@ -14,7 +14,6 @@ BUILD_DEPENDS= ${SCILAB_CMD}:math/scilab RUN_DEPENDS:= ${BUILD_DEPENDS} USES= dos2unix zip -USE_LOCALE= en_US.UTF-8 SCILAB_CMD= ${LOCALBASE}/bin/scilab-adv-cli SCILAB_ARGS= -noatomsautoload -nb -nouserstartup diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 5d13ba523fe9..a2690f1796a9 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -31,7 +31,6 @@ USES= compiler:c++17-lang cpe desktop-file-utils eigen:3,build \ localbase ncurses pathfix pkgconfig shared-mime-info USE_GNOME= libxml2 JAVA_VERSION= 8 -USE_LOCALE= en_US.UTF-8 GNU_CONFIGURE= yes diff --git a/math/ttmath/Makefile b/math/ttmath/Makefile index c557ae9f1e33..689913732afb 100644 --- a/math/ttmath/Makefile +++ b/math/ttmath/Makefile @@ -27,7 +27,7 @@ do-fetch: git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \ (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${GIT_TAG} && ${RM} -r .git) && \ ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | ${SORT} -z | \ ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \ fi diff --git a/misc/gemini-cli/Makefile b/misc/gemini-cli/Makefile index d8d23d451ffb..c5de37388afb 100644 --- a/misc/gemini-cli/Makefile +++ b/misc/gemini-cli/Makefile @@ -49,7 +49,7 @@ do-fetch: ${LN} -sf ../lib/node_modules/${PACKAGE_NAME}/bundle/gemini.js bin/gemini && \ ${RM} -rf node_modules package.json && \ ${FIND} ${WRKDIR} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - cd ${WRKDIR} && ${FIND} ${PORTNAME}-${DISTVERSION} -print0 | LC_ALL=C ${SORT} -z | \ + cd ${WRKDIR} && ${FIND} ${PORTNAME}-${DISTVERSION} -print0 | ${SORT} -z | \ ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - \ ); fi diff --git a/misc/py-spdx-tools/Makefile b/misc/py-spdx-tools/Makefile index b5546983d48d..d43e78fb1c1d 100644 --- a/misc/py-spdx-tools/Makefile +++ b/misc/py-spdx-tools/Makefile @@ -31,7 +31,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tzdata>=0:devel/py-tzdata@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 pytest -TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} LC_ALL=en_US.UTF-8 +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} NO_ARCH= yes PORTEXAMPLES= * diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 9ee27dd702e5..a4c84002b9ad 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -25,8 +25,6 @@ CMAKE_ON= ENABLE_GIO CMAKE_OFF= ENABLE_TESTS CMAKE_TESTING_ON= ENABLE_TESTS -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= AUDIO_THUMBNAILER THUMBNAILER OPTIONS_DEFAULT= AUDIO_THUMBNAILER THUMBNAILER OPTIONS_SUB= yes diff --git a/multimedia/py-pymediainfo/Makefile b/multimedia/py-pymediainfo/Makefile index 7111c41a7f56..1ec85c915dc3 100644 --- a/multimedia/py-pymediainfo/Makefile +++ b/multimedia/py-pymediainfo/Makefile @@ -19,9 +19,6 @@ RUN_DEPENDS= mediainfo>0:multimedia/mediainfo USES= python USE_PYTHON= autoplist pep517 pytest -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=C.UTF-8 ${TAR} - NO_ARCH= yes .include <bsd.port.mk> diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile index 02d0532ca927..2c7b6c71b19b 100644 --- a/net/gerbera/Makefile +++ b/net/gerbera/Makefile @@ -82,7 +82,7 @@ TEST_BUILD_DEPENDS= googletest>=0:devel/googletest TEST_CMAKE_BOOL= WITH_TESTS TEST_TEST_TARGET= test TEST_IMPLIES= CURL DUKTAPE -TEST_ENV= LC_ALL=C.UTF-8 CTEST_PARALLEL_LEVEL=${MAKE_JOBS_NUMBER} +TEST_ENV= CTEST_PARALLEL_LEVEL=${MAKE_JOBS_NUMBER} .include <bsd.port.options.mk> diff --git a/net/py-ldap0/Makefile b/net/py-ldap0/Makefile index 7bcdce2055bd..71c942136bff 100644 --- a/net/py-ldap0/Makefile +++ b/net/py-ldap0/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1@${PY_FLAVOR} \ TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server USES= ldap:24 localbase python -USE_LOCALE= en_US.UTF-8 USE_PYTHON= autoplist distutils USE_GITLAB= yes diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile index 8b6406e9273e..454d8a62bf00 100644 --- a/net/py-urllib3/Makefile +++ b/net/py-urllib3/Makefile @@ -34,8 +34,7 @@ USE_PYTHON= autoplist concurrent cryptography_test pep517 pytest NO_ARCH= yes PYTEST_IGNORED_TESTS= test_ssl_read_timeout -TEST_ENV= LC_ALL=en_US.UTF-8 \ - PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} SUB_FILES= pkg-message diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index 90ea1c688faa..bc41f59c3d99 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= erlang-runtime${_ERLANG_VER}>=${_ERLANG_VER}:lang/erlang-runtime${_ USES= cpe shebangfix tar:xz CPE_VENDOR= pivotal_software -USE_LOCALE= en_US.UTF-8 USE_RC_SUBR= ${PORTNAME} NO_ARCH= yes diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile index 28486bd8cfe9..57e87edb27a7 100644 --- a/ports-mgmt/porttree/Makefile +++ b/ports-mgmt/porttree/Makefile @@ -28,7 +28,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/src/porttree.1 ${STAGEDIR}${PREFIX}/share/man/man1 do-test: - LC_ALL="en_US.UTF-8" ${WRKSRC}/tests/tests.sh + ${WRKSRC}/tests/tests.sh # maintainer section: # require: devel/subversion-lts or devel/subversion diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index 27fe8fe1170a..d4c9b606c168 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -132,7 +132,7 @@ LIB_DEPENDS+= libinotify.so:devel/libinotify # sanity check that we don't inherit incompatible SSL libs through, # for instance, pkcs11-helper: post-build: - @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ + @a=$$(ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ | ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\ if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 2a5998c9dfa8..b2a2690571c3 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -149,7 +149,7 @@ post-configure: # for instance, pkcs11-helper: _tlslibs=libssl libcrypto post-build: - @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ + @a=$$(ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ | ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\ if test "$$*" != "1" ; then ( set -x ; ldd -a ${WRKSRC}/src/openvpn/openvpn ) ; ${PRINTF} '%s\n' "$$a" ; ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi diff --git a/security/py-maec/Makefile b/security/py-maec/Makefile index 67bfac3f499f..e9fb9d574dfe 100644 --- a/security/py-maec/Makefile +++ b/security/py-maec/Makefile @@ -24,7 +24,6 @@ GH_PROJECT= python-${PORTNAME} NO_ARCH= yes USES= python USE_PYTHON= concurrent distutils autoplist -USE_LOCALE= en_US.UTF-8 PORTDOCS= README.rst PORTEXAMPLES= * diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile index 5dccf3b21350..10b5058ae528 100644 --- a/security/py-plaso/Makefile +++ b/security/py-plaso/Makefile @@ -58,10 +58,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FL ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} USES= python -USE_LOCALE= en_US.UTF-8 USE_PYTHON= autoplist concurrent cryptography pep517 -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} ${TAR} DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${PYTHON_CMD} TEST_TARGET= run_tests.py diff --git a/security/py-pyopenssl/Makefile b/security/py-pyopenssl/Makefile index b601c7ba63c0..473129eafe44 100644 --- a/security/py-pyopenssl/Makefile +++ b/security/py-pyopenssl/Makefile @@ -35,8 +35,7 @@ NO_ARCH= yes # will fail. PYTEST_IGNORED_TESTS= test_connect_ex \ test_connect_refused -TEST_ENV= LC_ALL=en_US.UTF-8 \ - PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} CPE_VENDOR= jean-paul_calderone diff --git a/security/xca/Makefile b/security/xca/Makefile index 9869c5381c14..e3ad3eba4475 100644 --- a/security/xca/Makefile +++ b/security/xca/Makefile @@ -20,7 +20,6 @@ qt6_CONFLICTS_INSTALL= ${PORTNAME} USES= cmake compiler:c++17-lang desktop-file-utils localbase \ pkgconfig shared-mime-info ssl -USE_LOCALE= en_US.UTF-8 .if ${FLAVOR} == qt5 USES+= qt:5 diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 012c4286f18e..bbab21e2fdf5 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -40,10 +40,6 @@ ZFS_RUN_DEPENDS= bash-completion-zfs>=0:shells/bash-completion-zfs .include <bsd.port.options.mk> -.if ${ARCH} == riscv64 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar -.endif - post-configure: @${REINPLACE_CMD} \ -e 's|/etc/ssl/openssl.cnf|${PREFIX}& &|g' \ diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 9b7aad6738c3..515143c7a6ea 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -29,7 +29,7 @@ python_OLD_CMD= /Users/kbreit/Documents/Programming/ansible_collections/cisco/me NO_ARCH= yes -DO_MAKE_TEST= env LC_ALL=C.UTF-8 ansible -m ping +DO_MAKE_TEST= ansible -m ping TEST_TARGET= localhost post-patch: diff --git a/sysutils/kleene-daemon/Makefile b/sysutils/kleene-daemon/Makefile index 4f652086418b..d0af6c3d1e28 100644 --- a/sysutils/kleene-daemon/Makefile +++ b/sysutils/kleene-daemon/Makefile @@ -27,8 +27,6 @@ USE_RC_SUBR= kleened MAKE_ENV+= ERL_LIBS='' \ HEX_HOME=${WRKDIR}/.hex \ HEX_OFFLINE=true \ - LANG=en_US_UTF-8 \ - LC_ALL=en_US.UTF-8 \ MIX_ARCHIVES=${WRKDIR} \ MIX_ENV=prod \ MIX_HOME=${WRKDIR}/.mix \ diff --git a/sysutils/openvox-agent8/Makefile b/sysutils/openvox-agent8/Makefile index a6f241ef0901..3ee6e5ddb239 100644 --- a/sysutils/openvox-agent8/Makefile +++ b/sysutils/openvox-agent8/Makefile @@ -104,7 +104,7 @@ post-patch: ${WRKSRC}/lib/puppet/gettext/config.rb do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ + @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ --localedir=${RUBY_SITELIBDIR}/puppet/locales --publicdir=/var/puppet/state/ post-install: @@ -115,7 +115,7 @@ post-install: (cd ${WRKDIR}/puppetlabs-${module:C/=.*//}-${module:C/.*=//} && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/vendor_modules/${module:C/=.*//}) .endfor ${MKDIR} ${STAGEDIR}/var/puppet - ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ + ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ --vardir=/var/puppet \ diff --git a/sysutils/puppet8/Makefile b/sysutils/puppet8/Makefile index f81e28e97f79..8bfc637f8fb7 100644 --- a/sysutils/puppet8/Makefile +++ b/sysutils/puppet8/Makefile @@ -100,7 +100,7 @@ post-patch: ${WRKSRC}/lib/puppet/gettext/config.rb do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ + @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ --localedir=${RUBY_SITELIBDIR}/puppet/locales --publicdir=/var/puppet/state/ post-install: @@ -111,7 +111,7 @@ post-install: (cd ${WRKDIR}/puppetlabs-${module:C/=.*//}-${module:C/.*=//} && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/vendor_modules/${module:C/=.*//}) .endfor ${MKDIR} ${STAGEDIR}/var/puppet - ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ + ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ --vardir=/var/puppet \ diff --git a/sysutils/py-ansible-compat/Makefile b/sysutils/py-ansible-compat/Makefile index 8c4d77c303cc..bf0a4e02ef13 100644 --- a/sysutils/py-ansible-compat/Makefile +++ b/sysutils/py-ansible-compat/Makefile @@ -31,7 +31,7 @@ USE_PYTHON= autoplist pep517 pytest WRKSRC= ${WRKDIR}/ansible_compat-${PORTVERSION} -TEST_ENV= LC_ALL=C.UTF-8 PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/ +TEST_ENV= PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/ NO_ARCH= yes diff --git a/sysutils/py-ansible-lint/Makefile b/sysutils/py-ansible-lint/Makefile index 9f402bf11120..ec24c20c259a 100644 --- a/sysutils/py-ansible-lint/Makefile +++ b/sysutils/py-ansible-lint/Makefile @@ -51,7 +51,7 @@ USE_PYTHON= autoplist concurrent pep517 pytest WRKSRC= ${WRKDIR}/ansible_lint-${PORTVERSION} -TEST_ENV= LC_ALL=C.UTF-8 PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/ +TEST_ENV= PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/ NO_ARCH= yes .include <bsd.port.mk> diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 5068ed584d50..7ec598cd3ce0 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -69,9 +69,6 @@ SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} SUB_FILES= pkg-message -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= AWS BASH FISH TCP ZEROMQ ZSH OPTIONS_DEFAULT= BASH FISH ZEROMQ ZSH diff --git a/textproc/R-cran-hunspell/Makefile b/textproc/R-cran-hunspell/Makefile index ac2713bec921..bdea0658776f 100644 --- a/textproc/R-cran-hunspell/Makefile +++ b/textproc/R-cran-hunspell/Makefile @@ -19,8 +19,6 @@ TEST_DEPENDS= R-cran-knitr>0:print/R-cran-knitr \ USES= cran:auto-plist,compiles -MAKE_ENV= LC_ALL=C.UTF-8 - TESTING_UNSAFE= yes .include <bsd.port.mk> diff --git a/textproc/docbookrx/Makefile b/textproc/docbookrx/Makefile index 5b490ac521c1..60c45466c055 100644 --- a/textproc/docbookrx/Makefile +++ b/textproc/docbookrx/Makefile @@ -21,8 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= asciidoctor GH_PROJECT= docbookrx GH_TAGNAME= 06f4336 -USE_LOCALE?= en_US.UTF-8 -GEM_ENV+= RB_USER_INSTALL=yes LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} +GEM_ENV+= RB_USER_INSTALL=yes NO_ARCH= yes diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile index d5bed0d0a64f..d85fa9fc456d 100644 --- a/textproc/ibus-typing-booster/Makefile +++ b/textproc/ibus-typing-booster/Makefile @@ -45,7 +45,6 @@ SHEBANG_LANG= sh sh_OLD_CMD= /usr/bin/sh sh_CMD= ${SH} USE_GNOME= gtk40 -USE_LOCALE= en_US.UTF-8 GNU_CONFIGURE= yes CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec NO_ARCH= yes diff --git a/textproc/pageedit/Makefile b/textproc/pageedit/Makefile index 6f58a645092b..3461a4484072 100644 --- a/textproc/pageedit/Makefile +++ b/textproc/pageedit/Makefile @@ -19,13 +19,11 @@ USES= cmake qt:${FLAVOR:S/qt//} ${_USES_${FLAVOR}} desktop-file-utils USE_GITHUB= yes GH_ACCOUNT= Sigil-Ebook GH_PROJECT= PageEdit -USE_LOCALE= ${_USE_LOCALE_${FLAVOR}} USE_QT= ${_USE_QT_${FLAVOR}} USE_GL= ${_USE_GL_${FLAVOR}} CMAKE_ARGS= ${_CMAKE_ARGS_${FLAVOR}} _CMAKE_ARGS_qt6= -DUSE_QT6:BOOL=TRUE -_USE_LOCALE_qt6= en_US.UTF-8 _USES_qt6= gl _USE_GL_qt6= gl opengl _USE_QT_qt6= 5compat base webengine translations declarative webchannel positioning diff --git a/textproc/py-pikepdf/Makefile b/textproc/py-pikepdf/Makefile index 170abe1b3bcd..e569c5491e8f 100644 --- a/textproc/py-pikepdf/Makefile +++ b/textproc/py-pikepdf/Makefile @@ -37,8 +37,6 @@ USE_PYTHON= autoplist pep517 CPE_VENDOR= pikepdf_project -TEST_ENV= LC_ALL=en_US.UTF-8 - OPTIONS_DEFINE= JBIG2 OPTIONS_DEFAULT= JBIG2 diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile index fb1fca0ab148..275d8cadc968 100644 --- a/textproc/py-sphinxcontrib-programoutput/Makefile +++ b/textproc/py-sphinxcontrib-programoutput/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5,1:textproc/py-sphinx@${PY_FLAV USES= python USE_PYTHON= autoplist distutils -USE_LOCALE= en_US.UTF-8 NO_ARCH= yes diff --git a/textproc/te-hunspell/Makefile b/textproc/te-hunspell/Makefile index bf7ba145902d..e50e04cc199b 100644 --- a/textproc/te-hunspell/Makefile +++ b/textproc/te-hunspell/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= ${DATADIR}/te_IN.aff \ do-build: @cd ${WRKSRC}; \ ${LOCALBASE}/bin/prezip-bin -d < te.cwl > te.txt; \ - ${SETENV} LANG=te_IN.utf8 LC_ALL=te_IN.utf8 ${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN + ${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ diff --git a/textproc/translate-shell/Makefile b/textproc/translate-shell/Makefile index 880c8438b350..4519adff60c2 100644 --- a/textproc/translate-shell/Makefile +++ b/textproc/translate-shell/Makefile @@ -23,7 +23,6 @@ USE_GITHUB= yes GH_ACCOUNT= soimort ALL_TARGET= build -TEST_ENV= LC_ALL=C.UTF-8 TEST_TARGET= test NO_ARCH= yes PLIST_FILES= bin/trans \ diff --git a/textproc/write-good/Makefile b/textproc/write-good/Makefile index 44595c9c05cc..9d57331f2879 100644 --- a/textproc/write-good/Makefile +++ b/textproc/write-good/Makefile @@ -66,10 +66,10 @@ _npm-regenerate: (cd ${WRKSRC} && ${SETENV} ${_NPM_ENV} npm install --ignore-scripts) ${FIND} ${WRKDIR}/.npm ${WRKSRC}/node_modules -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; (cd ${WRKDIR} && \ - ${FIND} .npm/_cacache -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} .npm/_cacache -print0 | ${SORT} -z | \ ${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_cache} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -) (cd ${WRKDIR} && \ - ${FIND} ${WRKSRC:T}/node_modules -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${WRKSRC:T}/node_modules -print0 | ${SORT} -z | \ ${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_modules} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -) scp ${WRKDIR}/${_NPM_DISTFILE_cache} ${WRKDIR}/${_NPM_DISTFILE_modules} 0mp@freefall.freebsd.org:public_distfiles/ cp ${WRKDIR}/${_NPM_DISTFILE_cache} ${WRKDIR}/${_NPM_DISTFILE_modules} ${DISTDIR}/ diff --git a/textproc/xlnt/Makefile b/textproc/xlnt/Makefile index a610c1149940..06ffd27b59ae 100644 --- a/textproc/xlnt/Makefile +++ b/textproc/xlnt/Makefile @@ -34,7 +34,7 @@ pre-fetch: git clone -q ${LIBSTUDXML_GIT_URL} ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} && \ (cd ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} && git reset -q --hard ${LIBSTUDXML_REV} && ${RM} -r .git) && \ ${FIND} ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - ${FIND} ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} -print0 | ${SORT} -z | \ ${TAR} czf ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ ${RM} -r ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}; \ fi diff --git a/www/chromium/Makefile b/www/chromium/Makefile index e90e26f3ac69..d14e727804bd 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -425,7 +425,7 @@ post-install-DRIVER-on: do-test-TEST-on: .for t in ${TEST_TARGETS} - cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ + cd ${WRKSRC}/out/${BUILDTYPE} && \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile index 9a4f8adf1d32..15dfa51739cd 100644 --- a/www/hs-hjsmin/Makefile +++ b/www/hs-hjsmin/Makefile @@ -9,9 +9,6 @@ WWW= https://github.com/erikd/hjsmin LICENSE= BSD3CLAUSE USES= cabal - -USE_LOCALE= en_US.UTF-8 - USE_CABAL= alex-3.5.3.0 \ ansi-terminal-1.1.2 \ ansi-terminal-types-1.1 \ diff --git a/www/jericho-html/Makefile b/www/jericho-html/Makefile index 08a22acf8665..b166f94ca1d3 100644 --- a/www/jericho-html/Makefile +++ b/www/jericho-html/Makefile @@ -23,8 +23,7 @@ PLIST_FILES+= ${JAVAJARDIR}/${PORTNAME}.jar OPTIONS_DEFINE= DOCS do-build: - (cd ${WRKSRC} && ${RM} -r classes/* && ${SETENV} \ - LANG=en_US.ISO8859-1 LC_ALL=en_US.ISO8859-1 ${JAVAC} \ + (cd ${WRKSRC} && ${RM} -r classes/* && ${JAVAC} \ -classpath ${INTERFACES:S, ,,g} \ -encoding Windows-1252 \ -d classes src/java/net/htmlparser/jericho/*.java \ diff --git a/www/newsraft/Makefile b/www/newsraft/Makefile index f66c36e976bd..6a6530cc944f 100644 --- a/www/newsraft/Makefile +++ b/www/newsraft/Makefile @@ -18,7 +18,6 @@ USES= pkgconfig sqlite MAKEFILE= makefile MAKE_ARGS+= CFLAGS="${CFLAGS}" -TEST_ENV+= LANG=C.UTF-8 TEST_TARGET= check WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index a2209e23b900..a7eb15024ce5 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -95,8 +95,6 @@ USE_LDCONFIG= yes USE_QT= base:build MAKE_ENV= BUILD_NUMBER=${_DS_BUILD} \ - LANG=C.UTF-8 \ - LC_ALL=C.UTF-8 \ NODE_OPTIONS=--max-old-space-size=3072 \ npm_package_config_node_gyp_nodedir=${LOCALBASE} \ npm_package_config_node_gyp_python=${PYTHON_CMD} \ diff --git a/www/py-django42/Makefile b/www/py-django42/Makefile index 7bc064415ce2..3285ca85cf4d 100644 --- a/www/py-django42/Makefile +++ b/www/py-django42/Makefile @@ -38,9 +38,6 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django[0-9][0-9] CPE_VENDOR= djangoproject -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= DOCS HTMLDOCS OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE diff --git a/www/py-django52/Makefile b/www/py-django52/Makefile index 08aed0c8263d..0fd7f4f4182d 100644 --- a/www/py-django52/Makefile +++ b/www/py-django52/Makefile @@ -36,9 +36,6 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django[0-9][0-9] CPE_VENDOR= djangoproject -# Upstream archive contains files with UTF-8 names -# EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= DOCS HTMLDOCS OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE diff --git a/www/py-django60/Makefile b/www/py-django60/Makefile index 49189164c490..e3f95033bb57 100644 --- a/www/py-django60/Makefile +++ b/www/py-django60/Makefile @@ -35,9 +35,6 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django[0-9][0-9] CPE_VENDOR= djangoproject -# Upstream archive contains files with UTF-8 names -# EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - OPTIONS_DEFINE= DOCS HTMLDOCS OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile index 952b137857c5..cfd723c6e60c 100644 --- a/www/py-python-digitalocean/Makefile +++ b/www/py-python-digitalocean/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist -USE_LOCALE= en_US.UTF-8 NO_ARCH= yes .include <bsd.port.mk> diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile index 3f83bf50b119..bb5acc2b82c6 100644 --- a/www/qutebrowser/Makefile +++ b/www/qutebrowser/Makefile @@ -42,8 +42,6 @@ USE_QT= base declarative quick3d sqldriver-sqlite:run webengine \ websockets tools:build .endif -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} NO_ARCH= yes PLIST_FILES= share/applications/${PORTNAME}-${PYTHON_VER}.desktop \ share/man/man1/${PORTNAME}.1.gz diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 6fd897ef4da5..1af30080239c 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -413,7 +413,7 @@ post-install-DRIVER-on: do-test-TEST-on: .for t in ${TEST_TARGETS} - cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ + cd ${WRKSRC}/out/${BUILDTYPE} && \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor diff --git a/x11/foot/Makefile b/x11/foot/Makefile index 7571053998e0..6de00948d3d2 100644 --- a/x11/foot/Makefile +++ b/x11/foot/Makefile @@ -78,7 +78,7 @@ post-build-PGO-on: (cd ${BUILD_WRKSRC} && ./${PORTNAME} --version) # -Wbackend-plugin/-Wmissing-profile .if defined(WAYLAND_DISPLAY) # Likely a local build, so optimize for the current config - (cd ${BUILD_WRKSRC} && LC_ALL=en_US.UTF-8 ./${PORTNAME} ${PYTHON_CMD} \ + (cd ${BUILD_WRKSRC} && ./${PORTNAME} ${PYTHON_CMD} \ ${WRKSRC}/scripts/generate-alt-random-writes.py \ ${PGO_SCRIPT_ARGS}) .else diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile index 3a028c8cac64..bd7da85c572e 100644 --- a/x11/qimageblitz/Makefile +++ b/x11/qimageblitz/Makefile @@ -31,7 +31,7 @@ do-fetch: svn co -r ${SVN_REVISION} ${SVN_URL} ${PORTNAME}-${DISTVERSIONFULL} && \ (cd ${PORTNAME}-${DISTVERSIONFULL} && ${RM} -r .svn) && \ ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \ + ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | ${SORT} -z | \ ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T - && \ ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \ fi |