Index: head/devel/icu/Makefile
===================================================================
--- head/devel/icu/Makefile	(revision 437960)
+++ head/devel/icu/Makefile	(revision 437961)
@@ -1,49 +1,49 @@
 # Created by: dwm
 # $FreeBSD$
 
 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}/
 DISTNAME=	icu4c-${DISTVERSION}-src
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT?=	International Components for Unicode (from IBM)
 
 LICENSE=	ICU
 LICENSE_NAME=	ICU license
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-layoutex
 CONFIGURE_ARGS+=--with-data-packaging=archive \
 		--disable-renaming \
 		--disable-samples \
 		--enable-static
 CPPFLAGS+=	-DICU_NO_USER_DATA_OVERRIDE
 MAKE_ARGS=	VERBOSE=1
 TEST_TARGET=	check
 USES+=		compiler:c++0x gmake pathfix tar:tgz
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/icu/source
 
 ICUMAJOR=	${PORTVERSION:C/\..*//}
 PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION}
 
 .ifndef PKGNAMESUFFIX
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \
 		${STAGEDIR}${PREFIX}/bin/*conv \
 		${STAGEDIR}${PREFIX}/bin/icuinfo \
 		${STAGEDIR}${PREFIX}/bin/derb \
 		${STAGEDIR}${PREFIX}/bin/pkgdata
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
 # Filename varies by endianness: icudt<major>b.dat vs. icudt<major>l.dat
 	@(cd ${STAGEDIR}${PREFIX} && ${ECHO_CMD} \
 		${DATADIR_REL}/${PORTVERSION}/icudt*.dat >>${TMPPLIST})
 .endif # PKGNAMESUFFIX
 
 .include <bsd.port.mk>
Index: head/devel/icu/files/patch-common_putil.cpp
===================================================================
--- head/devel/icu/files/patch-common_putil.cpp	(nonexistent)
+++ head/devel/icu/files/patch-common_putil.cpp	(revision 437961)
@@ -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.

Property changes on: head/devel/icu/files/patch-common_putil.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property