The output of tools like awk, date, sort, tr,... depends on the current

locale set by the user.  Add LANG=C and LC_ALL=C at the beginning of
bsd.port.mk and export them so all commands are executed with the C locale.
LC_ALL=C overrides all other LC_* variables.  LANG is used by setlocale(3)
as default value for LC_* variables, so normally it isn't used when LC_ALL
is set, but there's code out there that looks at LANG directly so it's safer
to set it as well.  The only commands not captured by this are !=
assignments before any inclusion of bsd.port.*mk.

Introduce USE_LOCALE=<locale> that adds LANG=<locale> and LC_ALL=<locale> to
CONFIGURE_ENV and MAKE_ENV so upstream build systems can be executed with a
different locale (e.g. USE_LOCALE=en_US.UTF-8).

PR:		215882
Exp-run by:	antoine
Approved by:	portmgr (antoine)

26 files changed, 32 insertions, 92 deletions

diff --git a/lang/elixir/Makefile b/lang/elixir/Makefile
index bc49b86d4dd7..f0c4bb6964c0 100644
--- a/lang/elixir/Makefile
+++ b/lang/elixir/Makefile
@@ -21,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang
 
 USES=		gmake
-MAKE_ENV=	LANG=en_US.UTF-8
+USE_LOCALE=	en_US.UTF-8
 ALL_TARGET=	# empty
 REINPLACE_ARGS=	-i ""
 NO_ARCH=	yes
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 5e0406976a07..19bc88c687c0 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -30,8 +30,6 @@ MAKE_JOBS_UNSAFE=yes
 PLIST_SUB=	VERSION="${PORTVERSION}" \
 		TARGET="${CONFIGURE_TARGET}"
 
-# breaks in ext/uvecor.c on some locales
-MAKE_ENV+=	LANG=C
 # avoids a problem with with ccache's pre-processor optimization
 MAKE_ENV+=	CCACHE_CPP2=1
 
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 25ebf5e3b200..1b3f6acc2a1c 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -100,10 +100,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
-# On FreeBSD 11 and above AWK uses the locale's collating order which
-# runs into a bug in GCC (PR 211742).
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split" \
-		AWK="${SETENV} LC_ALL=C ${AWK:Q}"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index b27832d23ddd..560463be645b 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -101,10 +101,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
-# On FreeBSD 11 and above AWK uses the locale's collating order which
-# runs into a bug in GCC (PR 211742).
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split" \
-		AWK="${SETENV} LC_ALL=C ${AWK:Q}"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index d36776d37713..a495c8902cc9 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -103,10 +103,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
-# On FreeBSD 11 and above AWK uses the locale's collating order which
-# runs into a bug in GCC (PR 211742).
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split" \
-		AWK="${SETENV} LC_ALL=C ${AWK:Q}"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile
index 6306f7b31010..3d4efbf11d6d 100644
--- a/lang/gcc5-devel/Makefile
+++ b/lang/gcc5-devel/Makefile
@@ -103,10 +103,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
-# On FreeBSD 11 and above AWK uses the locale's collating order which
-# runs into a bug in GCC (PR 211742).
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split" \
-		AWK="${SETENV} LC_ALL=C ${AWK:Q}"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index f67823bddc80..769c773240d7 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -97,10 +97,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
-# On FreeBSD 11 and above AWK uses the locale's collating order which
-# runs into a bug in GCC (PR 211742).
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split" \
-		AWK="${SETENV} LC_ALL=C ${AWK:Q}"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index 0e3eecd754f8..17e35d9ed0d6 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -106,10 +106,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
-# On FreeBSD 11 and above AWK uses the locale's collating order which
-# runs into a bug in GCC (PR 211742).
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split" \
-		AWK="${SETENV} LC_ALL=C ${AWK:Q}"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile
index 5953f776a450..88f639e75def 100644
--- a/lang/gcc6/Makefile
+++ b/lang/gcc6/Makefile
@@ -101,10 +101,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		${ICONV_CONFIGURE_ARG} \
 		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
