devel/icu: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2017-04-08 15:59:33 +02:00
parent c1db3fbee2
commit 68bc4eeb93
2 changed files with 33 additions and 1 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= icu
DISTVERSION= 58_2
PORTREVISION?= 0 # keep for icu-lx
PORTREVISION?= 1 # keep for icu-lx
PORTEPOCH?= 1
CATEGORIES?= devel
MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/

View file

@ -0,0 +1,32 @@
--- common/putil.cpp.orig 2016-10-19 17:20:56 UTC
+++ common/putil.cpp
@@ -1789,7 +1789,7 @@ remapPlatformDependentCodepage(const cha
*/
name = "ISO-8859-1";
}
-#elif U_PLATFORM_IS_DARWIN_BASED
+#elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM == U_PF_BSD
if (locale == NULL && *name == 0) {
/*
No locale was specified, and an empty name was passed in.
@@ -1808,11 +1808,6 @@ remapPlatformDependentCodepage(const cha
*/
name = "UTF-8";
}
-#elif U_PLATFORM == U_PF_BSD
- if (uprv_strcmp(name, "CP949") == 0) {
- /* Remap CP949 to a similar codepage to avoid issues with backslash and won symbol. */
- name = "EUC-KR";
- }
#elif U_PLATFORM == U_PF_HPUX
if (locale != NULL && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {
/* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */
@@ -1942,7 +1937,7 @@ int_getDefaultCodepage()
nl_langinfo may use the same buffer as setlocale. */
{
const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET);
-#if U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED
+#if U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD
/*
* On Linux and MacOSX, ensure that default codepage for non C/POSIX locale is UTF-8
* instead of ASCII.