diff options
120 files changed, 133 insertions, 283 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh index a5febb04183e..1ae6abc0f2d8 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -12,7 +12,6 @@ # c. Files in plist which are owned by dependencies/MTREEs set -e -export LC_ALL=C . ${SCRIPTSDIR}/functions.sh diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk index 0f89c49c2871..dfaf85bdecd7 100644 --- a/Mk/Uses/elixir.mk +++ b/Mk/Uses/elixir.mk @@ -44,7 +44,7 @@ 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?= ${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?= diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk index 18eb230dae26..6ea8c99166d3 100644 --- a/Mk/Uses/gem.mk +++ b/Mk/Uses/gem.mk @@ -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}" \ diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 31227f775f2a..cf9368f80d89 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 361ea58a0b3f..9cafcbe77604 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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. @@ -1904,6 +1911,11 @@ ${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ /g} .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) diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile index 00adc5bf75ed..5cdd3dec4715 100644 --- a/archivers/libzip/Makefile +++ b/archivers/libzip/Makefile @@ -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 diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index 6452a7603eea..d92a091fdc42 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -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 diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile index 9a6f64605da6..2eda57fb3ef4 100644 --- a/audio/libamrnb/Makefile +++ b/audio/libamrnb/Makefile @@ -29,8 +29,6 @@ RESTRICTED= unclear legal status, probably need licenses from 3GPP and more 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 diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile index 1120b7cf141c..812ab8df129f 100644 --- a/audio/libamrwb/Makefile +++ b/audio/libamrwb/Makefile @@ -28,8 +28,6 @@ RESTRICTED= unclear legal status, probably need licenses from 3GPP and more 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 diff --git a/base/gcc/Makefile b/base/gcc/Makefile index 610c7ad42f80..16459bac49c9 100644 --- a/base/gcc/Makefile +++ b/base/gcc/Makefile @@ -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 \ diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index 788c029d0244..1ae08051c746 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -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|} diff --git a/cad/jspice3/files/patch-build b/cad/jspice3/files/patch-build index 5e5068c493c5..c6b9b0bc4505 100644 --- a/cad/jspice3/files/patch-build +++ b/cad/jspice3/files/patch-build @@ -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 . diff --git a/chinese/big5width/Makefile b/chinese/big5width/Makefile index 817fa9cce220..7ae9f9f3397f 100644 --- a/chinese/big5width/Makefile +++ b/chinese/big5width/Makefile @@ -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 the locale source 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> diff --git a/chinese/big5width/pkg-plist b/chinese/big5width/pkg-plist index 6ff2776fe5a3..6916a01bb976 100644 --- a/chinese/big5width/pkg-plist +++ b/chinese/big5width/pkg-plist @@ -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 diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile index 8ba9df27dceb..c0909849ef0d 100644 --- a/devel/cutter/Makefile +++ b/devel/cutter/Makefile @@ -20,15 +20,13 @@ USES= gettext gmake libtool pathfix pkgconfig 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} diff --git a/devel/libc++/Makefile b/devel/libc++/Makefile index bf1a0d558b39..fb1e0997740c 100644 --- a/devel/libc++/Makefile +++ b/devel/libc++/Makefile @@ -37,7 +37,7 @@ CMAKE_ARGS= -DLIBCXX_CXX_ABI=libcxxrt -DLIBCXX_LIBCXXRT_INCLUDE_PATHS=${CXXRT_IN .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 diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile index 4e1d8759ee89..ceab866e517a 100644 --- a/devel/libedit/Makefile +++ b/devel/libedit/Makefile @@ -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-* diff --git a/devel/libopenbsd/Makefile b/devel/libopenbsd/Makefile index 1ec138e2535f..fbb5026ff640 100644 --- a/devel/libopenbsd/Makefile +++ b/devel/libopenbsd/Makefile @@ -17,15 +17,14 @@ MAKE_ARGS= INCLUDEDIR="${PREFIX}/include" LIBDIR="${PREFIX}/lib" \ 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 diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile index ae4efff31ab7..18dba3652e1d 100644 --- a/devel/libpci/Makefile +++ b/devel/libpci/Makefile @@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids ALL_TARGET= lib/libpci.a CPPFLAGS+= -fPIC -MAKE_ENV= LANG=C USE_LDCONFIG= yes USES= gmake tar:xz diff --git a/devel/libublio/Makefile b/devel/libublio/Makefile index cffe1204dabd..8452592f0ed3 100644 --- a/devel/libublio/Makefile +++ b/devel/libublio/Makefile @@ -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} diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile index ab586e67d7f1..0ebcf23245a0 100644 --- a/devel/powerpc64-gcc/Makefile +++ b/devel/powerpc64-gcc/Makefile @@ -38,8 +38,6 @@ EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions .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++ \ diff --git a/devel/riscv64-gcc/Makefile b/devel/riscv64-gcc/Makefile index d19e33a0182c..4949b75357cd 100644 --- a/devel/riscv64-gcc/Makefile +++ b/devel/riscv64-gcc/Makefile @@ -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} \ diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile index ae5bfc5fbf69..369b3572b4bd 100644 --- a/devel/tcllib/Makefile +++ b/devel/tcllib/Makefile @@ -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> diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile index f67215802b75..474647b7d437 100644 --- a/dns/maradns/Makefile +++ b/dns/maradns/Makefile @@ -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 diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 313c370b92db..680f31e85a27 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -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 \ diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 5c874e1ba274..7e3922286cb9 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -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 \ diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 2106833f73c2..4e301c75ab18 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -260,7 +260,7 @@ CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ 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= # diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile index ba9f3f427583..17c6b42fad90 100644 --- a/editors/libreoffice4/Makefile +++ b/editors/libreoffice4/Makefile @@ -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 diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 2ef135c72049..cfe9ed10e5ab 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -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} \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index b58833f0d9f9..247f072da9df 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -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} \ diff --git a/editors/tea/Makefile b/editors/tea/Makefile index d35ac3403782..0b5611a59212 100644 --- a/editors/tea/Makefile +++ b/editors/tea/Makefile @@ -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= * diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index 0fc9c497abdc..5b776c139ac4 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -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= * diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index 28f9f5133733..8d06a8e1a64b 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -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 diff --git a/ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist b/ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist deleted file mode 100644 index 8c4488d8cc1d..000000000000 --- a/ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist +++ /dev/null @@ -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"); diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index ccfcd5f8b5b2..6bdeec6c8bc0 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -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 diff --git a/ftp/ftpcopy/files/patch-src_typesize.sh b/ftp/ftpcopy/files/patch-src_typesize.sh index 4e995cbb53db..03f16e48a255 100644 --- a/ftp/ftpcopy/files/patch-src_typesize.sh +++ b/ftp/ftpcopy/files/patch-src_typesize.sh @@ -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 diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index 6cbc6c364bd3..05d991c92ffa 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -39,7 +39,7 @@ VIRTUALCHROOT_DESC= Follow symlinks outside a chroot jail 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=${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_open=no \ 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," diff --git a/games/blackjackclient/Makefile b/games/blackjackclient/Makefile index 4d507063b857..00a89e86f35e 100644 --- a/games/blackjackclient/Makefile +++ b/games/blackjackclient/Makefile @@ -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 && \ diff --git a/games/doomsday/Makefile b/games/doomsday/Makefile index 5f602f62eb51..7eda8dfffa2e 100644 --- a/games/doomsday/Makefile +++ b/games/doomsday/Makefile @@ -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> diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile index e30f4f4b6b0c..ad868a012bd9 100644 --- a/games/jchessboard/Makefile +++ b/games/jchessboard/Makefile @@ -14,9 +14,10 @@ COMMENT= Chess game and PGN viewer/editor written in Java 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} diff --git a/games/openbor/Makefile b/games/openbor/Makefile index 6a3c61f0a209..7a3c8b6cb325 100644 --- a/games/openbor/Makefile +++ b/games/openbor/Makefile @@ -52,15 +52,14 @@ TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor 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 diff --git a/games/quake-data/Makefile b/games/quake-data/Makefile index 7867d8f93190..7032b8e84d44 100644 --- a/games/quake-data/Makefile +++ b/games/quake-data/Makefile @@ -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 diff --git a/german/hunspell/Makefile b/german/hunspell/Makefile index e31a79e1adfb..24031a829d8a 100644 --- a/german/hunspell/Makefile +++ b/german/hunspell/Makefile @@ -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 diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile index 81a942ac0f4e..0612cb64c9f2 100644 --- a/graphics/Coin/Makefile +++ b/graphics/Coin/Makefile @@ -22,7 +22,6 @@ CONFIGURE_ARGS= --with-pthread=yes --enable-threadsafe \ --enable-3ds-import --enable-sound \ --enable-javascript-api --enable-debug=no USE_LDCONFIG= yes -MAKE_ENV= LANG=C INSTALL_TARGET= install-strip pre-configure: diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile index 9e62a601ce24..9b64ac7d19e0 100644 --- a/graphics/jogl/Makefile +++ b/graphics/jogl/Makefile @@ -34,12 +34,12 @@ USE_XORG= x11 xau xdamage xdmcp xext xf86vidmodeproto xfixes xproto xt \ 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 diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index a2ad0c8b3eeb..9b42091841a4 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -36,7 +36,6 @@ EXTRACT_AFTER_ARGS= -x '*/libz/*' -x zlib \ -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: diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile index 65d6f2b82aca..33ec081b8deb 100644 --- a/japanese/skk-jisyo/Makefile +++ b/japanese/skk-jisyo/Makefile @@ -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; \ } \ diff --git a/java/bootstrap-openjdk/Makefile.update b/java/bootstrap-openjdk/Makefile.update index c3da35f51d7e..1f32b53f32eb 100644 --- a/java/bootstrap-openjdk/Makefile.update +++ b/java/bootstrap-openjdk/Makefile.update @@ -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'." diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index d1bccbbb23e2..12f744a9b25b 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -29,10 +29,6 @@ SHEBANG_FILES= jrunscript.in launcher/launchers.in 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" diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile index b8ed172b2d42..9d0a38b74fa2 100644 --- a/java/jakarta-commons-httpclient/Makefile +++ b/java/jakarta-commons-httpclient/Makefile @@ -37,7 +37,7 @@ PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar 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 diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile index a7b3d5feed60..f3d6161748d1 100644 --- a/java/jfreechart/Makefile +++ b/java/jfreechart/Makefile @@ -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 diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index dcfe195412dd..adc9ad47ebcf 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -98,7 +98,7 @@ BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk 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 \ diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index ae872be3cd98..4052ca4ab8b5 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -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="" \ diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index d4fae8dfa93a..ff5ae60e67f9 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -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 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 diff --git a/mail/mew/files/patch-info__Makefile b/mail/mew/files/patch-info__Makefile index ba9dae34e941..d0f6a4fc5136 100644 --- a/mail/mew/files/patch-info__Makefile +++ b/mail/mew/files/patch-info__Makefile @@ -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 diff --git a/mail/wanderlust-devel/files/patch-Makefile b/mail/wanderlust-devel/files/patch-Makefile index 1b6534760592..2320a7e85703 100644 --- a/mail/wanderlust-devel/files/patch-Makefile +++ b/mail/wanderlust-devel/files/patch-Makefile @@ -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) diff --git a/mail/wanderlust/files/patch-Makefile b/mail/wanderlust/files/patch-Makefile index cdf17c95d230..9716ac1b2b66 100644 --- a/mail/wanderlust/files/patch-Makefile +++ b/mail/wanderlust/files/patch-Makefile @@ -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) diff --git a/math/geonext/Makefile b/math/geonext/Makefile index c7e1c9cacfdc..fcc13b42cab5 100644 --- a/math/geonext/Makefile +++ b/math/geonext/Makefile @@ -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 diff --git a/math/jakarta-commons-math/Makefile b/math/jakarta-commons-math/Makefile index 0c8411cb29f5..1b4e0181590a 100644 --- a/math/jakarta-commons-math/Makefile +++ b/math/jakarta-commons-math/Makefile @@ -18,9 +18,10 @@ COMMENT= Java library of self-contained mathematics and statistics components 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%%/${DESTJARFILE} OPTIONS_DEFINE= DOCS -MAKE_ENV= LANG=en_US.ISO8859-1 - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} diff --git a/math/jakarta-commons-math3/Makefile b/math/jakarta-commons-math3/Makefile index 4fbd46f06cb4..7f449daf7442 100644 --- a/math/jakarta-commons-math3/Makefile +++ b/math/jakarta-commons-math3/Makefile @@ -17,9 +17,10 @@ COMMENT= Java library of self-contained mathematics and statistics components 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%%/${DESTJARFILE} OPTIONS_DEFINE= DOCS -MAKE_ENV= LANG=en_US.ISO8859-1 - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile index 90fe791557f6..0be9495d44d5 100644 --- a/math/scilab-toolbox-sivp/Makefile +++ b/math/scilab-toolbox-sivp/Makefile @@ -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} diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile index f956be3146a8..c584dbba68f4 100644 --- a/math/scilab-toolbox-swt/Makefile +++ b/math/scilab-toolbox-swt/Makefile @@ -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} diff --git a/math/scilab/Makefile b/math/scilab/Makefile index f5183e14478e..fd254c167af9 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -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 diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile index df4786fae580..52f9f0b63bab 100644 --- a/multimedia/bino/Makefile +++ b/multimedia/bino/Makefile @@ -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> diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index ec61448fede0..cee801c5fb83 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -41,7 +41,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-vp8 \ --enable-vp9 MAKE_ARGS+= verbose=yes -MAKE_ENV= LC_ALL=C OPTIONS_SUB= SHARED diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile index 63bd0c7dcef4..4d303550e144 100644 --- a/multimedia/miro/Makefile +++ b/multimedia/miro/Makefile @@ -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> diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index d85f38d1b128..680ce5b62080 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -42,7 +42,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 diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index 2efb97a0d9d6..6673182d638b 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -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 diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile index 35755225ef28..55c7f5d7e48c 100644 --- a/net-p2p/vuze/Makefile +++ b/net-p2p/vuze/Makefile @@ -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} \ diff --git a/news/cnews/Makefile b/news/cnews/Makefile index 8417e15c7d49..6fb8e603bc1d 100644 --- a/news/cnews/Makefile +++ b/news/cnews/Makefile @@ -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> diff --git a/print/pdftk/Makefile b/print/pdftk/Makefile index f539abef6d20..890ad35348d6 100644 --- a/print/pdftk/Makefile +++ b/print/pdftk/Makefile @@ -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 diff --git a/science/colt/Makefile b/science/colt/Makefile index 2d88d567d086..d5bec5a20d3e 100644 --- a/science/colt/Makefile +++ b/science/colt/Makefile @@ -22,8 +22,8 @@ COMPILE_DESC= Install the pre-compiled .jar file .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 diff --git a/security/i2p/Makefile b/security/i2p/Makefile index ab5d31b5a287..104a0100c3e2 100644 --- a/security/i2p/Makefile +++ b/security/i2p/Makefile @@ -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= * diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile index 84b96dc7e91e..0b372b79091f 100644 --- a/security/isakmpd/Makefile +++ b/security/isakmpd/Makefile @@ -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 diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile index 10b5de519671..e907925b9f7b 100644 --- a/security/py-dfvfs/Makefile +++ b/security/py-dfvfs/Makefile @@ -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) diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile index dd6c16987309..34b874a05208 100644 --- a/security/py-plaso/Makefile +++ b/security/py-plaso/Makefile @@ -51,8 +51,9 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock 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) diff --git a/shells/fd/Makefile b/shells/fd/Makefile index 6a29cda473e4..2642ca39e2d4 100644 --- a/shells/fd/Makefile +++ b/shells/fd/Makefile @@ -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" \ diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 958499f2dcd5..f54668ba81fc 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --with-mp3-support=no --with-ogg-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 diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile index 92e9259330f0..715b4463f295 100644 --- a/sysutils/pciutils/Makefile +++ b/sysutils/pciutils/Makefile @@ -20,7 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids 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 \ diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile index da2011521476..37e067cdba30 100644 --- a/sysutils/sformat/Makefile +++ b/sysutils/sformat/Makefile @@ -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: diff --git a/textproc/linuxdoc-tools/Makefile b/textproc/linuxdoc-tools/Makefile index 97477a6a7adf..2e192cd4ae98 100644 --- a/textproc/linuxdoc-tools/Makefile +++ b/textproc/linuxdoc-tools/Makefile @@ -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> diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile index 9173d67acdfc..1afb3a7e561b 100644 --- a/textproc/msort/Makefile +++ b/textproc/msort/Makefile @@ -28,7 +28,6 @@ MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include" 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 diff --git a/textproc/te-hunspell/Makefile b/textproc/te-hunspell/Makefile index c89bd38b9b1d..2042ac85fa75 100644 --- a/textproc/te-hunspell/Makefile +++ b/textproc/te-hunspell/Makefile @@ -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}/ diff --git a/www/jericho-html/Makefile b/www/jericho-html/Makefile index e79f3b58d5c4..e101e826f78d 100644 --- a/www/jericho-html/Makefile +++ b/www/jericho-html/Makefile @@ -21,7 +21,7 @@ PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar 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) diff --git a/www/tdom/Makefile b/www/tdom/Makefile index b09008282e8f..d6fa20a995bc 100644 --- a/www/tdom/Makefile +++ b/www/tdom/Makefile @@ -20,7 +20,6 @@ USE_GITHUB= yes CONFIGURE_ARGS= --enable-threads --disable-tdomalloc TEST_TARGET= test -TEST_ENV= LANG=C PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/www/tinymce/Makefile b/www/tinymce/Makefile index 9da729d5412d..8c6603861dec 100644 --- a/www/tinymce/Makefile +++ b/www/tinymce/Makefile @@ -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} diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile index 22ab5947b921..e0667e81440e 100644 --- a/www/trac-tags/Makefile +++ b/www/trac-tags/Makefile @@ -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" diff --git a/www/trac-wysiwyg/Makefile b/www/trac-wysiwyg/Makefile index 30430cd9afcb..9acacf11c013 100644 --- a/www/trac-wysiwyg/Makefile +++ b/www/trac-wysiwyg/Makefile @@ -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" diff --git a/www/websh/Makefile b/www/websh/Makefile index 01c1b7ee4a15..e1f7c7f3a684 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -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}' diff --git a/www/zenphoto/Makefile b/www/zenphoto/Makefile index ab7374454d13..5cb651d1973e 100644 --- a/www/zenphoto/Makefile +++ b/www/zenphoto/Makefile @@ -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 diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index e899f683d928..bffd701eee58 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -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 diff --git a/x11-toolkits/Xmt/Makefile b/x11-toolkits/Xmt/Makefile index f1bcb1e1f3fc..76d96af81495 100644 --- a/x11-toolkits/Xmt/Makefile +++ b/x11-toolkits/Xmt/Makefile @@ -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 diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 03300004edd3..5c2b08586b27 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -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 diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile index 6d39afc9b168..ad3fab57dda0 100644 --- a/x11-toolkits/p5-Gtk2/Makefile +++ b/x11-toolkits/p5-Gtk2/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= p5-Cairo>=1:graphics/p5-Cairo \ 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 |