-# On FreeBSD 11 and above AWK uses the locale's collating order which
-# runs into a bug in GCC (PR 211742).
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split" \
-		AWK="${SETENV} LC_ALL=C ${AWK:Q}"
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index dba6a1c3ebb8..d2262133457d 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -31,12 +31,9 @@ CONFLICTS=	ghc-7.4.* ghc-7.6.* ghc-7.8.*
 
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
+USES=		autoreconf gmake iconv:translit ncurses perl5 tar:xz
+USE_LOCALE=	en_US.UTF-8
 USE_PERL5=		build
-USES=			autoreconf gmake iconv:translit ncurses perl5 tar:xz
-
-MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
-# This is needed on FreeBSD 9.x due to the bootstrap tarball.
-TAR=		env LC_ALL=en_US.UTF-8 /usr/bin/tar
 
 # The configure process accepts,filters and canonicalises
 # the CONFIGURE_TARGET variable. You can read the files
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 41a1914478cb..c031e7b26d06 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -23,8 +23,9 @@ USES+=		metaport
 DIST_SUBDIR?=	cabal
 .endif # !METAPORT
 
-MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \
-		TMPDIR=${TMPDIR}
+USE_LOCALE?=	en_US.UTF-8
+
+MAKE_ENV+=	DESTDIR=${STAGEDIR} TMPDIR=${TMPDIR}
 
 SETUP_CMD?=	./setup
 
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index bc34caef281d..46cfb3550ccf 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -29,12 +29,9 @@ CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no
 # Set location for .wapi creation.
 MONO_SHARED_DIR=${WRKDIR}
 
-# LC_ALL is set in order to work around issues people are having when using
-# other languages.  This has shown itself in build fails and possibly other
-# strange crashes.
 MAKE_ENV=	MONO_SHARED_DIR="${MONO_SHARED_DIR}" \
 		INSTALL_STRIP_FLAG="${STRIP}" \
-		LC_ALL=C TZ=UTC
+		TZ=UTC
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 PORTSCOUT=	limit:^\d+\.\d+\.[1-9]\d*
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index c2c72d1af88c..9f67cdd3fcbb 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -112,7 +112,7 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
-	-Dcf_time="`env LANG=C ${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
+	-Dcf_time="`${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
 # Keep the following two in sync.
 # lddlflags is used for all .so linking
 # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
@@ -127,11 +127,7 @@ USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 # XXX Remove
 CONFIGURE_ARGS+=	-Dusedevel -Uversiononly
 
-LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
-		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
-		LC_TIME=""
-CONFIGURE_ENV+=	${LOCALE_CLEANUP} UNAME_v="$$(uname -v | sed 'y/=/ /')"
-MAKE_ENV+=	${LOCALE_CLEANUP}
+CONFIGURE_ENV+=	UNAME_v="$$(uname -v | sed 'y/=/ /')"
 
 SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index 66b6f182e61d..a2977b60b545 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
-	-Dcf_time="`env LANG=C ${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
+	-Dcf_time="`${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
 # Keep the following two in sync.
 # lddlflags is used for all .so linking
 # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
@@ -101,11 +101,7 @@ CONFIGURE_ARGS+= \
 # Give a hint of where libperl.so can be found.
 USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 
-LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
-		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
-		LC_TIME=""
-CONFIGURE_ENV+=	${LOCALE_CLEANUP} UNAME_v="$$(uname -v | sed 'y/=/ /')"
-MAKE_ENV+=	${LOCALE_CLEANUP}
+CONFIGURE_ENV+=	UNAME_v="$$(uname -v | sed 'y/=/ /')"
 
 SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
diff --git a/lang/perl5.22/Makefile b/lang/perl5.22/Makefile
index f098fd66716c..152d9e30065e 100644
--- a/lang/perl5.22/Makefile
+++ b/lang/perl5.22/Makefile
@@ -89,7 +89,7 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
-	-Dcf_time="`env LANG=C ${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
+	-Dcf_time="`${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
 # Keep the following two in sync.
 # lddlflags is used for all .so linking
 # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
