Index: devel/icu/Makefile
===================================================================
--- devel/icu/Makefile
+++ devel/icu/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	icu
-DISTVERSION=	63_1
-PORTREVISION?=	1 # keep for icu-lx
+DISTVERSION=	64rc2
+PORTREVISION?=	0 # keep for icu-lx
 PORTEPOCH?=	1
 CATEGORIES?=	devel
-MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/_/-/g}/ \
+MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \
 		SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
 DISTNAME=	icu4c-${DISTVERSION}-src
 
@@ -27,12 +27,12 @@
 CPPFLAGS+=	-DICU_NO_USER_DATA_OVERRIDE
 MAKE_ARGS=	VERBOSE=1
 TEST_TARGET=	check
-USES+=		compiler:c++11-lib gmake pathfix tar:tgz
+USES+=		compiler:c++11-lib gmake pathfix python:build tar:tgz
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/icu/source
 
 ICUMAJOR=	${PORTVERSION:C/\..*//}
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION}
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}
 
 .ifndef PKGNAMESUFFIX
 post-install:
@@ -44,7 +44,7 @@
 	@${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})
+		${DATADIR_REL}/${PORTVERSION:C/r.?/1/}/icudt*.dat >>${TMPPLIST})
 .endif # PKGNAMESUFFIX
 
 .include <bsd.port.mk>
Index: devel/icu/distinfo
===================================================================
--- devel/icu/distinfo
+++ devel/icu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538433596
-SHA256 (icu4c-63_1-src.tgz) = 05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
-SIZE (icu4c-63_1-src.tgz) = 23746939
+TIMESTAMP = 1551789434
+SHA256 (icu4c-64rc2-src.tgz) = 1fb0b4300a344f6d21bf6c7d4a557d96062aa0b409d915f74dccbbacb655c499
+SIZE (icu4c-64rc2-src.tgz) = 24008234
Index: devel/icu/files/patch-common_umutex.cpp
===================================================================
--- devel/icu/files/patch-common_umutex.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- common/umutex.cpp.orig	2016-03-23 20:50:10 UTC
-+++ common/umutex.cpp
-@@ -264,19 +264,19 @@ static pthread_cond_t initCondition = PT
- U_COMMON_API UBool U_EXPORT2
- umtx_initImplPreInit(UInitOnce &uio) {
-     pthread_mutex_lock(&initMutex);
--    int32_t state = uio.fState;
-+    int32_t state = umtx_loadAcquire(uio.fState);
-     if (state == 0) {
-         umtx_storeRelease(uio.fState, 1);
-         pthread_mutex_unlock(&initMutex);
-         return TRUE;   // Caller will next call the init function.
-     } else {
--        while (uio.fState == 1) {
-+        while (umtx_loadAcquire(uio.fState) == 1) {
-             // Another thread is currently running the initialization.
-             // Wait until it completes.
-             pthread_cond_wait(&initCondition, &initMutex);
-         }
-         pthread_mutex_unlock(&initMutex);
--        U_ASSERT(uio.fState == 2);
-+        U_ASSERT(umtx_loadAcquire(uio.fState) == 2);
-         return FALSE;
-     }
- }
Index: devel/icu/pkg-plist
===================================================================
--- devel/icu/pkg-plist
+++ devel/icu/pkg-plist
@@ -73,6 +73,7 @@
 include/unicode/filteredbrk.h
 include/unicode/fmtable.h
 include/unicode/format.h
+include/unicode/formattedvalue.h
 include/unicode/fpositer.h
 include/unicode/gender.h
 include/unicode/gregocal.h
@@ -80,6 +81,7 @@
 include/unicode/icuplug.h
 include/unicode/idna.h
 include/unicode/listformatter.h
+include/unicode/localebuilder.h
 include/unicode/localpointer.h
 include/unicode/locdspnm.h
 include/unicode/locid.h
@@ -165,6 +167,7 @@
 include/unicode/uenum.h
 include/unicode/ufieldpositer.h
 include/unicode/uformattable.h
+include/unicode/uformattedvalue.h
 include/unicode/ugender.h
 include/unicode/uidna.h
 include/unicode/uiter.h