svn commit: r431796 - in head: Mk Mk/Scripts Mk/Uses archivers/libzip audio/denemo audio/libamrnb audio/libamrwb base/gcc cad/astk-serveur cad/jspice3/files chinese/big5width devel/cutter devel/lib...
Tijl Coosemans
tijl at FreeBSD.org
Wed Jan 18 13:20:40 UTC 2017
Author: tijl
Date: Wed Jan 18 13:20:31 2017
New Revision: 431796
URL: https://svnweb.freebsd.org/changeset/ports/431796
Log:
The output of tools like awk, date, sort, tr,... depends on the current
locale set by the user. Add LANG=C and LC_ALL=C at the beginning of
bsd.port.mk and export them so all commands are executed with the C locale.
LC_ALL=C overrides all other LC_* variables. LANG is used by setlocale(3)
as default value for LC_* variables, so normally it isn't used when LC_ALL
is set, but there's code out there that looks at LANG directly so it's safer
to set it as well. The only commands not captured by this are !=
assignments before any inclusion of bsd.port.*mk.
Introduce USE_LOCALE=<locale> that adds LANG=<locale> and LC_ALL=<locale> to
CONFIGURE_ENV and MAKE_ENV so upstream build systems can be executed with a
different locale (e.g. USE_LOCALE=en_US.UTF-8).
PR: 215882
Exp-run by: antoine
Approved by: portmgr (antoine)
Deleted:
head/ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist
Modified:
head/Mk/Scripts/check-stagedir.sh
head/Mk/Uses/elixir.mk
head/Mk/Uses/gem.mk
head/Mk/bsd.commands.mk
head/Mk/bsd.port.mk
head/archivers/libzip/Makefile
head/audio/denemo/Makefile
head/audio/libamrnb/Makefile
head/audio/libamrwb/Makefile
head/base/gcc/Makefile
head/cad/astk-serveur/Makefile
head/cad/jspice3/files/patch-build
head/chinese/big5width/Makefile
head/chinese/big5width/pkg-plist
head/devel/cutter/Makefile
head/devel/libc++/Makefile
head/devel/libedit/Makefile
head/devel/libopenbsd/Makefile
head/devel/libpci/Makefile
head/devel/libublio/Makefile
head/devel/powerpc64-gcc/Makefile
head/devel/riscv64-gcc/Makefile
head/devel/tcllib/Makefile
head/dns/maradns/Makefile
head/editors/emacs-devel/Makefile
head/editors/emacs/Makefile
head/editors/libreoffice/Makefile
head/editors/libreoffice4/Makefile
head/editors/openoffice-4/Makefile
head/editors/openoffice-devel/Makefile
head/editors/tea/Makefile
head/editors/yudit/Makefile
head/emulators/tme/Makefile
head/ftp/curl/Makefile
head/ftp/ftpcopy/files/patch-src_typesize.sh
head/ftp/pure-ftpd/Makefile
head/games/blackjackclient/Makefile
head/games/doomsday/Makefile
head/games/jchessboard/Makefile
head/games/openbor/Makefile
head/games/quake-data/Makefile
head/german/hunspell/Makefile
head/graphics/Coin/Makefile
head/graphics/jogl/Makefile
head/graphics/libimg/Makefile
head/japanese/skk-jisyo/Makefile
head/java/bootstrap-openjdk/Makefile.update
head/java/icedtea-web/Makefile
head/java/jakarta-commons-httpclient/Makefile
head/java/jfreechart/Makefile
head/java/openjdk6/Makefile
head/java/openjdk7/Makefile
head/java/openjdk8/Makefile
head/lang/elixir/Makefile
head/lang/gauche/Makefile
head/lang/gcc/Makefile
head/lang/gcc48/Makefile
head/lang/gcc49/Makefile
head/lang/gcc5-devel/Makefile
head/lang/gcc5/Makefile
head/lang/gcc6-devel/Makefile
head/lang/gcc6/Makefile
head/lang/ghc/Makefile
head/lang/ghc/bsd.cabal.mk
head/lang/mono/Makefile
head/lang/perl5-devel/Makefile
head/lang/perl5.20/Makefile
head/lang/perl5.22/Makefile
head/lang/perl5.24/Makefile
head/lang/rubinius/Makefile
head/lang/ruby21/Makefile
head/lang/ruby22/Makefile
head/lang/ruby23/Makefile
head/lang/ruby24/Makefile
head/lang/tcl84/Makefile
head/lang/tcl85/Makefile
head/lang/tcl86/Makefile
head/lang/tcl87/Makefile
head/lang/yap-devel/Makefile
head/mail/mew/files/patch-info__Makefile
head/mail/wanderlust-devel/files/patch-Makefile
head/mail/wanderlust/files/patch-Makefile
head/math/geonext/Makefile
head/math/jakarta-commons-math/Makefile
head/math/jakarta-commons-math3/Makefile
head/math/scilab-toolbox-sivp/Makefile
head/math/scilab-toolbox-swt/Makefile
head/math/scilab/Makefile
head/multimedia/bino/Makefile
head/multimedia/libvpx/Makefile
head/multimedia/miro/Makefile
head/net-mgmt/smokeping/Makefile
head/net-p2p/mldonkey/Makefile
head/net-p2p/vuze/Makefile
head/news/cnews/Makefile
head/print/pdftk/Makefile
head/science/colt/Makefile
head/security/i2p/Makefile
head/security/isakmpd/Makefile
head/security/py-dfvfs/Makefile
head/security/py-plaso/Makefile
head/shells/fd/Makefile
head/sysutils/cdrdao/Makefile
head/sysutils/pciutils/Makefile
head/sysutils/sformat/Makefile
head/textproc/linuxdoc-tools/Makefile
head/textproc/msort/Makefile
head/textproc/te-hunspell/Makefile
head/www/jericho-html/Makefile
head/www/tdom/Makefile
head/www/tinymce/Makefile
head/www/trac-tags/Makefile
head/www/trac-wysiwyg/Makefile
head/www/websh/Makefile
head/www/zenphoto/Makefile
head/x11-fonts/fontconfig/Makefile
head/x11-toolkits/Xmt/Makefile
head/x11-toolkits/open-motif/Makefile
head/x11-toolkits/p5-Gtk2/Makefile
Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh Wed Jan 18 13:19:25 2017 (r431795)
+++ head/Mk/Scripts/check-stagedir.sh Wed Jan 18 13:20:31 2017 (r431796)
@@ -12,7 +12,6 @@
# c. Files in plist which are owned by dependencies/MTREEs
set -e
-export LC_ALL=C
. ${SCRIPTSDIR}/functions.sh
Modified: head/Mk/Uses/elixir.mk
==============================================================================
--- head/Mk/Uses/elixir.mk Wed Jan 18 13:19:25 2017 (r431795)
+++ head/Mk/Uses/elixir.mk Wed Jan 18 13:20:31 2017 (r431796)
@@ -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?=
Modified: head/Mk/Uses/gem.mk
==============================================================================
--- head/Mk/Uses/gem.mk Wed Jan 18 13:19:25 2017 (r431795)
+++ head/Mk/Uses/gem.mk Wed Jan 18 13:20:31 2017 (r431796)
@@ -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}" \
Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk Wed Jan 18 13:19:25 2017 (r431795)
+++ head/Mk/bsd.commands.mk Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Wed Jan 18 13:19:25 2017 (r431795)
+++ head/Mk/bsd.port.mk Wed Jan 18 13:20:31 2017 (r431796)
@@ -348,7 +348,10 @@ FreeBSD_MAINTAINER= portmgr at 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 at 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/,/
.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)
Modified: head/archivers/libzip/Makefile
==============================================================================
--- head/archivers/libzip/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/archivers/libzip/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/audio/denemo/Makefile
==============================================================================
--- head/audio/denemo/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/audio/denemo/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/audio/libamrnb/Makefile
==============================================================================
--- head/audio/libamrnb/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/audio/libamrnb/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/audio/libamrwb/Makefile
==============================================================================
--- head/audio/libamrwb/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/audio/libamrwb/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/base/gcc/Makefile
==============================================================================
--- head/base/gcc/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/base/gcc/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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 \
Modified: head/cad/astk-serveur/Makefile
==============================================================================
--- head/cad/astk-serveur/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/cad/astk-serveur/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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|}
Modified: head/cad/jspice3/files/patch-build
==============================================================================
--- head/cad/jspice3/files/patch-build Wed Jan 18 13:19:25 2017 (r431795)
+++ head/cad/jspice3/files/patch-build Wed Jan 18 13:20:31 2017 (r431796)
@@ -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 .
Modified: head/chinese/big5width/Makefile
==============================================================================
--- head/chinese/big5width/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/chinese/big5width/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -8,15 +8,15 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= ports at 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>
Modified: head/chinese/big5width/pkg-plist
==============================================================================
--- head/chinese/big5width/pkg-plist Wed Jan 18 13:19:25 2017 (r431795)
+++ head/chinese/big5width/pkg-plist Wed Jan 18 13:20:31 2017 (r431796)
@@ -1,3 +1,3 @@
-share/locale/%%LANG%%/LC_CTYPE
- at unexec ln -fs ../UTF-8/LC_CTYPE %%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE
- at exec ln -fs %D/share/locale/%%LANG%%/LC_CTYPE %%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE
+share/locale/%%LOCALE%%/LC_CTYPE
+ at unexec ln -fs ../UTF-8/LC_CTYPE %%BASELOCALEDIR%%/%%LOCALE%%/LC_CTYPE
+ at exec ln -fs %D/share/locale/%%LOCALE%%/LC_CTYPE %%BASELOCALEDIR%%/%%LOCALE%%/LC_CTYPE
Modified: head/devel/cutter/Makefile
==============================================================================
--- head/devel/cutter/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/cutter/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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}
Modified: head/devel/libc++/Makefile
==============================================================================
--- head/devel/libc++/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/libc++/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/devel/libedit/Makefile
==============================================================================
--- head/devel/libedit/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/libedit/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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-*
Modified: head/devel/libopenbsd/Makefile
==============================================================================
--- head/devel/libopenbsd/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/libopenbsd/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/devel/libpci/Makefile
==============================================================================
--- head/devel/libpci/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/libpci/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/devel/libublio/Makefile
==============================================================================
--- head/devel/libublio/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/libublio/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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}
Modified: head/devel/powerpc64-gcc/Makefile
==============================================================================
--- head/devel/powerpc64-gcc/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/powerpc64-gcc/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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++ \
Modified: head/devel/riscv64-gcc/Makefile
==============================================================================
--- head/devel/riscv64-gcc/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/riscv64-gcc/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/devel/tcllib/Makefile
==============================================================================
--- head/devel/tcllib/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/devel/tcllib/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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>
Modified: head/dns/maradns/Makefile
==============================================================================
--- head/dns/maradns/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/dns/maradns/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/emacs-devel/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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 \
Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/emacs/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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 \
Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/libreoffice/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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= #
Modified: head/editors/libreoffice4/Makefile
==============================================================================
--- head/editors/libreoffice4/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/libreoffice4/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/openoffice-4/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/openoffice-devel/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/editors/tea/Makefile
==============================================================================
--- head/editors/tea/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/tea/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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= *
Modified: head/editors/yudit/Makefile
==============================================================================
--- head/editors/yudit/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/editors/yudit/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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= *
Modified: head/emulators/tme/Makefile
==============================================================================
--- head/emulators/tme/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/emulators/tme/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/ftp/curl/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/ftp/ftpcopy/files/patch-src_typesize.sh
==============================================================================
--- head/ftp/ftpcopy/files/patch-src_typesize.sh Wed Jan 18 13:19:25 2017 (r431795)
+++ head/ftp/ftpcopy/files/patch-src_typesize.sh Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/ftp/pure-ftpd/Makefile
==============================================================================
--- head/ftp/pure-ftpd/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/ftp/pure-ftpd/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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,"
Modified: head/games/blackjackclient/Makefile
==============================================================================
--- head/games/blackjackclient/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/games/blackjackclient/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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 && \
Modified: head/games/doomsday/Makefile
==============================================================================
--- head/games/doomsday/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/games/doomsday/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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>
Modified: head/games/jchessboard/Makefile
==============================================================================
--- head/games/jchessboard/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/games/jchessboard/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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}
Modified: head/games/openbor/Makefile
==============================================================================
--- head/games/openbor/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/games/openbor/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/games/quake-data/Makefile
==============================================================================
--- head/games/quake-data/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/games/quake-data/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/german/hunspell/Makefile
==============================================================================
--- head/german/hunspell/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/german/hunspell/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/graphics/Coin/Makefile
==============================================================================
--- head/graphics/Coin/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/graphics/Coin/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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:
Modified: head/graphics/jogl/Makefile
==============================================================================
--- head/graphics/jogl/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/graphics/jogl/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/graphics/libimg/Makefile
==============================================================================
--- head/graphics/libimg/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/graphics/libimg/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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:
Modified: head/japanese/skk-jisyo/Makefile
==============================================================================
--- head/japanese/skk-jisyo/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/japanese/skk-jisyo/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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; \
} \
Modified: head/java/bootstrap-openjdk/Makefile.update
==============================================================================
--- head/java/bootstrap-openjdk/Makefile.update Wed Jan 18 13:19:25 2017 (r431795)
+++ head/java/bootstrap-openjdk/Makefile.update Wed Jan 18 13:20:31 2017 (r431796)
@@ -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'."
Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/java/icedtea-web/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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"
Modified: head/java/jakarta-commons-httpclient/Makefile
==============================================================================
--- head/java/jakarta-commons-httpclient/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/java/jakarta-commons-httpclient/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/java/jfreechart/Makefile
==============================================================================
--- head/java/jfreechart/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/java/jfreechart/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/java/openjdk6/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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 \
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/java/openjdk7/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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="" \
Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/java/openjdk8/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/lang/elixir/Makefile
==============================================================================
--- head/lang/elixir/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/elixir/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/lang/gauche/Makefile
==============================================================================
--- head/lang/gauche/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gauche/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gcc/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gcc48/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gcc49/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/lang/gcc5-devel/Makefile
==============================================================================
--- head/lang/gcc5-devel/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gcc5-devel/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gcc5/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/lang/gcc6-devel/Makefile
==============================================================================
--- head/lang/gcc6-devel/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gcc6-devel/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/lang/gcc6/Makefile
==============================================================================
--- head/lang/gcc6/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/gcc6/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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} \
Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/ghc/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/ghc/bsd.cabal.mk Wed Jan 18 13:20:31 2017 (r431796)
@@ -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
Modified: head/lang/mono/Makefile
==============================================================================
--- head/lang/mono/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/mono/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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*
Modified: head/lang/perl5-devel/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/perl5-devel/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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, at .*,,} -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} \
Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/perl5.20/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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, at .*,,} -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} \
Modified: head/lang/perl5.22/Makefile
==============================================================================
--- head/lang/perl5.22/Makefile Wed Jan 18 13:19:25 2017 (r431795)
+++ head/lang/perl5.22/Makefile Wed Jan 18 13:20:31 2017 (r431796)
@@ -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, at .*,,} -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=""
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list