FreeBSD Bugzilla – Attachment 178969 Details for
Bug 215882
[exp-run] always set LANG=C and LC_ALL=C
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch2
lang.patch (text/plain), 68.34 KB, created by
Tijl Coosemans
on 2017-01-16 20:02:29 UTC
(
hide
)
Description:
patch2
Filename:
MIME Type:
Creator:
Tijl Coosemans
Created:
2017-01-16 20:02:29 UTC
Size:
68.34 KB
patch
obsolete
>Index: Mk/Scripts/check-stagedir.sh >=================================================================== >--- Mk/Scripts/check-stagedir.sh (revision 431699) >+++ Mk/Scripts/check-stagedir.sh (working copy) >@@ -12,7 +12,6 @@ > # c. Files in plist which are owned by dependencies/MTREEs > > set -e >-export LC_ALL=C > > . ${SCRIPTSDIR}/functions.sh > >Index: Mk/Uses/elixir.mk >=================================================================== >--- Mk/Uses/elixir.mk (revision 431699) >+++ Mk/Uses/elixir.mk (working copy) >@@ -44,7 +44,7 @@ ELIXIR_APP_ROOT?= ${PREFIX}/lib/elixir/l > ELIXIR_HIDDEN?= "^${ELIXIR_APP_NAME}$$" > ELIXIR_LOCALE?= en_US.UTF-8 > MIX_CMD?= ${LOCALBASE}/bin/mix >-MIX_COMPILE?= ${SETENV} ${MIX_ENV} LANG=${ELIXIR_LOCALE} MIX_ENV=${MIX_ENV_NAME} ELIXIR_HIDDEN=${ELIXIR_HIDDEN} ${MIX_CMD} ${MIX_TARGET} >+MIX_COMPILE?= ${SETENV} ${MIX_ENV} LANG=${ELIXIR_LOCALE} LC_ALL=${ELIXIR_LOCALE} MIX_ENV=${MIX_ENV_NAME} ELIXIR_HIDDEN=${ELIXIR_HIDDEN} ${MIX_CMD} ${MIX_TARGET} > MIX_REWRITE?= > MIX_BUILD_DEPS?= > MIX_RUN_DEPS?= >Index: Mk/Uses/gem.mk >=================================================================== >--- Mk/Uses/gem.mk (revision 431699) >+++ Mk/Uses/gem.mk (working copy) >@@ -44,23 +44,8 @@ GEM_CACHE?= ${CACHE_DIR}/${GEM_NAME}.gem > GEMSPEC= ${PORTNAME}.gemspec > GEM_ENV+= RB_USER_INSTALL=yes > >-.if defined(LANG) && !empty(LANG) >-GEM_ENV+= LANG=${LANG} >-.else >-GEM_ENV+= LANG=en_US.UTF-8 >-.endif >- >-.if defined(LC_ALL) && !empty(LC_ALL) >-GEM_ENV+= LC_ALL=${LC_ALL} >-.else >-GEM_ENV+= LC_ALL=en_US.UTF-8 >-.endif >- >-.if defined(LC_CTYPE) && !empty(LC_CTYPE) >-GEM_ENV+= LC_CTYPE=${LC_CTYPE} >-.else >-GEM_ENV+= LC_CTYPE=UTF-8 >-.endif >+USE_LOCALE?= en_US.UTF-8 >+GEM_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} > > PLIST_SUB+= PORTVERSION="${PORTVERSION}" \ > REV="${RUBY_GEM}" \ >Index: Mk/bsd.commands.mk >=================================================================== >--- Mk/bsd.commands.mk (revision 431699) >+++ Mk/bsd.commands.mk (working copy) >@@ -88,7 +88,7 @@ SU_CMD?= /usr/bin/su root -c > SYSCTL?= /sbin/sysctl > TAIL?= /usr/bin/tail > TEST?= test # Shell builtin >-TR?= LANG=C /usr/bin/tr >+TR?= /usr/bin/tr > TRUE?= true # Shell builtin > UMOUNT?= /sbin/umount > UNAME?= /usr/bin/uname >Index: Mk/bsd.port.mk >=================================================================== >--- Mk/bsd.port.mk (revision 431699) >+++ Mk/bsd.port.mk (working copy) >@@ -348,7 +348,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org > # can be used in Makefiles by port maintainers > # if a port breaks with it (it should be > # extremely rare). >-# >+## >+# 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) >@@ -1035,6 +1038,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org > # Most port authors should not need to understand anything after this point. > # > >+LANG= C >+LC_ALL= C >+.export LANG LC_ALL >+ > # These need to be absolute since we don't know how deep in the ports > # tree we are and thus can't go relative. They can, of course, be overridden > # by individual Makefiles or local system make configuration. >@@ -1886,6 +1893,11 @@ ${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ > .include "${USESDIR}/${f:C/\:.*//}.mk" > .endfor > >+.if defined(USE_LOCALE) >+CONFIGURE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} >+MAKE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} >+.endif >+ > .if defined(USE_XORG) > # Add explicit X options to avoid problems with false positives in configure > .if defined(GNU_CONFIGURE) >Index: archivers/libzip/Makefile >=================================================================== >--- archivers/libzip/Makefile (revision 431699) >+++ archivers/libzip/Makefile (working copy) >@@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > CPE_VENDOR= nih > > GNU_CONFIGURE= yes >-MAKE_ENV= LC_ALL="C" > USES= cpe libtool pathfix perl5 tar:xz > USE_PERL5= build > USE_LDCONFIG= yes >Index: audio/denemo/Makefile >=================================================================== >--- audio/denemo/Makefile (revision 431699) >+++ audio/denemo/Makefile (working copy) >@@ -23,7 +23,6 @@ LIB_DEPENDS= libaubio.so:audio/aubio \ > libfftw3.so:math/fftw3 > RUN_DEPENDS= xdg-open:devel/xdg-utils > >-EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} > EXTRACT_BEFORE_ARGS=\ > -s '!\(/Clarinet in B\).*\(\.denemo\)$$!\1b\2!p' -xf > >Index: audio/libamrnb/Makefile >=================================================================== >--- audio/libamrnb/Makefile (revision 431699) >+++ audio/libamrnb/Makefile (working copy) >@@ -29,8 +29,6 @@ RESTRICTED= unclear legal status, probab > USES= gmake tar:bzip2 libtool > PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt > GNU_CONFIGURE= yes >-CONFIGURE_ENV+= LANG=C >-MAKE_ENV+= LANG=C > INSTALL_TARGET= install-strip > SUB_FILES= pkg-message > USE_LDCONFIG= yes >Index: audio/libamrwb/Makefile >=================================================================== >--- audio/libamrwb/Makefile (revision 431699) >+++ audio/libamrwb/Makefile (working copy) >@@ -28,8 +28,6 @@ RESTRICTED= unclear legal status, probab > USES= gmake tar:bzip2 libtool > PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt > GNU_CONFIGURE= yes >-CONFIGURE_ENV+= LANG=C >-MAKE_ENV+= LANG=C > INSTALL_TARGET= install-strip > SUB_FILES= pkg-message > USE_LDCONFIG= yes >Index: base/gcc/Makefile >=================================================================== >--- base/gcc/Makefile (revision 431699) >+++ base/gcc/Makefile (working copy) >@@ -41,8 +41,6 @@ PLIST_SUB= TARGETARCH=${TARGET_ARCH} \ > TARGET_ARCH= ${CROSS_TOOLCHAIN:C,-.*$,,} > EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/freebsd-format-extensions > >-CONFIGURE_ENV= LC_ALL=C >-MAKE_ENV= LC_ALL=C > GNU_CONFIGURE= yes > CONFIGURE_OUTSOURCE= yes > CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls \ >Index: cad/astk-serveur/Makefile >=================================================================== >--- cad/astk-serveur/Makefile (revision 431699) >+++ cad/astk-serveur/Makefile (working copy) >@@ -56,6 +56,12 @@ C_SCRIPTS= bin/astk bin/bsf > tools_dir= ${LOCALBASE}/aster/outils > conf_dir= ${WRKSRC}/etc/astkrc > >+.if defined(LANG) && ${LANG:Mfr*} != "" >+ASTK_LANG= FR >+.else >+ASTK_LANG= ENG >+.endif >+ > .include <bsd.port.pre.mk> > > WRKCONF= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration >@@ -164,12 +170,6 @@ HOST_NAME= this-hostname > DOMAIN_NAME= your.domain-name > .endif > >-.if defined(LANG) && ${LANG:Mfr*} != "" >-ASTK_LANG= FR >-.else >-ASTK_LANG= ENG >-.endif >- > pre-configure: > ${RM} ${PATCH2RM:C|^|${WRKSRC}/|:C|$|.orig|} > >Index: cad/jspice3/files/patch-build >=================================================================== >--- cad/jspice3/files/patch-build (revision 431699) >+++ cad/jspice3/files/patch-build (working copy) >@@ -1,14 +1,5 @@ > --- build.orig 2015-11-05 18:10:02 UTC > +++ build >-@@ -22,7 +22,7 @@ if [ -d conf/unixconf ]; then >- echo '#######################################################################'> conf/mkheader.in >- echo '####### Makefile generated by build script ############################'>> conf/mkheader.in >- echo VERSION = $version>> conf/mkheader.in >-- echo DATE = `/bin/date`>> conf/mkheader.in >-+ echo DATE = `/usr/bin/env LANG=C /bin/date`>> conf/mkheader.in >- echo '#######################################################################'>> conf/mkheader.in >- cat conf/unixconf/mkheader.0 >> conf/mkheader.in >- else > @@ -51,7 +51,7 @@ if [ -f conf/util/configure ]; then > if [ `uname -s` = Darwin -a -d /opt/X11 ]; then > util/configure --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib -srcdir . >Index: chinese/big5width/Makefile >=================================================================== >--- chinese/big5width/Makefile (revision 431699) >+++ chinese/big5width/Makefile (working copy) >@@ -8,15 +8,15 @@ MASTER_SITES= # none > DISTFILES= # none > > MAINTAINER= ports@FreeBSD.org >-COMMENT= Unicode width dirty fix for Big5 font (${LANG} locale) >+COMMENT= Unicode width dirty fix for Big5 font (${LOCALE} locale) > > BASELOCALEDIR= /usr/share/locale > LOCALEDIR= ${PREFIX}/share/locale >-LANG= zh_TW.UTF-8 >+LOCALE= zh_TW.UTF-8 > > PLIST_SUB= BASELOCALEDIR=${BASELOCALEDIR} \ > LOCALEDIR=${LOCALEDIR} \ >- LANG=${LANG} >+ LOCALE=${LOCALE} > > .include <bsd.port.pre.mk> > >@@ -29,13 +29,13 @@ IGNORE= need to build this port with th > do-extract: > @${MKDIR} ${WRKDIR} > @${CP} -R ${SRCDIR} ${WRKSRC} >- @${CP} ${WRKSRC}/UTF-8.src ${WRKSRC}/${LANG}.src >+ @${CP} ${WRKSRC}/UTF-8.src ${WRKSRC}/${LOCALE}.src > > do-build: >- /usr/bin/mklocale -o ${WRKSRC}/LC_CTYPE ${WRKSRC}/${LANG}.src >+ /usr/bin/mklocale -o ${WRKSRC}/LC_CTYPE ${WRKSRC}/${LOCALE}.src > > do-install: >- ${MKDIR} ${STAGEDIR}${LOCALEDIR}/${LANG} >- ${INSTALL_DATA} ${WRKSRC}/LC_CTYPE ${STAGEDIR}${LOCALEDIR}/${LANG} >+ ${MKDIR} ${STAGEDIR}${LOCALEDIR}/${LOCALE} >+ ${INSTALL_DATA} ${WRKSRC}/LC_CTYPE ${STAGEDIR}${LOCALEDIR}/${LOCALE} > > .include <bsd.port.post.mk> >Index: chinese/big5width/pkg-plist >=================================================================== >--- chinese/big5width/pkg-plist (revision 431699) >+++ chinese/big5width/pkg-plist (working copy) >@@ -1,3 +1,3 @@ >-share/locale/%%LANG%%/LC_CTYPE >-@unexec ln -fs ../UTF-8/LC_CTYPE %%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE >-@exec ln -fs %D/share/locale/%%LANG%%/LC_CTYPE %%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE >+share/locale/%%LOCALE%%/LC_CTYPE >+@unexec ln -fs ../UTF-8/LC_CTYPE %%BASELOCALEDIR%%/%%LOCALE%%/LC_CTYPE >+@exec ln -fs %D/share/locale/%%LOCALE%%/LC_CTYPE %%BASELOCALEDIR%%/%%LOCALE%%/LC_CTYPE >Index: devel/cutter/Makefile >=================================================================== >--- devel/cutter/Makefile (revision 431699) >+++ devel/cutter/Makefile (working copy) >@@ -20,15 +20,13 @@ USES= gettext gmake libtool pathfix pkg > USE_GNOME= intlhack glib20 gtk20 > USE_LDCONFIG= yes > INSTALL_TARGET= install-strip >+TEST_TARGET= check > > OPTIONS_DEFINE= GOFFICE SOUP LCOV > GOFFICE_DESC= GOffice support > SOUP_DESC= libsoup support > LCOV_DESC= Force dependency on lcov > >-regression-test: build >- @${SETENV} LC_ALL=C ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} check >- > .include <bsd.port.options.mk> > > .if ${PORT_OPTIONS:MGOFFICE} >Index: devel/libc++/Makefile >=================================================================== >--- devel/libc++/Makefile (revision 431699) >+++ devel/libc++/Makefile (working copy) >@@ -37,7 +37,7 @@ CMAKE_ARGS= -DLIBCXX_CXX_ABI=libcxxrt -D > > .if !defined(SVN_REV) > .if defined(BOOTSTRAP) >-SVN_REV!= LC_ALL=C svn info http://llvm.org/svn/llvm-project/ | ${GREP} Revision | cut -d' ' -f2 >+SVN_REV!= svn info http://llvm.org/svn/llvm-project/ | ${GREP} Revision | cut -d' ' -f2 > .else > .include "Makefile.svn_rev" > .endif >Index: devel/libedit/Makefile >=================================================================== >--- devel/libedit/Makefile (revision 431699) >+++ devel/libedit/Makefile (working copy) >@@ -22,7 +22,6 @@ GNU_CONFIGURE= yes > USE_LDCONFIG= yes > INSTALL_TARGET= install-strip > CONFIGURE_ARGS= --enable-widec >-MAKE_ENV= LC_ALL=C > LDFLAGS+= -L${LOCALBASE}/lib > > CONFLICTS_INSTALL= editline-* >Index: devel/libopenbsd/Makefile >=================================================================== >--- devel/libopenbsd/Makefile (revision 431699) >+++ devel/libopenbsd/Makefile (working copy) >@@ -17,15 +17,14 @@ MAKE_ARGS= INCLUDEDIR="${PREFIX}/include > MANDIR="${PREFIX}/man/man" > USE_LDCONFIG= yes > >+.include <bsd.port.options.mk> >+ > # > # To update snapshot: make makesum BOOTSTRAP= > # Specific snapshot: make makesum SVN_FETCH= PORTVERSION=r1234 > # > .if defined(BOOTSTRAP) >-# XXX SED and _MASTER_SITES_svn aren't defined yet >-SED?= /usr/bin/sed >-SVN_REV!= ${SETENV} LC_ALL=C svn info \ >- ${MASTER_SITES:M*\:svn:S/:svn//} | \ >+SVN_REV!= svn info ${MASTER_SITES:M*\:svn:S/:svn//} | \ > ${SED} -n 's/^Last Changed Rev: //p' > PORTVERSION:= r${SVN_REV} > .else >Index: devel/libpci/Makefile >=================================================================== >--- devel/libpci/Makefile (revision 431699) >+++ devel/libpci/Makefile (working copy) >@@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/p > > ALL_TARGET= lib/libpci.a > CPPFLAGS+= -fPIC >-MAKE_ENV= LANG=C > USE_LDCONFIG= yes > USES= gmake tar:xz > >Index: devel/libublio/Makefile >=================================================================== >--- devel/libublio/Makefile (revision 431699) >+++ devel/libublio/Makefile (working copy) >@@ -36,7 +36,7 @@ post-extract: > # this pre-install is only for debugging pointyhat failures > pre-install: > @${ECHO_CMD} "===> Environment:" >- @${SETENV} | ${SETENV} LC_ALL=C ${SORT} -f >+ @${SETENV} | ${SORT} -f > @${ECHO_CMD} "===> Makefiles used:" > @${ECHO_CMD} ${.MAKEFILE_LIST} > >Index: devel/powerpc64-gcc/Makefile >=================================================================== >--- devel/powerpc64-gcc/Makefile (revision 431699) >+++ devel/powerpc64-gcc/Makefile (working copy) >@@ -38,8 +38,6 @@ EXTRA_PATCHES+= ${FILESDIR}/freebsd-form > .endif > .endif > >-CONFIGURE_ENV= LC_ALL=C >-MAKE_ENV= LC_ALL=C > GNU_CONFIGURE= yes > CONFIGURE_OUTSOURCE= yes > CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ >Index: devel/riscv64-gcc/Makefile >=================================================================== >--- devel/riscv64-gcc/Makefile (revision 431699) >+++ devel/riscv64-gcc/Makefile (working copy) >@@ -26,8 +26,6 @@ USES= iconv gmake libtool makeinfo > > GCC_TARGET= ${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL} > >-CONFIGURE_ENV= LC_ALL=C >-MAKE_ENV= LC_ALL=C > GNU_CONFIGURE= yes > CONFIGURE_OUTSOURCE= yes > CONFIGURE_ARGS= --target=${GCC_TARGET} \ >Index: devel/tcllib/Makefile >=================================================================== >--- devel/tcllib/Makefile (revision 431699) >+++ devel/tcllib/Makefile (working copy) >@@ -21,10 +21,11 @@ OPTIONS_SUB= yes > USE_GITHUB= yes > GH_ACCOUNT= tcltk > USES+= tcl >+USE_LOCALE= en_US.UTF-8 > GNU_CONFIGURE= yes > CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}" >-MAKE_ENV+= LANG=C >-TEST_TARGET= do-test >+TEST_TARGET= test >+TEST_ENV= ${MAKE_ENV} DISPLAY= TZ=utc > PORTDOCS= * > > INSTALL_ARGS= -pkgs -pkg-path ${STAGEDIR}${PREFIX}/lib/tcllib \ >@@ -104,7 +105,4 @@ do-install: > cd ${WRKSRC} && ${TCLSH} ./installer.tcl ${INSTALL_ARGS} > .endif > >-do-test: >- cd ${WRKSRC} && ${SETENV} LANG=C LC_ALL=en_US.UTF-8 DISPLAY= TZ=utc ${MAKE} test >- > .include <bsd.port.mk> >Index: dns/maradns/Makefile >=================================================================== >--- dns/maradns/Makefile (revision 431699) >+++ dns/maradns/Makefile (working copy) >@@ -17,7 +17,6 @@ DEADWOOD_VER= 3.2.09 > > REINPLACE_ARGS= -i "" > MAKE_ENV= FLAGS="${CFLAGS}" >-CONFIGURE_ENV= LANG= > > HAS_CONFIGURE= yes > USE_RC_SUBR= ${PORTNAME} zoneserver Deadwood >Index: editors/emacs/Makefile >=================================================================== >--- editors/emacs/Makefile (revision 431699) >+++ editors/emacs/Makefile (working copy) >@@ -35,8 +35,6 @@ CONFIGURE_ARGS= --localstatedir=/var \ > > PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} > >-MAKE_ENV= LC_ALL=C >- > INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ > ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ > ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ >Index: editors/emacs-devel/Makefile >=================================================================== >--- editors/emacs-devel/Makefile (revision 431699) >+++ editors/emacs-devel/Makefile (working copy) >@@ -29,13 +29,10 @@ CPE_VENDOR= gnu > SUB_FILES= sources.el > SUB_LIST= EMACS_VER=${EMACS_VER} > >-CONFIGURE_ARGS= --localstatedir=/var \ >- --with-gameuser=games:games >+CONFIGURE_ARGS= --with-gameuser=games:games > > PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} > >-MAKE_ENV= LC_ALL=C >- > INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ > ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ > ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ >Index: editors/libreoffice/Makefile >=================================================================== >--- editors/libreoffice/Makefile (revision 431699) >+++ editors/libreoffice/Makefile (working copy) >@@ -260,7 +260,7 @@ CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dm > > MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}" > MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed >-MAKE_ENV+= DISPLAY= LANG=C LC_ALL=C >+MAKE_ENV+= DISPLAY= > > _MAKE_JOBS= # > >Index: editors/libreoffice4/Makefile >=================================================================== >--- editors/libreoffice4/Makefile (revision 431699) >+++ editors/libreoffice4/Makefile (working copy) >@@ -344,7 +344,6 @@ LDFLAGS+= -L${LOCALBASE}/lib > MAKE_ENV+= ENVCFLAGS="${CFLAGS}" ENVCFLAGSCXX="${CXXFLAGS}" > MAKE_ENV+= ENVLINKFLAGS="${LDFLAGS}" > MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed >-MAKE_ENV+= LANG=C LC_ALL=C > > pre-configure: > @${TOUCH} ${WRKSRC}/autogen.lastrun >Index: editors/openoffice-4/Makefile >=================================================================== >--- editors/openoffice-4/Makefile (revision 431699) >+++ editors/openoffice-4/Makefile (working copy) >@@ -400,7 +400,7 @@ do-build: > fi ; \ > cd ${WRKSRC}/instsetoo_native ; \ > . ../${FREEBSD_ENV_SET} ; \ >- LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc} >+ build.pl --all -P$${numproc} -- -P$${dmproc} > > do-install: > @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ >Index: editors/openoffice-devel/Makefile >=================================================================== >--- editors/openoffice-devel/Makefile (revision 431699) >+++ editors/openoffice-devel/Makefile (working copy) >@@ -409,7 +409,7 @@ do-build: > fi ; \ > cd ${WRKSRC}/instsetoo_native ; \ > . ../${FREEBSD_ENV_SET} ; \ >- LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc} >+ build.pl --all -P$${numproc} -- -P$${dmproc} > > do-install: > @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ >Index: editors/tea/Makefile >=================================================================== >--- editors/tea/Makefile (revision 431699) >+++ editors/tea/Makefile (working copy) >@@ -19,11 +19,10 @@ OPTIONS_DEFAULT= ASPELL > > USES= pkgconfig:build qmake tar:bzip2 > USE_GL= gl >+USE_LOCALE= en_US.UTF-8 > USE_QT4= corelib gui moc_build network rcc_build > > LDFLAGS+= -lz >-MAKE_ENV+= LANG=en_US.UTF-8 >-CONFIGURE_ENV+= LANG=en_US.UTF-8 > PLIST_FILES= bin/tea share/pixmaps/tea_icon_v2.png > PORTDOCS= * > >Index: editors/yudit/Makefile >=================================================================== >--- editors/yudit/Makefile (revision 431699) >+++ editors/yudit/Makefile (working copy) >@@ -15,8 +15,6 @@ CONFLICTS= netatalk-[0-9]* > USE_XORG= x11 > USES= gmake > GNU_CONFIGURE= yes >-CONFIGURE_ENV= LC_ALL= >-MAKE_ENV= LC_ALL= > MAKE_JOBS_UNSAFE= yes > > PORTDATA= * >Index: emulators/tme/Makefile >=================================================================== >--- emulators/tme/Makefile (revision 431699) >+++ emulators/tme/Makefile (working copy) >@@ -20,7 +20,6 @@ USE_GNOME= gdkpixbuf2 gtk20 > USE_LDCONFIG= yes > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --disable-static --disable-warnings >-MAKE_ENV= LANG=C > MAKE_JOBS_UNSAFE=yes > INSTALL_TARGET= install-strip > >Index: ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist >=================================================================== >--- ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist (revision 431699) >+++ ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist (nonexistent) >@@ -1,13 +0,0 @@ >---- contrib/libedit/makelist.orig 2001-12-16 23:55:26 UTC >-+++ contrib/libedit/makelist >-@@ -128,8 +128,8 @@ case $FLAG in >- printf("#endif /* _h_help_c */\n"); >- }' /dev/null;; >- -fh) >-- cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ >-- sort | tr '[a-z]' '[A-Z]' | $AWK ' >-+ env LANG=C cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ >-+ sort | env LANG=C tr '[a-z]' '[A-Z]' | $AWK ' >- BEGIN { >- printf("/* Automatically generated file, do not edit */\n"); >- printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); > >Property changes on: ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: ftp/curl/Makefile >=================================================================== >--- ftp/curl/Makefile (revision 431699) >+++ ftp/curl/Makefile (working copy) >@@ -49,7 +49,6 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ > ac_cv_func_SSLv2_client_method=no > GNU_CONFIGURE= yes > INSTALL_TARGET= install-strip >-TEST_ENV= ${MAKE_ENV} LC_ALL=C > TEST_TARGET= test > USE_LDCONFIG= yes > USE_PERL5= build >Index: ftp/ftpcopy/files/patch-src_typesize.sh >=================================================================== >--- ftp/ftpcopy/files/patch-src_typesize.sh (revision 431699) >+++ ftp/ftpcopy/files/patch-src_typesize.sh (working copy) >@@ -5,7 +5,7 @@ > else > x=$? > - p=`echo $i | sed 's/ /_/g' | tr "[a-z]]" "[A-Z]"` >-+ p=`echo $i | sed 's/ /_/g' | env LC_COLLATE=C tr "[:lower:]" "[:upper:]"` >++ p=`echo $i | sed 's/ /_/g' | tr "[:lower:]" "[:upper:]"` > echo "#define SIZEOF_$p $x /* systype-info */" > fi > fi >Index: ftp/pure-ftpd/Makefile >=================================================================== >--- ftp/pure-ftpd/Makefile (revision 431699) >+++ ftp/pure-ftpd/Makefile (working copy) >@@ -39,7 +39,7 @@ VIRTUALCHROOT_DESC= Follow symlinks outs > CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ > --with-altlog --with-cookie --with-diraliases \ > --with-everything --with-extauth --with-ftpwho \ >- --with-language=${LANG} --with-paranoidmsg --with-puredb \ >+ --with-language=${LANGUAGE} --with-paranoidmsg --with-puredb \ > --with-quotas --with-ratios > GNU_CONFIGURE= yes > USE_PERL5= run >@@ -60,7 +60,7 @@ SUB_LIST= PAM_DIR=${PAM_DIR} PAM_TARGET= > SHEBANG_FILES= contrib/pure-stat.pl contrib/pure-vpopauth.pl > > CONTRIB= pure-stat.pl pure-vpopauth.pl xml_python_processors.txt >-LANG?= english >+LANGUAGE?= english > PAM_DIR?= ${EXAMPLESDIR}/pam > PAM_TARGET?= pure-ftpd > PAM_TEMPL?= ${FILESDIR}/pam.conf.5 >@@ -100,7 +100,7 @@ CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_op > pre-fetch: > @${ECHO_MSG} "You can use the following additional options:" > @${ECHO_MSG} "" >- @${ECHO_MSG} "LANG=lang (default: english)" >+ @${ECHO_MSG} "LANGUAGE=lang (default: english)" > @${ECHO_MSG} "- Enable compilation of one language support" > @${ECHO_MSG} " available lang: brazilian-portuguese, catalan, czech, danish, dutch," > @${ECHO_MSG} " english, french, french-funny, german, hungarian, italian, korean," >Index: games/blackjackclient/Makefile >=================================================================== >--- games/blackjackclient/Makefile (revision 431699) >+++ games/blackjackclient/Makefile (working copy) >@@ -21,8 +21,8 @@ post-extract-script: > @${ECHO_CMD} "Main-Class: ${PORTNAME}" > ${WRKDIR}/src/MANIFEST.MF > > do-build: >- cd ${WRKDIR}/src && \ >- ${SETENV} LANG=en_US.UTF-8 ${JAVAC} ${PORTNAME}.java >+ (cd ${WRKDIR}/src && ${SETENV} LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \ >+ ${JAVAC} ${PORTNAME}.java) > > post-build-script: > @cd ${WRKDIR}/src && \ >Index: games/doomsday/Makefile >=================================================================== >--- games/doomsday/Makefile (revision 431699) >+++ games/doomsday/Makefile (working copy) >@@ -45,7 +45,7 @@ post-patch: > ${WRKSRC}/doomsday/client/client.pro \ > ${WRKSRC}/doomsday/server/server.pro > # Removing (three) non-ascii bytes from the beginning of the file >- @LANG=C ${REINPLACE_CMD} '1s,^...,,' \ >+ @${REINPLACE_CMD} '1s,^...,,' \ > ${WRKSRC}/doomsday/client/src/client/cl_sound.cpp > > .include <bsd.port.mk> >Index: games/jchessboard/Makefile >=================================================================== >--- games/jchessboard/Makefile (revision 431699) >+++ games/jchessboard/Makefile (working copy) >@@ -14,9 +14,10 @@ COMMENT= Chess game and PGN viewer/edito > LICENSE= GPLv2 > > USES= tar:tgz >+USE_ANT= yes > USE_JAVA= yes > JAVA_VERSION= 1.6+ >-USE_ANT= yes >+USE_LOCALE= en_US.ISO8859-1 > NO_ARCH= yes > > DATADIR= ${JAVASHAREDIR}/${PORTNAME} >@@ -30,8 +31,6 @@ PORTDOCS= * > > JARFILE= JChessBoard.jar > >-MAKE_ENV= LANG=en_US.ISO8859-1 >- > do-install: > ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin > @${MKDIR} ${STAGEDIR}${DATADIR} >Index: games/openbor/Makefile >=================================================================== >--- games/openbor/Makefile (revision 431699) >+++ games/openbor/Makefile (working copy) >@@ -52,15 +52,14 @@ TREMOR_LIB_DEPENDS= libvorbisidec.so:aud > TREMOR_MAKE_ARGS= BUILD_TREMOR=1 BUILD_VORBIS="" > TREMOR_LIB_DEPENDS_OFF= libvorbisfile.so:audio/libvorbis > >+.include <bsd.port.options.mk> >+ > # > # To update snapshot: make makesum BOOTSTRAP= > # Specific snapshot: make makesum SVN_FETCH= PORTVERSION=1.0.r1234 > # > .if defined(BOOTSTRAP) >-# XXX SED and _MASTER_SITES_svn aren't defined yet >-SED?= /usr/bin/sed >-SVN_REV!= ${SETENV} LC_ALL=C svn info \ >- ${MASTER_SITES:M*\:svn:S/:svn//} | \ >+SVN_REV!= svn info ${MASTER_SITES:M*\:svn:S/:svn//} | \ > ${SED} -n 's/^Last Changed Rev: //p' > PORTVERSION:= ${PORTVERSION:R}.r${SVN_REV} > .else >Index: games/quake-data/Makefile >=================================================================== >--- games/quake-data/Makefile (revision 431699) >+++ games/quake-data/Makefile (working copy) >@@ -72,7 +72,7 @@ post-extract: > ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${f} \ > ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}/qw/skins > . endfor >- (cd ${WRKSRC}/qw/skins && LANG=C ${SH} fixskins.sh) >+ (cd ${WRKSRC}/qw/skins && ${SH} fixskins.sh) > .endif > > # Since these files are not generated, only unpacked, install(1) them with >Index: german/hunspell/Makefile >=================================================================== >--- german/hunspell/Makefile (revision 431699) >+++ german/hunspell/Makefile (working copy) >@@ -20,7 +20,6 @@ BUILD_DEPENDS= aspell:textproc/aspell \ > > USES= gmake perl5 shebangfix tar:bzip2 > ALL_TARGET= hunspell-all >-MAKE_ENV= LANG=C LC_ALL=C > NO_ARCH= yes > USE_PERL5= build > SHEBANG_FILES= bin/*.pl >Index: graphics/Coin/Makefile >=================================================================== >--- graphics/Coin/Makefile (revision 431699) >+++ graphics/Coin/Makefile (working copy) >@@ -22,7 +22,6 @@ CONFIGURE_ARGS= --with-pthread=yes --ena > --enable-3ds-import --enable-sound \ > --enable-javascript-api --enable-debug=no > USE_LDCONFIG= yes >-MAKE_ENV= LANG=C > INSTALL_TARGET= install-strip > > pre-configure: >Index: graphics/jogl/Makefile >=================================================================== >--- graphics/jogl/Makefile (revision 431699) >+++ graphics/jogl/Makefile (working copy) >@@ -34,12 +34,12 @@ USE_XORG= x11 xau xdamage xdmcp xext xf8 > USE_GL= gl > USE_ANT= yes > USE_LDCONFIG= yes >+USE_LOCALE= en_US.UTF-8 > USE_JAVA= yes > JAVA_VERSION= 1.6+ > > BUILD_WRKSRC= ${WRKSRC}/jogl/make > BUILD_BINPATH= ${WRKSRC}/bin >-MAKE_ENV+= LANG=en_US.UTF-8 > MAKE_ENV+= PATH="${BUILD_BINPATH}:${PATH}" > > OPTIONS_DEFINE= DOCS >Index: graphics/libimg/Makefile >=================================================================== >--- graphics/libimg/Makefile (revision 431699) >+++ graphics/libimg/Makefile (working copy) >@@ -36,7 +36,6 @@ EXTRACT_AFTER_ARGS= -x '*/libz/*' -x zli > -x '*/compat/*' -x '*/libtiff/*' \ > -x '*/libjpeg/*' -x '*/libpng/*' -a -d ${WRKDIR} > MAKE_ARGS+= INSTALL_ROOT="${STAGEDIR}" >-MAKE_ENV+= LANG= > CONFIGURE_ENV= WRKDIR="${WRKDIR}" > > post-patch: >Index: japanese/skk-jisyo/Makefile >=================================================================== >--- japanese/skk-jisyo/Makefile (revision 431699) >+++ japanese/skk-jisyo/Makefile (working copy) >@@ -61,7 +61,7 @@ do-patch: > # See also: <URL:http://cr.yp.to/cdb/cdbmake.html>. > do-build: > .for type in ${SKK_JISYO_TYPE} >- LC_ALL=C ${AWK} '/^[^;]/ { \ >+ ${AWK} '/^[^;]/ { \ > s = substr($$0, index($$0, " ") + 1); \ > print "+" length($$1) "," length(s) ":" $$1 "->" s; \ > } \ >Index: java/bootstrap-openjdk/Makefile.update >=================================================================== >--- java/bootstrap-openjdk/Makefile.update (revision 431699) >+++ java/bootstrap-openjdk/Makefile.update (working copy) >@@ -68,7 +68,7 @@ all: > .endif > @${ECHO} "Building ${DISTFILE}...." > @${ECHO} "" >- @${ECHO} "Started at "`${SETENV} LANG=C date -u`"." >+ @${ECHO} "Started at "`date -u`"." > @${ECHO} "" > @${ECHO} "==============================================================" > @${ECHO} "" >@@ -97,7 +97,7 @@ all: > @${ECHO} "" > @${ECHO} "${DISTFILE} was built successfully!" > @${ECHO} "" >- @${ECHO} "Finished at "`${SETENV} LANG=C date -u`"." >+ @${ECHO} "Finished at "`date -u`"." > @${ECHO} "" > @${ECHO} "You may clean up the build directory if everything looks okay," > @${ECHO} "e.g., 'rm -fr ${FT2_PORTDIR}/work ${JDK_PORTDIR}/work'." >Index: java/icedtea-web/Makefile >=================================================================== >--- java/icedtea-web/Makefile (revision 431699) >+++ java/icedtea-web/Makefile (working copy) >@@ -29,10 +29,6 @@ SHEBANG_FILES= jrunscript.in launcher/la > > WANT_GNOME= yes > >-EXTRACT_CMD= ${GZIP_CMD} >-EXTRACT_BEFORE_ARGS= -dc >-EXTRACT_AFTER_ARGS= | ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} -xf - >- > CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}" > CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" > CONFIGURE_ARGS+= --with-jre-home="${JAVA_HOME}/jre" >Index: java/jakarta-commons-httpclient/Makefile >=================================================================== >--- java/jakarta-commons-httpclient/Makefile (revision 431699) >+++ java/jakarta-commons-httpclient/Makefile (working copy) >@@ -37,7 +37,7 @@ PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}. > PORTDOCS= * > > post-patch: >- @LANG=C ${REINPLACE_CMD} 's/Ortwin Gl.*ck/Ortwin Glueck/' \ >+ @${REINPLACE_CMD} 's/Ortwin Gl.*ck/Ortwin Glueck/' \ > ${WRKSRC}/src/java/org/apache/commons/httpclient/*.java \ > ${WRKSRC}/src/java/org/apache/commons/httpclient/*/*.java > >Index: java/jfreechart/Makefile >=================================================================== >--- java/jfreechart/Makefile (revision 431699) >+++ java/jfreechart/Makefile (working copy) >@@ -24,9 +24,9 @@ COMPILE_DESC= Build from source > > .if ${PORT_OPTIONS:MCOMPILE} > USE_ANT= yes >+USE_LOCALE= en_US.UTF-8 > ALL_TARGET= compile > BUILD_WRKSRC= ${WRKSRC}/ant >-MAKE_ENV= LANG=en_US.UTF-8 > .else > NO_BUILD= yes > .endif >Index: java/openjdk6/Makefile >=================================================================== >--- java/openjdk6/Makefile (revision 431699) >+++ java/openjdk6/Makefile (working copy) >@@ -98,7 +98,7 @@ BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap > BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk > .endif > >-MAKE_ENV= LANG=C LC_ALL=C OS= \ >+MAKE_ENV= OS= \ > ALT_JDK_IMPORT_PATH=${BOOTSTRAPJDKDIR} \ > ALT_BOOTDIR=${BOOTSTRAPJDKDIR} \ > ALT_CACERTS_FILE=${FILESDIR}/cacerts \ >Index: java/openjdk7/Makefile >=================================================================== >--- java/openjdk7/Makefile (revision 431699) >+++ java/openjdk7/Makefile (working copy) >@@ -104,9 +104,7 @@ NOPRECIOUSMAKEVARS= yes > ONLY_FOR_ARCHS= i386 amd64 > > _MAKE_JOBS= # >-MAKE_ENV+= LANG="C" \ >- LC_ALL="C" \ >- JAVA_HOME="" \ >+MAKE_ENV+= JAVA_HOME="" \ > CLASSPATH="" \ > LD_LIBRARY_PATH="" \ > MAKEFLAGS="" \ >Index: java/openjdk8/Makefile >=================================================================== >--- java/openjdk8/Makefile (revision 431699) >+++ java/openjdk8/Makefile (working copy) >@@ -197,8 +197,7 @@ SHEBANG_FILES= configure > _MAKE_JOBS= # > CPPFLAGS+= -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib >-MAKE_ENV= LANG="C" LC_ALL="C" >-MAKE_ENV+= CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH="" >+MAKE_ENV= CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH="" > MAKE_ENV+= IGNORE_OLD_CONFIG=true > MAKE_ENV+= COMPILER_WARNINGS_FATAL="false" > # openjdk8 normally sets X_CFLAGS in the ./configure script, but it won't do >Index: lang/elixir/Makefile >=================================================================== >--- lang/elixir/Makefile (revision 431699) >+++ lang/elixir/Makefile (working copy) >@@ -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 >Index: lang/gauche/Makefile >=================================================================== >--- lang/gauche/Makefile (revision 431699) >+++ lang/gauche/Makefile (working copy) >@@ -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 > >Index: lang/gcc/Makefile >=================================================================== >--- lang/gcc/Makefile (revision 431699) >+++ lang/gcc/Makefile (working copy) >@@ -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} \ >Index: lang/gcc48/Makefile >=================================================================== >--- lang/gcc48/Makefile (revision 431699) >+++ lang/gcc48/Makefile (working copy) >@@ -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} \ >Index: lang/gcc49/Makefile >=================================================================== >--- lang/gcc49/Makefile (revision 431699) >+++ lang/gcc49/Makefile (working copy) >@@ -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} \ >Index: lang/gcc5/Makefile >=================================================================== >--- lang/gcc5/Makefile (revision 431699) >+++ lang/gcc5/Makefile (working copy) >@@ -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} \ >Index: lang/gcc5-devel/Makefile >=================================================================== >--- lang/gcc5-devel/Makefile (revision 431699) >+++ lang/gcc5-devel/Makefile (working copy) >@@ -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} \ >Index: lang/gcc6/Makefile >=================================================================== >--- lang/gcc6/Makefile (revision 431699) >+++ lang/gcc6/Makefile (working copy) >@@ -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} \ >Index: lang/gcc6-devel/Makefile >=================================================================== >--- lang/gcc6-devel/Makefile (revision 431699) >+++ lang/gcc6-devel/Makefile (working copy) >@@ -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} \ >Index: lang/ghc/Makefile >=================================================================== >--- lang/ghc/Makefile (revision 431699) >+++ lang/ghc/Makefile (working copy) >@@ -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 >Index: lang/ghc/bsd.cabal.mk >=================================================================== >--- lang/ghc/bsd.cabal.mk (revision 431699) >+++ lang/ghc/bsd.cabal.mk (working copy) >@@ -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 > >Index: lang/mono/Makefile >=================================================================== >--- lang/mono/Makefile (revision 431699) >+++ lang/mono/Makefile (working copy) >@@ -29,12 +29,9 @@ CONFIGURE_ENV= ac_cv_header_sys_inotify_ > # 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* >Index: lang/perl5-devel/Makefile >=================================================================== >--- lang/perl5-devel/Makefile (revision 431699) >+++ lang/perl5-devel/Makefile (working copy) >@@ -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}/COR > # 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} \ >Index: lang/perl5.20/Makefile >=================================================================== >--- lang/perl5.20/Makefile (revision 431699) >+++ lang/perl5.20/Makefile (working copy) >@@ -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} \ >Index: lang/perl5.22/Makefile >=================================================================== >--- lang/perl5.22/Makefile (revision 431699) >+++ lang/perl5.22/Makefile (working copy) >@@ -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} \ >Index: lang/perl5.24/Makefile >=================================================================== >--- lang/perl5.24/Makefile (revision 431699) >+++ lang/perl5.24/Makefile (working copy) >@@ -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} \ >Index: lang/rubinius/Makefile >=================================================================== >--- lang/rubinius/Makefile (revision 431699) >+++ lang/rubinius/Makefile (working copy) >@@ -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} >Index: lang/ruby21/Makefile >=================================================================== >--- lang/ruby21/Makefile (revision 431699) >+++ lang/ruby21/Makefile (working copy) >@@ -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 >Index: lang/ruby22/Makefile >=================================================================== >--- lang/ruby22/Makefile (revision 431699) >+++ lang/ruby22/Makefile (working copy) >@@ -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} >Index: lang/ruby23/Makefile >=================================================================== >--- lang/ruby23/Makefile (revision 431699) >+++ lang/ruby23/Makefile (working copy) >@@ -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} >Index: lang/ruby24/Makefile >=================================================================== >--- lang/ruby24/Makefile (revision 431699) >+++ lang/ruby24/Makefile (working copy) >@@ -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} >Index: lang/tcl84/Makefile >=================================================================== >--- lang/tcl84/Makefile (revision 431699) >+++ lang/tcl84/Makefile (working copy) >@@ -27,6 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERS > > 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> >Index: lang/tcl85/Makefile >=================================================================== >--- lang/tcl85/Makefile (revision 431699) >+++ lang/tcl85/Makefile (working copy) >@@ -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} >Index: lang/tcl86/Makefile >=================================================================== >--- lang/tcl86/Makefile (revision 431699) >+++ lang/tcl86/Makefile (working copy) >@@ -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} >Index: lang/tcl87/Makefile >=================================================================== >--- lang/tcl87/Makefile (revision 431699) >+++ lang/tcl87/Makefile (working copy) >@@ -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} >Index: lang/yap-devel/Makefile >=================================================================== >--- lang/yap-devel/Makefile (revision 431699) >+++ lang/yap-devel/Makefile (working copy) >@@ -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 > >Index: mail/mew/files/patch-info__Makefile >=================================================================== >--- mail/mew/files/patch-info__Makefile (revision 431699) >+++ mail/mew/files/patch-info__Makefile (working copy) >@@ -28,9 +28,8 @@ > + -e 's/@set en/@set ja/' mew.texi > tmp.ja.texi > $(RM) mew.ja.info* > $(TOUCH) mew.ja.info >-- $(EMACS) -batch -q -no-site-file -l texinfmt \ >+ $(EMACS) -batch -q -no-site-file -l texinfmt \ > - -f batch-texinfo-format mew.texi >-+ LC_ALL=C $(EMACS) -batch -q -no-site-file -l texinfmt \ > + -f batch-texinfo-format tmp.ja.texi > + $(RM) tmp.ja.texi > >Index: mail/wanderlust/files/patch-Makefile >=================================================================== >--- mail/wanderlust/files/patch-Makefile (revision 431699) >+++ mail/wanderlust/files/patch-Makefile (working copy) >@@ -5,7 +5,7 @@ > > info: > - $(EMACS) $(FLAGS) -l WL-MK -f wl-texinfo-format $(INFODIR) >-+ LANG=ja $(EMACS) $(FLAGS) -l WL-MK -f wl-texinfo-format $(INFODIR) >++ LANG=ja LC_ALL=ja $(EMACS) $(FLAGS) -l WL-MK -f wl-texinfo-format $(INFODIR) > > install-info: > $(EMACS) $(FLAGS) -l WL-MK -f install-wl-info $(INFODIR) >Index: math/geonext/Makefile >=================================================================== >--- math/geonext/Makefile (revision 431699) >+++ math/geonext/Makefile (working copy) >@@ -40,7 +40,6 @@ PLIST_SUB+= MASTER="@comment " > .endif > > # For the slave ports >-LANG= language=${WITH_LANG} > .if ${WITH_LANG} != "en" > PKGNAMEPREFIX= ${WITH_LANG}- > .endif >Index: math/jakarta-commons-math/Makefile >=================================================================== >--- math/jakarta-commons-math/Makefile (revision 431699) >+++ math/jakarta-commons-math/Makefile (working copy) >@@ -18,9 +18,10 @@ COMMENT= Java library of self-contained > > LICENSE= APACHE20 > >+USE_ANT= yes > USE_JAVA= yes > JAVA_VERSION= 1.6 1.7 >-USE_ANT= yes >+USE_LOCALE= en_US.ISO8859-1 > > ALL_TARGET= jar > MAKE_ARGS= -Dlibdir=${WRKDIR} -Dnoget=true >@@ -31,8 +32,6 @@ PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFI > > OPTIONS_DEFINE= DOCS > >-MAKE_ENV= LANG=en_US.ISO8859-1 >- > .include <bsd.port.options.mk> > > .if ${PORT_OPTIONS:MDOCS} >Index: math/jakarta-commons-math3/Makefile >=================================================================== >--- math/jakarta-commons-math3/Makefile (revision 431699) >+++ math/jakarta-commons-math3/Makefile (working copy) >@@ -17,9 +17,10 @@ COMMENT= Java library of self-contained > > LICENSE= APACHE20 > >+USE_ANT= yes > USE_JAVA= yes > JAVA_VERSION= 1.6+ >-USE_ANT= yes >+USE_LOCALE= en_US.ISO8859-1 > > ALL_TARGET= jar > MAKE_ARGS= -Dlibdir=${WRKDIR} -Dnoget=true >@@ -30,8 +31,6 @@ PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFI > > OPTIONS_DEFINE= DOCS > >-MAKE_ENV= LANG=en_US.ISO8859-1 >- > .include <bsd.port.options.mk> > > .if ${PORT_OPTIONS:MDOCS} >Index: math/scilab/Makefile >=================================================================== >--- math/scilab/Makefile (revision 431699) >+++ math/scilab/Makefile (working copy) >@@ -25,6 +25,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils > > USES= cpe desktop-file-utils fortran gettext gmake iconv \ > libtool ncurses pathfix pkgconfig shared-mime-info >+USE_LOCALE= en_US.UTF-8 > GNU_CONFIGURE= yes > > INSTALLS_ICONS= yes >@@ -35,8 +36,6 @@ CONFIGURE_ARGS= --with-gfortran \ > --without-emf \ > -disable-static-system-lib > CONFIGURE_ENV= BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}" >-MAKE_ENV= LANG=en_US.UTF-8 \ >- LC_ALL=en_US.UTF-8 > INSTALL_TARGET= install-strip > > MAKE_JOBS_UNSAFE= yes >Index: math/scilab-toolbox-sivp/Makefile >=================================================================== >--- math/scilab-toolbox-sivp/Makefile (revision 431699) >+++ math/scilab-toolbox-sivp/Makefile (working copy) >@@ -21,7 +21,7 @@ DOS2UNIX_FILES= etc/SIVP.start \ > > SCILAB_CMD= ${LOCALBASE}/bin/scilab-adv-cli > SCILAB_ARGS= -noatomsautoload -nb -nouserstartup >-MAKE_ENV= LC_ALL="C" SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 >+MAKE_ENV= SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 > > CONTRIBDIR?= share/scilab/contrib > TOOLBOXDIR_REL?= ${CONTRIBDIR}/${PORTNAME} >Index: math/scilab-toolbox-swt/Makefile >=================================================================== >--- math/scilab-toolbox-swt/Makefile (revision 431699) >+++ math/scilab-toolbox-swt/Makefile (working copy) >@@ -16,7 +16,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} > > SCILAB_CMD= ${LOCALBASE}/bin/scilab-adv-cli > SCILAB_ARGS= -noatomsautoload -nb -nouserstartup >-MAKE_ENV= LC_ALL="C" SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 >+MAKE_ENV= SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 > > CONTRIBDIR?= share/scilab/contrib > TOOLBOXDIR_REL?= ${CONTRIBDIR}/${PORTNAME} >Index: multimedia/bino/Makefile >=================================================================== >--- multimedia/bino/Makefile (revision 431699) >+++ multimedia/bino/Makefile (working copy) >@@ -34,9 +34,4 @@ OPTIONS_SUB= yes > NLS_USES= gettext > NLS_CONFIGURE_ENABLE=nls > >-# fixes build on non UTF-8 enviroments >-post-patch: >- @${REINPLACE_CMD} -e 's|echo $<|LANG=C; LC_ALL=C; &|' \ >- ${WRKSRC}/src/Makefile.in >- > .include <bsd.port.mk> >Index: multimedia/libvpx/Makefile >=================================================================== >--- multimedia/libvpx/Makefile (revision 431699) >+++ multimedia/libvpx/Makefile (working copy) >@@ -42,7 +42,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ > --enable-vp8 \ > --enable-vp9 > MAKE_ARGS+= verbose=yes >-MAKE_ENV= LC_ALL=C > > OPTIONS_SUB= SHARED > >Index: multimedia/miro/Makefile >=================================================================== >--- multimedia/miro/Makefile (revision 431699) >+++ multimedia/miro/Makefile (working copy) >@@ -67,7 +67,7 @@ post-patch: > > .if defined(MAINTAINER_MODE) > regression-test: install >- LANG=C LC_ALL=C ${PREFIX}/bin/miro --unittest >+ ${PREFIX}/bin/miro --unittest > .endif > > .include <bsd.port.post.mk> >Index: net-mgmt/smokeping/Makefile >=================================================================== >--- net-mgmt/smokeping/Makefile (revision 431699) >+++ net-mgmt/smokeping/Makefile (working copy) >@@ -41,7 +41,6 @@ CONFIGURE_ARGS+= \ > --with-htdocs-dir=${PREFIX}/smokeping/htdocs \ > --libdir=${PREFIX}/smokeping/lib > HTDOCSDIR= ${PREFIX}/smokeping/htdocs >-MAKE_ENV= LC_ALL=C > > USE_RC_SUBR= smokeping > >Index: net-p2p/mldonkey/Makefile >=================================================================== >--- net-p2p/mldonkey/Makefile (revision 431699) >+++ net-p2p/mldonkey/Makefile (working copy) >@@ -153,11 +153,11 @@ do-install: > .endif > > install-user: extract >-.if !defined(LANG) >- @${ECHO_MSG} "Please call as: make install-user LANG=<lang>" >+.if !defined(LANGUAGE) >+ @${ECHO_MSG} "Please call as: make install-user LANGUAGE=<lang>" > @${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !" > .else >- @${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANG}\ >+ @${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANGUAGE}\ > ${HOME}/.mldonkey_gui_messages.ini > .endif > >Index: net-p2p/vuze/Makefile >=================================================================== >--- net-p2p/vuze/Makefile (revision 431699) >+++ net-p2p/vuze/Makefile (working copy) >@@ -30,7 +30,6 @@ INSTALLS_ICONS= yes > JARFILE= ${PORTNAME}.jar > > # build classpath from BUILD_DEPENDS >-MAKE_ENV= LANG=C > CLASSPATH_JARS= ${BUILD_DEPENDS:C/:.+$//:M*.jar:T} > > PLIST_FILES= %%JAVAJARDIR%%/${JARFILE} \ >Index: news/cnews/Makefile >=================================================================== >--- news/cnews/Makefile (revision 431699) >+++ news/cnews/Makefile (working copy) >@@ -148,7 +148,7 @@ do-install: > .endfor > > test: >- (cd ${WRKSRC} && ${SETENV} LANG=C ${MAKE_ENV} \ >- ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} r) >+ (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ >+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} r) > > .include <bsd.port.mk> >Index: print/pdftk/Makefile >=================================================================== >--- print/pdftk/Makefile (revision 431699) >+++ print/pdftk/Makefile (working copy) >@@ -28,7 +28,7 @@ WRKSRC= ${PATCH_WRKSRC}/${PORTNAME} > > MAKEFILE= Makefile.FreeBSD > MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSUFF} GCPP=cpp${CSUFF} \ >- OBJCOPY=${OBJCOPY} LANG=C LC_CTYPE=C >+ OBJCOPY=${OBJCOPY} > > PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz > >Index: science/colt/Makefile >=================================================================== >--- science/colt/Makefile (revision 431699) >+++ science/colt/Makefile (working copy) >@@ -22,8 +22,8 @@ COMPILE_DESC= Install the pre-compiled . > > .if ${PORT_OPTIONS:MCOMPILE} > USE_ANT= yes >+USE_LOCALE= en_US.ISO8859-1 > ALL_TARGET= build >-MAKE_ENV= LANG=en_US.ISO8859-1 > .if ${PORT_OPTIONS:MDOCS} > ALL_TARGET+= javadoc > .endif >Index: security/i2p/Makefile >=================================================================== >--- security/i2p/Makefile (revision 431699) >+++ security/i2p/Makefile (working copy) >@@ -37,11 +37,11 @@ USE_ANT= yes > USE_JAVA= yes > JAVA_BUILD= jdk > JAVA_VERSION= 1.6+ >+USE_LOCALE= en_US.UTF-8 > > ALL_TARGET= \ > updater \ > tarball >-MAKE_ENV= LANG=en_US.UTF-8 > > PORTDATA= * > >Index: security/isakmpd/Makefile >=================================================================== >--- security/isakmpd/Makefile (revision 431699) >+++ security/isakmpd/Makefile (working copy) >@@ -22,7 +22,7 @@ BUILD_DEPENDS+= keynote:security/keynote > > USES= uidfix > USE_RC_SUBR= isakmpd >-MAKE_ENV+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man LC_ALL=C >+MAKE_ENV+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man > > USE_OPENSSL= yes > >Index: security/py-dfvfs/Makefile >=================================================================== >--- security/py-dfvfs/Makefile (revision 431699) >+++ security/py-dfvfs/Makefile (working copy) >@@ -36,8 +36,9 @@ RUN_DEPENDS= libbde>=a:devel/libbde \ > > NO_ARCH= yes > USES= python:2.7 >+USE_LOCALE= en_US.UTF-8 > USE_PYTHON= distutils autoplist >-TEST_ENV= ${MAKE_ENV} LANG=en_US.UTF-8 PYTHONHTTPSVERIFY=0 >+TEST_ENV= ${MAKE_ENV} PYTHONHTTPSVERIFY=0 > > do-test: > @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} run_tests.py) >Index: security/py-plaso/Makefile >=================================================================== >--- security/py-plaso/Makefile (revision 431699) >+++ security/py-plaso/Makefile (working copy) >@@ -51,8 +51,9 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}moc > > NO_ARCH= yes > USES= python:2.7 >+USE_LOCALE= en_US.UTF-8 > USE_PYTHON= distutils autoplist >-TEST_ENV= ${MAKE_ENV} LANG=en_US.UTF-8 PYTHONHTTPSVERIFY=0 >+TEST_ENV= ${MAKE_ENV} PYTHONHTTPSVERIFY=0 > > do-test: > @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} run_tests.py) >Index: shells/fd/Makefile >=================================================================== >--- shells/fd/Makefile (revision 431699) >+++ shells/fd/Makefile (working copy) >@@ -11,7 +11,7 @@ DISTNAME= FD-${PORTVERSION} > MAINTAINER= knu@FreeBSD.org > COMMENT= CUI-based file and directory management tool > >-MAKE_ENV= LANG=ja >+USE_LOCALE= ja > MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ > PREFIX="\$$(DESTDIR)${PREFIX}" \ > CONFDIR="\$$(DESTDIR)${PREFIX}/etc" \ >Index: sysutils/cdrdao/Makefile >=================================================================== >--- sysutils/cdrdao/Makefile (revision 431699) >+++ sysutils/cdrdao/Makefile (working copy) >@@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --with-mp3-support=no - > > CONFIGURE_ARGS+= --without-pcctsbin --without-pcctsinc \ > --with-posix-threads=no --with-scglib >-MAKE_ENV= CCOM=cc LANG=C >+MAKE_ENV= CCOM=cc > SCSILIBTARGET= ${ARCH:S/powerpc64/powerpc/}-freebsd-cc > > BROKEN_aarch64= Fails to install: gmake: p: Command not found >Index: sysutils/pciutils/Makefile >=================================================================== >--- sysutils/pciutils/Makefile (revision 431699) >+++ sysutils/pciutils/Makefile (working copy) >@@ -20,7 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/p > ALL_TARGET= lspci lspci.8 setpci setpci.8 > CPPFLAGS+= -fPIC > LDFLAGS+= -lpci >-MAKE_ENV= LANG=C > USES= gmake localbase:ldflags tar:xz > > PLIST_FILES= bin/lspci \ >Index: sysutils/sformat/Makefile >=================================================================== >--- sysutils/sformat/Makefile (revision 431699) >+++ sysutils/sformat/Makefile (working copy) >@@ -24,7 +24,7 @@ USES= gmake > .include <bsd.port.pre.mk> > > CCOM!= ${BASENAME} ${CC} >-MAKE_ENV= CCOM=${CCOM} LANG=C >+MAKE_ENV= CCOM=${CCOM} > SFMTTARGET= ${ARCH:S/powerpc64/powerpc/}-freebsd-${CCOM} > > post-extract: >Index: textproc/linuxdoc-tools/Makefile >=================================================================== >--- textproc/linuxdoc-tools/Makefile (revision 431699) >+++ textproc/linuxdoc-tools/Makefile (working copy) >@@ -36,6 +36,5 @@ DOCS_BUILD_DEPENDS= bash:shells/bash > DOCS_USE= tex=latex:build tex=pdftex:build tex=dvipsk:build > DOCS_USES= makeinfo > DOCS_CONFIGURE_ENABLE= docs >-DOCS_MAKE_ENV= LANG=C > > .include <bsd.port.mk> >Index: textproc/msort/Makefile >=================================================================== >--- textproc/msort/Makefile (revision 431699) >+++ textproc/msort/Makefile (working copy) >@@ -28,7 +28,6 @@ MAKE_ENV+= INCLUDES="-I${LOCALBASE}/incl > GNU_CONFIGURE= yes > USES= gettext tk:wrapper,run > TEST_TARGET= test >-TEST_ENV= LC_ALL=C > > PLIST_FILES= bin/msg bin/msort man/man1/msort.1.gz > >Index: textproc/te-hunspell/Makefile >=================================================================== >--- textproc/te-hunspell/Makefile (revision 431699) >+++ textproc/te-hunspell/Makefile (working copy) >@@ -26,7 +26,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 ${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN >+ ${SETENV} LANG=te_IN.utf8 LC_ALL=te_IN.utf8 ${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN > > do-install: > ${MKDIR} ${STAGEDIR}${DATADIR}/ >Index: www/jericho-html/Makefile >=================================================================== >--- www/jericho-html/Makefile (revision 431699) >+++ www/jericho-html/Makefile (working copy) >@@ -21,7 +21,7 @@ PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME} > > do-build: > (cd ${WRKSRC} && ${RM} -r classes/* && ${SETENV} \ >- LANG=en_US.ISO8859-1 ${JAVAC} \ >+ LANG=en_US.ISO8859-1 LC_ALL=en_US.ISO8859-1 ${JAVAC} \ > -classpath ${INTERFACES:S, ,,g} \ > -d classes src/java/net/htmlparser/jericho/*.java \ > src/java/net/htmlparser/jericho/nodoc/*.java) >Index: www/tdom/Makefile >=================================================================== >--- www/tdom/Makefile (revision 431699) >+++ www/tdom/Makefile (working copy) >@@ -20,7 +20,6 @@ USE_GITHUB= yes > CONFIGURE_ARGS= --enable-threads --disable-tdomalloc > > TEST_TARGET= test >-TEST_ENV= LANG=C > > PLIST_SUB= PORTVERSION=${PORTVERSION} > >Index: www/tinymce/Makefile >=================================================================== >--- www/tinymce/Makefile (revision 431699) >+++ www/tinymce/Makefile (working copy) >@@ -34,7 +34,7 @@ MS_PLIST= ${WRKDIR}/.ms-pkg-plist > genplist: do-clean extract > @${ECHO} "@owner www" > ${MS_PLIST} > @${ECHO} "@group www" >> ${MS_PLIST} >- @cd ${WRKSRC}/ && ${FIND} -s * -type f | env LC_ALL=C ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST} >+ @cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST} > @${ECHO} "@owner" >> ${MS_PLIST} > @${ECHO} "@group" >> ${MS_PLIST} > @${INSTALL} -m 600 ${MS_PLIST} ${PLIST} >Index: www/trac-tags/Makefile >=================================================================== >--- www/trac-tags/Makefile (revision 431699) >+++ www/trac-tags/Makefile (working copy) >@@ -22,7 +22,6 @@ NO_ARCH= yes > > .if !defined(SVN_REV) > .if defined(BOOTSTRAP) >-LANG= "C" > SVN_REV!= svn info http://trac-hacks.org/svn/tagsplugin/trunk/ | ${GREP} Revision | cut -d' ' -f2 > .else > .include "Makefile.svn_rev" >Index: www/trac-wysiwyg/Makefile >=================================================================== >--- www/trac-wysiwyg/Makefile (revision 431699) >+++ www/trac-wysiwyg/Makefile (working copy) >@@ -24,7 +24,6 @@ NO_ARCH= yes > .if !defined(SVN_REV) > .if defined(BOOTSTRAP) > SVN_URL= http://trac-hacks.org/svn/tracwysiwygplugin/0.12/ >-LANG= "C" > SVN_REV!= svn info ${SVN_URL} | ${GREP} Revision | cut -d' ' -f2 > .else > .include "Makefile.svn_rev" >Index: www/websh/Makefile >=================================================================== >--- www/websh/Makefile (revision 431699) >+++ www/websh/Makefile (working copy) >@@ -53,7 +53,7 @@ post-configure: > -e 's,-DPACKAGE_[^=]*=."[^"]*",,g' ${WRKSRC}/Makefile > > post-build test: >- ${SETENV} LANG=C HOME=${WRKDIR} ${MAKE_CMD} -C ${WRKSRC} test | ${AWK} '\ >+ ${SETENV} HOME=${WRKDIR} ${MAKE_CMD} -C ${WRKSRC} test | ${AWK} '\ > /Failed/ && $$NF {failed=1} \ > END {exit failed} \ > {print}' >Index: www/zenphoto/Makefile >=================================================================== >--- www/zenphoto/Makefile (revision 431699) >+++ www/zenphoto/Makefile (working copy) >@@ -40,7 +40,7 @@ MS_PLIST= ${WRKDIR}/.ms-pkg-plist > genplist: do-clean extract > ${ECHO_CMD} '@owner www' > ${MS_PLIST} > ${ECHO_CMD} '@group www' >> ${MS_PLIST} >- cd ${WRKSRC}/ && ${FIND} * -type f | ${SETENV} LC_ALL=C ${SORT} | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST} >+ cd ${WRKSRC}/ && ${FIND} * -type f | ${SORT} | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST} > .for dir in ${MS_DIR} > ${ECHO_CMD} '@dir %%WWWDIR%%/${dir}' >> ${MS_PLIST} > .endfor >Index: x11-fonts/fontconfig/Makefile >=================================================================== >--- x11-fonts/fontconfig/Makefile (revision 431699) >+++ x11-fonts/fontconfig/Makefile (working copy) >@@ -43,7 +43,6 @@ CONFIGURE_ARGS+= --enable-static > # Python is not required, because fc-blanks.h is available in distfile > CONFIGURE_ENV= PYTHON=":" > >-MAKE_ENV= LC_ALL=C > PKGINSTALL= ${WRKDIR}/pkg-install > INSTALL_TARGET=install-strip > >Index: x11-toolkits/Xmt/Makefile >=================================================================== >--- x11-toolkits/Xmt/Makefile (revision 431699) >+++ x11-toolkits/Xmt/Makefile (working copy) >@@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/xmt400 > > USES= motif imake tar:tgz > USE_LDCONFIG= yes >-MAKE_ENV= LANG=C > > post-patch: > ${TOUCH} ${WRKSRC}/clients/mockup.man >Index: x11-toolkits/open-motif/Makefile >=================================================================== >--- x11-toolkits/open-motif/Makefile (revision 431699) >+++ x11-toolkits/open-motif/Makefile (working copy) >@@ -25,7 +25,6 @@ LIB_DEPENDS= libXp.so:x11/libXp \ > libpng16.so:graphics/png > GNU_CONFIGURE= yes > USE_LDCONFIG= yes >-MAKE_ENV= LANG=C > CPPFLAGS+= -DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include > USE_CSTD= gnu89 > INSTALL_TARGET= install-strip >Index: x11-toolkits/p5-Gtk2/Makefile >=================================================================== >--- x11-toolkits/p5-Gtk2/Makefile (revision 431699) >+++ x11-toolkits/p5-Gtk2/Makefile (working copy) >@@ -22,7 +22,6 @@ RUN_DEPENDS= p5-Cairo>=1:graphics/p5-Cai > p5-Pango>=1.220:x11-toolkits/p5-Pango > > CONFIGURE_ENV= FORCE_MAKE_CMD=yes >-MAKE_ENV= LANG=C > USES= gmake perl5 > USE_PERL5= configure > USE_GNOME= gtk20 pango
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 215882
:
178636
| 178969