devel/icu: update to 60.1

Changes:	http://site.icu-project.org/download/60
ABI:		https://abi-laboratory.pro/tracker/timeline/icu4c/
PR:		223373
Exp-run by:	antoine

18 files changed, 317 insertions, 22 deletions

diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 30da37ea6450..ba89ddc4371d 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	boost-libs
+PORTREVISION=	1
 
 COMMENT=	Free portable C++ libraries (without Boost.Python)
 
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index 1e2bcad4e16f..b89ed1c454b7 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dee
 PORTVERSION=	1.2.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/151383425/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 44f7d928566f..8e91ca53f497 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.50.2
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index a0b0f547c996..a182813385ad 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	text-icu
 PORTVERSION=	0.7.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/icu-le-hb/Makefile b/devel/icu-le-hb/Makefile
index 5fcb3383d971..32e2fcdc4937 100644
--- a/devel/icu-le-hb/Makefile
+++ b/devel/icu-le-hb/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	icu-le-hb
 DISTVERSION=	1.0.3-3
 DISTVERSIONSUFFIX=	-gb8a3163
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel print
 
 MAINTAINER=	office@FreeBSD.org
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 8a54a4a02090..9ece5003897d 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	icu
-DISTVERSION=	59_1
+DISTVERSION=	60_1
 PORTREVISION?=	0 # keep for icu-lx
 PORTEPOCH?=	1
 CATEGORIES?=	devel
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index 28ae3f263b83..addd07e70fda 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491550830
-SHA256 (icu4c-59_1-src.tgz) = 7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe
-SIZE (icu4c-59_1-src.tgz) = 22706578
+TIMESTAMP = 1509477637
+SHA256 (icu4c-60_1-src.tgz) = f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
+SIZE (icu4c-60_1-src.tgz) = 23296064
diff --git a/devel/icu/files/patch-common_unicode_uvernum.h b/devel/icu/files/patch-common_unicode_uvernum.h
deleted file mode 100644
index 21af34231d25..000000000000
--- a/devel/icu/files/patch-common_unicode_uvernum.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- common/unicode/uvernum.h.orig	2017-03-21 01:03:49 UTC
-+++ common/unicode/uvernum.h
-@@ -125,4 +125,4 @@
-  *  This value will change in the subsequent releases of ICU
-  *  @stable ICU 2.6
-  */
--#if U_PLATFORM_HAS_WINUWP_API == 0
-+#ifndef U_PLATFORM_HAS_WINUWP_API
diff --git a/devel/icu/files/patch-revert-r40077 b/devel/icu/files/patch-revert-r40077
new file mode 100644
index 000000000000..a647f3920140
--- /dev/null
+++ b/devel/icu/files/patch-revert-r40077
@@ -0,0 +1,297 @@
+Revert https://ssl.icu-project.org/trac/changeset/40077
+until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222433
+
+--- common/cmemory.h.orig	2017-10-06 01:37:59 UTC
++++ common/cmemory.h
+@@ -162,6 +162,7 @@ class LocalMemory : public LocalPointerBase<T> { (publ
+      * @param p simple pointer to an array of T items that is adopted
+      */
+     explicit LocalMemory(T *p=NULL) : LocalPointerBase<T>(p) {}
++#if U_HAVE_RVALUE_REFERENCES
+     /**
+      * Move constructor, leaves src with isNull().
+      * @param src source smart pointer
+@@ -169,12 +170,14 @@ class LocalMemory : public LocalPointerBase<T> { (publ
+     LocalMemory(LocalMemory<T> &&src) U_NOEXCEPT : LocalPointerBase<T>(src.ptr) {
+         src.ptr=NULL;
+     }
++#endif
+     /**
+      * Destructor deletes the memory it owns.
+      */
+     ~LocalMemory() {
+         uprv_free(LocalPointerBase<T>::ptr);
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     /**
+      * Move assignment operator, leaves src with isNull().
+      * The behavior is undefined if *this and src are the same object.
+@@ -184,6 +187,7 @@ class LocalMemory : public LocalPointerBase<T> { (publ
+     LocalMemory<T> &operator=(LocalMemory<T> &&src) U_NOEXCEPT {
+         return moveFrom(src);
+     }
++#endif
+     /**
+      * Move assignment, leaves src with isNull().
+      * The behavior is undefined if *this and src are the same object.
+--- common/unicode/localpointer.h.orig	2017-04-26 20:23:44 UTC
++++ common/unicode/localpointer.h
+@@ -213,6 +213,7 @@ class LocalPointer : public LocalPointerBase<T> { (pub
+             errorCode=U_MEMORY_ALLOCATION_ERROR;
+         }
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     /**
+      * Move constructor, leaves src with isNull().
+      * @param src source smart pointer
+@@ -221,6 +222,7 @@ class LocalPointer : public LocalPointerBase<T> { (pub
+     LocalPointer(LocalPointer<T> &&src) U_NOEXCEPT : LocalPointerBase<T>(src.ptr) {
+         src.ptr=NULL;
+     }
++#endif
+     /**
+      * Destructor deletes the object it owns.
+      * @stable ICU 4.4
+@@ -228,6 +230,7 @@ class LocalPointer : public LocalPointerBase<T> { (pub
+     ~LocalPointer() {
+         delete LocalPointerBase<T>::ptr;
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     /**
+      * Move assignment operator, leaves src with isNull().
+      * The behavior is undefined if *this and src are the same object.
+@@ -238,6 +241,7 @@ class LocalPointer : public LocalPointerBase<T> { (pub
+     LocalPointer<T> &operator=(LocalPointer<T> &&src) U_NOEXCEPT {
+         return moveFrom(src);
+     }
++#endif
+     // do not use #ifndef U_HIDE_DRAFT_API for moveFrom, needed by non-draft API
+     /**
+      * Move assignment, leaves src with isNull().
+@@ -358,6 +362,7 @@ class LocalArray : public LocalPointerBase<T> { (publi
+             errorCode=U_MEMORY_ALLOCATION_ERROR;
+         }
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     /**
+      * Move constructor, leaves src with isNull().
+      * @param src source smart pointer
+@@ -366,6 +371,7 @@ class LocalArray : public LocalPointerBase<T> { (publi
+     LocalArray(LocalArray<T> &&src) U_NOEXCEPT : LocalPointerBase<T>(src.ptr) {
+         src.ptr=NULL;
+     }
++#endif
+     /**
+      * Destructor deletes the array it owns.
+      * @stable ICU 4.4
+@@ -373,6 +379,7 @@ class LocalArray : public LocalPointerBase<T> { (publi
+     ~LocalArray() {
+         delete[] LocalPointerBase<T>::ptr;
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     /**
+      * Move assignment operator, leaves src with isNull().
+      * The behavior is undefined if *this and src are the same object.
+@@ -383,6 +390,7 @@ class LocalArray : public LocalPointerBase<T> { (publi
+     LocalArray<T> &operator=(LocalArray<T> &&src) U_NOEXCEPT {
+         return moveFrom(src);
+     }
++#endif
+     // do not use #ifndef U_HIDE_DRAFT_API for moveFrom, needed by non-draft API
+     /**
+      * Move assignment, leaves src with isNull().
+@@ -484,6 +492,7 @@ class LocalArray : public LocalPointerBase<T> { (publi
+  * @see LocalPointer
+  * @stable ICU 4.4
+  */
++#if U_HAVE_RVALUE_REFERENCES
+ #define U_DEFINE_LOCAL_OPEN_POINTER(LocalPointerClassName, Type, closeFunction) \
+     class LocalPointerClassName : public LocalPointerBase<Type> { \
+     public: \
+@@ -517,6 +526,34 @@ class LocalArray : public LocalPointerBase<T> { (publi
+             ptr=p; \
+         } \
+     }
++#else
++#define U_DEFINE_LOCAL_OPEN_POINTER(LocalPointerClassName, Type, closeFunction) \
++    class LocalPointerClassName : public LocalPointerBase<Type> { \
++    public: \
++        using LocalPointerBase<Type>::operator*; \
++        using LocalPointerBase<Type>::operator->; \
++        explicit LocalPointerClassName(Type *p=NULL) : LocalPointerBase<Type>(p) {} \
++        ~LocalPointerClassName() { closeFunction(ptr); } \
++        LocalPointerClassName &moveFrom(LocalPointerClassName &src) U_NOEXCEPT { \
++            if (ptr != NULL) { closeFunction(ptr); } \
++            LocalPointerBase<Type>::ptr=src.ptr; \
++            src.ptr=NULL; \
++            return *this; \
++        } \
++        void swap(LocalPointerClassName &other) U_NOEXCEPT { \
++            Type *temp=LocalPointerBase<Type>::ptr; \
++            LocalPointerBase<Type>::ptr=other.ptr; \
++            other.ptr=temp; \
++        } \
++        friend inline void swap(LocalPointerClassName &p1, LocalPointerClassName &p2) U_NOEXCEPT { \
++            p1.swap(p2); \
++        } \
++        void adoptInstead(Type *p) { \
++            if (ptr != NULL) { closeFunction(ptr); } \
++            ptr=p; \
++        } \
++    }
++#endif
+ 
+ U_NAMESPACE_END
+ 
+--- common/unicode/platform.h.orig	2017-10-05 00:47:38 UTC
++++ common/unicode/platform.h
+@@ -499,6 +499,22 @@ namespace std {
+ #endif
+ 
+ /**
++ * \def U_HAVE_RVALUE_REFERENCES
++ * Set to 1 if the compiler supports rvalue references.
++ * C++11 feature, necessary for move constructor & move assignment.
++ * @internal
++ */
++#ifdef U_HAVE_RVALUE_REFERENCES
++    /* Use the predefined value. */
++#elif U_CPLUSPLUS_VERSION >= 11 || __has_feature(cxx_rvalue_references) \
++        || defined(__GXX_EXPERIMENTAL_CXX0X__) \
++        || (defined(_MSC_VER) && _MSC_VER >= 1600)  /* Visual Studio 2010 */
++#   define U_HAVE_RVALUE_REFERENCES 1
++#else
++#   define U_HAVE_RVALUE_REFERENCES 0
++#endif
++
++/**
+  * \def U_NOEXCEPT
+  * "noexcept" if supported, otherwise empty.
+  * Some code, especially STL containers, uses move semantics of objects only
+--- common/unicode/unistr.h.orig	2017-09-14 19:20:49 UTC
++++ common/unicode/unistr.h
+@@ -1891,6 +1891,7 @@ class U_COMMON_API UnicodeString : public Replaceable 
+    */
+   UnicodeString &fastCopyFrom(const UnicodeString &src);
+ 
++#if U_HAVE_RVALUE_REFERENCES
+   /**
+    * Move assignment operator, might leave src in bogus state.
+    * This string will have the same contents and state that the source string had.
+@@ -1902,7 +1903,7 @@ class U_COMMON_API UnicodeString : public Replaceable 
+   UnicodeString &operator=(UnicodeString &&src) U_NOEXCEPT {
+     return moveFrom(src);
+   }
+-
++#endif
+   // do not use #ifndef U_HIDE_DRAFT_API for moveFrom, needed by non-draft API
+   /**
+    * Move assignment, might leave src in bogus state.
+@@ -3349,6 +3350,7 @@ class U_COMMON_API UnicodeString : public Replaceable 
+    */
+   UnicodeString(const UnicodeString& that);
+ 
++#if U_HAVE_RVALUE_REFERENCES
+   /**
+    * Move constructor, might leave src in bogus state.
+    * This string will have the same contents and state that the source string had.
+@@ -3356,6 +3358,7 @@ class U_COMMON_API UnicodeString : public Replaceable 
+    * @stable ICU 56
+    */
+   UnicodeString(UnicodeString &&src) U_NOEXCEPT;
++#endif
+ 
+   /**
+    * 'Substring' constructor from tail of source string.
+--- common/unistr.cpp.orig	2017-04-26 20:23:44 UTC
++++ common/unistr.cpp
+@@ -308,10 +308,12 @@ UnicodeString::UnicodeString(const UnicodeString& that
+   copyFrom(that);
+ }
+ 
++#if U_HAVE_RVALUE_REFERENCES
+ UnicodeString::UnicodeString(UnicodeString &&src) U_NOEXCEPT {
+   fUnion.fFields.fLengthAndFlags = kShortString;
+   moveFrom(src);
+ }
++#endif
+ 
+ UnicodeString::UnicodeString(const UnicodeString& that,
+                              int32_t srcStart) {
+--- test/intltest/itutil.cpp.orig	2017-04-26 20:23:44 UTC
++++ test/intltest/itutil.cpp
+@@ -375,6 +375,7 @@ void LocalPointerTest::TestLocalPointerMoveSwap() {
+     if(s3.getAlias() != p1 || s1.isValid()) {
+         errln("LocalPointer.moveFrom() did not move");
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     infoln("TestLocalPointerMoveSwap() with rvalue references");
+     s1 = static_cast<LocalPointer<UnicodeString> &&>(s3);
+     if(s1.getAlias() != p1 || s3.isValid()) {
+@@ -384,6 +385,9 @@ void LocalPointerTest::TestLocalPointerMoveSwap() {
+     if(s4.getAlias() != p2 || s2.isValid()) {
+         errln("LocalPointer move constructor did not move");
+     }
++#else
++    infoln("TestLocalPointerMoveSwap() without rvalue references");
++#endif
+ 
+     // Move self assignment leaves the object valid but in an undefined state.
+     // Do it to make sure there is no crash,
+@@ -468,6 +472,7 @@ void LocalPointerTest::TestLocalArrayMoveSwap() {
+     if(a3.getAlias() != p1 || a1.isValid()) {
+         errln("LocalArray.moveFrom() did not move");
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     infoln("TestLocalArrayMoveSwap() with rvalue references");
+     a1 = static_cast<LocalArray<UnicodeString> &&>(a3);
+     if(a1.getAlias() != p1 || a3.isValid()) {
+@@ -477,6 +482,9 @@ void LocalPointerTest::TestLocalArrayMoveSwap() {
+     if(a4.getAlias() != p2 || a2.isValid()) {
+         errln("LocalArray move constructor did not move");
+     }
++#else
++    infoln("TestLocalArrayMoveSwap() without rvalue references");
++#endif
+ 
+     // Move self assignment leaves the object valid but in an undefined state.
+     // Do it to make sure there is no crash,
+@@ -636,6 +644,7 @@ void LocalPointerTest::TestLocalXyzPointerMoveSwap() {
+     if(f3.getAlias() != p1 || f1.isValid()) {
+         errln("LocalUNormalizer2Pointer.moveFrom() did not move");
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     infoln("TestLocalXyzPointerMoveSwap() with rvalue references");
+     f1 = static_cast<LocalUNormalizer2Pointer &&>(f3);
+     if(f1.getAlias() != p1 || f3.isValid()) {
+@@ -645,6 +654,9 @@ void LocalPointerTest::TestLocalXyzPointerMoveSwap() {
+     if(f4.getAlias() != p2 || f2.isValid()) {
+         errln("LocalUNormalizer2Pointer move constructor did not move");
+     }
++#else
++    infoln("TestLocalXyzPointerMoveSwap() without rvalue references");
++#endif
+     // Move self assignment leaves the object valid but in an undefined state.
+     // Do it to make sure there is no crash,
+     // but do not check for any particular resulting value.
+--- test/intltest/ustrtest.cpp.orig	2017-09-21 23:45:08 UTC
++++ test/intltest/ustrtest.cpp
+@@ -2160,6 +2160,7 @@ UnicodeStringTest::TestMoveSwap() {
+     if(s6.getBuffer() != abc || s6.length() != 3) {
+         errln("UnicodeString.moveFrom(alias) did not move");
+     }
++#if U_HAVE_RVALUE_REFERENCES
+     infoln("TestMoveSwap() with rvalue references");
+     s1 = static_cast<UnicodeString &&>(s6);
+     if(s1.getBuffer() != abc || s1.length() != 3) {
+@@ -2169,6 +2170,10 @@ UnicodeStringTest::TestMoveSwap() {
+     if(s7.getBuffer() != p || s7.length() != 100 || !s4.isBogus()) {
+         errln("UnicodeString move constructor did not move");
+     }
++#else
++    infoln("TestMoveSwap() without rvalue references");
++    UnicodeString s7;
++#endif
+ 
+     // Move self assignment leaves the object valid but in an undefined state.
+     // Do it to make sure there is no crash,
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index 10ff8f4674ea..c2f27d732790 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -90,6 +90,8 @@ include/unicode/messagepattern.h
 include/unicode/msgfmt.h
 include/unicode/normalizer2.h
 include/unicode/normlzr.h
+include/unicode/nounit.h
+include/unicode/numberformatter.h
 include/unicode/numfmt.h
 include/unicode/numsys.h
 include/unicode/parseerr.h
@@ -117,6 +119,7 @@ include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
 include/unicode/std_string.h
 include/unicode/strenum.h
+include/unicode/stringoptions.h
 include/unicode/stringpiece.h
 include/unicode/stringtriebuilder.h
 include/unicode/stsearch.h
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index e9eb3c08f0c3..4361c0ceb96e 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	libical
 PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index fad948654e52..f9b4d92034a0 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	objecthash
 PORTVERSION=	20160802
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	amutu@amutu.com
diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile
index fe761e0ca966..bcf62cb9a5d4 100644
--- a/devel/pecl-intl/Makefile
+++ b/devel/pecl-intl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	intl
 PORTVERSION=	3.0.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/devel/php70-intl/Makefile b/devel/php70-intl/Makefile
index 7fbefd3675e5..b54eb5e69759 100644
--- a/devel/php70-intl/Makefile
+++ b/devel/php70-intl/Makefile
@@ -1,6 +1,7 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php70
diff --git a/devel/php71-intl/Makefile b/devel/php71-intl/Makefile
index 3544627cd377..c3c505b62e36 100644
--- a/devel/php71-intl/Makefile
+++ b/devel/php71-intl/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php71
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 5ef52dfcac87..57b9c0bbf894 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyicu
 PORTVERSION=	1.9.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 5f1a80a18785..ab3e69c31141 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index 380908b86d1b..f498469688e2 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-