@@ -100,11 +100,7 @@ CONFIGURE_ARGS+= \
 # Give a hint of where libperl.so can be found.
 USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 
-LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
-		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
-		LC_TIME=""
-CONFIGURE_ENV+=	${LOCALE_CLEANUP} UNAME_v="$$(uname -v | sed 'y/=/ /')"
-MAKE_ENV+=	${LOCALE_CLEANUP}
+CONFIGURE_ENV+=	UNAME_v="$$(uname -v | sed 'y/=/ /')"
 
 SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
diff --git a/lang/perl5.24/Makefile b/lang/perl5.24/Makefile
index 651de0614b49..4291a60b7a38 100644
--- a/lang/perl5.24/Makefile
+++ b/lang/perl5.24/Makefile
@@ -97,7 +97,7 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
-	-Dcf_time="`env LANG=C ${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
+	-Dcf_time="`${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
 # Keep the following two in sync.
 # lddlflags is used for all .so linking
 # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
@@ -108,11 +108,7 @@ CONFIGURE_ARGS+= \
 # Give a hint of where libperl.so can be found.
 USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 
-LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
-		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
-		LC_TIME=""
-CONFIGURE_ENV+=	${LOCALE_CLEANUP} UNAME_v="$$(uname -v | sed 'y/=/ /')"
-MAKE_ENV+=	${LOCALE_CLEANUP}
+CONFIGURE_ENV+=	UNAME_v="$$(uname -v | sed 'y/=/ /')"
 
 SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index d5932bc071cf..14968be5135d 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -50,6 +50,7 @@ LLVM38_DESC=	LLVM 3.8
 LLVM39_DESC=	LLVM 3.9
 
 USES=		execinfo gmake perl5 readline tar:bzip2 libedit
+USE_LOCALE=	en_US.UTF-8
 USE_OPENSSL=	yes
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
@@ -70,9 +71,6 @@ MAKE_ENV+=	HOME=${WRKSRC}
 # Hack to switch to a local gem path so locally activated rake can be used
 MAKE_ENV+=	GEM_PATH=${GEM_PATH}
 
