Index: branches/2018Q3/devel/icu/Makefile
===================================================================
--- branches/2018Q3/devel/icu/Makefile	(revision 473974)
+++ branches/2018Q3/devel/icu/Makefile	(revision 473975)
@@ -1,50 +1,50 @@
 # Created by: dwm
 # $FreeBSD$
 
 PORTNAME=	icu
 DISTVERSION=	62_1
-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}/ \
 		SF/${PORTNAME}/${PORTNAME:tu}4C/${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++11-lib 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: branches/2018Q3/devel/icu/files/patch-r41550
===================================================================
--- branches/2018Q3/devel/icu/files/patch-r41550	(nonexistent)
+++ branches/2018Q3/devel/icu/files/patch-r41550	(revision 473975)
@@ -0,0 +1,77 @@
+https://ssl.icu-project.org/trac/ticket/13851
+
+--- common/ucase.cpp.orig	2018-06-21 09:39:23 UTC
++++ common/ucase.cpp
+@@ -270,6 +270,7 @@ ucase_addCaseClosure(UChar32 c, const USetAdder *sa) {
+             }
+         }
+         if(HAS_SLOT(excWord, UCASE_EXC_DELTA)) {
++            pe=pe0;
+             int32_t delta;
+             GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
+             sa->add(sa->set, (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta);
+@@ -1167,7 +1168,7 @@ ucase_toFullLower(UChar32 c,
+ 
+         if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_IS_UPPER_OR_TITLE(props)) {
+             int32_t delta;
+-            GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
++            GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta);
+             return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta;
+         }
+         if(HAS_SLOT(excWord, UCASE_EXC_LOWER)) {
+@@ -1261,7 +1262,7 @@ toUpperOrTitle(UChar32 c,
+ 
+         if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_GET_TYPE(props)==UCASE_LOWER) {
+             int32_t delta;
+-            GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
++            GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta);
+             return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta;
+         }
+         if(!upperNotTitle && HAS_SLOT(excWord, UCASE_EXC_TITLE)) {
+@@ -1469,7 +1470,7 @@ ucase_toFullFolding(UChar32 c,
+         }
+         if(HAS_SLOT(excWord, UCASE_EXC_DELTA) && UCASE_IS_UPPER_OR_TITLE(props)) {
+             int32_t delta;
+-            GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe, delta);
++            GET_SLOT_VALUE(excWord, UCASE_EXC_DELTA, pe2, delta);
+             return (excWord&UCASE_EXC_DELTA_IS_NEGATIVE)==0 ? c+delta : c-delta;
+         }
+         if(HAS_SLOT(excWord, UCASE_EXC_FOLD)) {
+--- test/intltest/strcase.cpp.orig	2018-06-21 09:38:41 UTC
++++ test/intltest/strcase.cpp
+@@ -68,6 +68,7 @@ class StringCaseTest: public IntlTest { (public)
+     void TestBug13127();
+     void TestInPlaceTitle();
+     void TestCaseMapEditsIteratorDocs();
++    void TestCaseMapGreekExtended();
+ 
+ private:
+     void assertGreekUpper(const char16_t *s, const char16_t *expected);
+@@ -113,6 +114,7 @@ StringCaseTest::runIndexedTest(int32_t index, UBool ex
+     TESTCASE_AUTO(TestInPlaceTitle);
+ #endif
+     TESTCASE_AUTO(TestCaseMapEditsIteratorDocs);
++    TESTCASE_AUTO(TestCaseMapGreekExtended);
+     TESTCASE_AUTO_END;
+ }
+ 
+@@ -1683,6 +1685,19 @@ void StringCaseTest::TestCaseMapEditsIteratorDocs() {
+                 expectedSrcCoarseStringIndices[destIndex],
+                 coarseChangesIterator.sourceIndexFromDestinationIndex(destIndex, status));
+     }
++}
++
++void StringCaseTest::TestCaseMapGreekExtended() {
++    // Ticket 13851
++    UnicodeString s(u"\u1F80\u1F88\u1FFC");
++    UnicodeString result(s);
++    result.toLower(Locale::getRoot());
++    assertEquals(u"lower", u"\u1F80\u1F80\u1FF3", result);
++#if !UCONFIG_NO_BREAK_ITERATION
++    result = s;
++    result.toTitle(nullptr, Locale::getRoot());
++    assertEquals(u"title", u"\u1F88\u1F80\u1FF3", result);
++#endif
+ }
+ 
+ //#endif

Property changes on: branches/2018Q3/devel/icu/files/patch-r41550
___________________________________________________________________
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
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 473974)
+++ branches/2018Q3	(revision 473975)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r473974