aboutsummaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2017-01-18 13:20:31 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2017-01-18 13:20:31 +0000
commit02f27a83b44d4566fd409edc60570ac0734eb63e (patch)
tree62d2805fd9c9c4285034b54a2ccb3f498f302811 /ftp
parentbddf1289efd81317364118eb60cdc28cc766c3c2 (diff)
downloadports-02f27a83b44d4566fd409edc60570ac0734eb63e.tar.gz
ports-02f27a83b44d4566fd409edc60570ac0734eb63e.zip
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)
Notes
Notes: svn path=/head/; revision=431796
Diffstat (limited to 'ftp')
-rw-r--r--ftp/bsdftpd-ssl/files/patch-contrib-libedit-makelist13
-rw-r--r--ftp/curl/Makefile1
-rw-r--r--ftp/ftpcopy/files/patch-src_typesize.sh2
-rw-r--r--ftp/pure-ftpd/Makefile6
4 files changed, 4 insertions, 18 deletions
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,"