-# Hack to build under a UTF-8 locale
-MAKE_ENV+=	LANG=en_US.UTF-8
-
 F_OS=		${OPSYS:tl}
 F_MAJOR=	${OSREL:C/\..*$//}
 FREEBSD_DIR=	${F_ARCH}-${F_OS}-${F_MAJOR}
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index 498f219dc6e4..fb340443744c 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -30,12 +30,11 @@ CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
-CONFIGURE_ENV=	LC_ALL=C debugflags=
+CONFIGURE_ENV=	debugflags=
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread -L${LOCALBASE}/lib
-MAKE_ENV=	LC_ALL=C
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USES=		autoreconf cpe execinfo tar:xz
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index 0cce7b728aae..7de9bf3c0e1c 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -32,12 +32,11 @@ CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
-CONFIGURE_ENV=	LC_ALL=C debugflags=
+CONFIGURE_ENV=	debugflags=
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread -L${LOCALBASE}/lib
-MAKE_ENV=	LC_ALL=C
 USE_LDCONFIG=	yes
 USES=		autoreconf cpe execinfo tar:xz ssl
 WRKSRC=		${RUBY_WRKSRC}
diff --git a/lang/ruby23/Makefile b/lang/ruby23/Makefile
index 50951215d708..412babdf5925 100644
--- a/lang/ruby23/Makefile
+++ b/lang/ruby23/Makefile
@@ -30,12 +30,11 @@ CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
-CONFIGURE_ENV=	LC_ALL=C debugflags=
+CONFIGURE_ENV=	debugflags=
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread -L${LOCALBASE}/lib
-MAKE_ENV=	LC_ALL=C
 USE_LDCONFIG=	yes
 USES=		autoreconf cpe execinfo ssl tar:xz
 WRKSRC=		${RUBY_WRKSRC}
diff --git a/lang/ruby24/Makefile b/lang/ruby24/Makefile
index 32ce64c4a90f..7839dce2b389 100644
--- a/lang/ruby24/Makefile
+++ b/lang/ruby24/Makefile
@@ -31,12 +31,11 @@ CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
-CONFIGURE_ENV=	LC_ALL=C debugflags=
+CONFIGURE_ENV=	debugflags=
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread -L${LOCALBASE}/lib
-MAKE_ENV=	LC_ALL=C
 USE_LDCONFIG=	yes
 USES=		autoreconf cpe execinfo ssl tar:xz
 WRKSRC=		${RUBY_WRKSRC}
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 742f602ccfd1..ace392e8d4d0 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -27,6 +27,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install install-libraries
+TEST_TARGET=	test
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -40,8 +41,7 @@ SHORT_TCL_VER=	${TCL_VER:S/8./8/}
 MAN_SUFFIX=	${PKGBASE}
 
 MAKE_ENV=	SHORT_TCL_VER="${SHORT_TCL_VER}" \
-		MAN_SUFFIX=.${MAN_SUFFIX} \
-		LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
+		MAN_SUFFIX=.${MAN_SUFFIX}
 
 PLIST_SUB=	TCL_VER=${TCL_VER} \
 		SHORT_TCL_VER=${SHORT_TCL_VER}
@@ -78,7 +78,4 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tclsh${TCL_VER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcl${SHORT_TCL_VER}.so.1
 
-regression-test:	build
-	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
-
 .include <bsd.port.mk>
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index beaf1f2d8100..aa97685ae9f6 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -42,8 +42,7 @@ SHORT_TCL_VER=	${TCL_VER:S/8./8/}
 MAN_SUFFIX=	${PORTNAME}${SHORT_TCL_VER}
 
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
-		MAN_SUFFIX=.${MAN_SUFFIX} \
-		LANG=C LC_ALL=C
+		MAN_SUFFIX=.${MAN_SUFFIX}
 
 PLIST_SUB=	TCL_VER=${TCL_VER} \
 		SHORT_TCL_VER=${SHORT_TCL_VER}
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 8fe64709e0fc..e099faa1e009 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -52,8 +52,7 @@ SHORT_TCL_VER=	${TCL_VER:S/.//}
 MAN_SUFFIX=	${PKGBASE}
 
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
-		MAN_SUFFIX=.${MAN_SUFFIX} \
-		LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
+		MAN_SUFFIX=.${MAN_SUFFIX}
 
 PLIST_SUB=	TCL_VER=${TCL_VER} \
 		SHORT_TCL_VER=${SHORT_TCL_VER}
diff --git a/lang/tcl87/Makefile b/lang/tcl87/Makefile
index f37502c83fa2..8094336a7b34 100644
--- a/lang/tcl87/Makefile
+++ b/lang/tcl87/Makefile
@@ -53,8 +53,7 @@ TCL_VER=	${PORTVERSION:R:R}
 MAN_SUFFIX=	${PKGBASE}
 
 MAKE_ENV=	SHORT_TCL_VER=${PKGNAMESUFFIX} \
-		MAN_SUFFIX=.${MAN_SUFFIX} \
-		LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
+		MAN_SUFFIX=.${MAN_SUFFIX}
 
 PLIST_SUB=	TCL_VER=${TCL_VER} \
 		PKGNAMESUFFIX=${PKGNAMESUFFIX}
diff --git a/lang/yap-devel/Makefile b/lang/yap-devel/Makefile
index 3788f91d51fc..be1a3fd58123 100644
--- a/lang/yap-devel/Makefile
+++ b/lang/yap-devel/Makefile
@@ -45,10 +45,6 @@ swipl_OLD_CMD=	/usr/bin/swipl
 swipl_CMD=	${LOCALBASE}/bin/swipl # installed by lang/swi-pl
 USE_GCC=	any
 
-EXTRACT_CMD=	${GZIP_CMD}
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} -xf -
-
 DOCSDIR=	${PREFIX}/share/doc/Yap
 DATADIR=	${PREFIX}/share/Yap