icu: updated to 60.1

Changes 60.1:
* Unicode 10.0: 8,518 new characters, including four new scripts, 7,494 new Han characters, and 56 new emoji characters.
  - Properties newly supported in ICU: Emoji_Component, Regional_Indicator, Prepended_Concatenation_Mark
* CLDR 32:
  - Data for several (mostly Asian) new languages, date formatting patterns using colloquial day period formats ("h:mm B" → “1:30 in the afternoon”), and many other data improvements.
  - See the CLDR download page for other CLDR features and migration issues in CLDR 32.
* NumberFormatter, a new number formatting API: A long-overdue refresh of number formatting in ICU with a focus on usability, robustness, and performance.  The 30+ settings in DecimalFormat are reduced to 8 in NumberFormatter; all NumberFormatter objects are thread-safe and immutable; and the code is efficient in both the client-side (constant locale) and server-side (variable locale) use cases.
  - New users are encouraged to use the new API for number formatting.  However, preexisting code can continue using the old API, which has been partially made into a wrapper over the new API.
  - Documentation: in Java, see com.ibm.icu.number.NumberFormatter, and in C++, see i18n/unicode/numberformatter.h.
* New options for titlecasing:
  - Sentence titlecasing and whole-string titlecasing without custom BreakIterator instances.
  - The default index adjustment has been changed from "find first cased character" to "find first letter, number, or symbol"; a new option is available for selecting the previous adjustment behavior.
* Smaller data files for BreakIterator.
  - Reverse rules no longer used: Easier updates, easier to conform to Unicode Standard.
  - Old source rule files continue to work, reverse rules are ignored.
  - Rule-based data files: 1.2MB→0.8MB.

ICU4C Specific Changes
* New API for direct-UTF-8 normalization.
  - It also optionally records changes, for source-to-result index mapping and tracking of text metadata.
* More convenient case mapping API (StringPiece→ByteSink).
* ICU now handles ill-formed UTF-8 byte sequences as specified in the W3C Encoding Standard.

5 files changed, 18 insertions, 54 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 24d6c86cb51..e800c5683a3 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.112 2017/11/16 09:58:26 he Exp $
+# $NetBSD: Makefile,v 1.113 2017/11/30 16:03:18 adam Exp $
 
-DISTNAME=	icu4c-59_1-src
+DISTNAME=	icu4c-60_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
-PKGREVISION=	3
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=icu/}
+MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index a0202d6af14..1e8708484c3 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2017/04/22 20:11:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.41 2017/11/30 16:03:18 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -64,6 +64,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
@@ -91,6 +93,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
@@ -192,28 +195,28 @@ lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.59
 lib/libicudata.so.${PKGVERSION}
+lib/libicudata.so.60
 lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.59
 lib/libicui18n.so.${PKGVERSION}
+lib/libicui18n.so.60
 lib/libicuio.a
 lib/libicuio.so
-lib/libicuio.so.59
 lib/libicuio.so.${PKGVERSION}
+lib/libicuio.so.60
 lib/libicutest.a
 lib/libicutest.so
-lib/libicutest.so.59
 lib/libicutest.so.${PKGVERSION}
+lib/libicutest.so.60
 lib/libicutu.a
 lib/libicutu.so
-lib/libicutu.so.59
 lib/libicutu.so.${PKGVERSION}
+lib/libicutu.so.60
 lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.59
 lib/libicuuc.so.${PKGVERSION}
+lib/libicuuc.so.60
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
 lib/pkgconfig/icu-uc.pc
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 4a06976b936..dcf4ad6926f 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.70 2017/11/16 09:58:26 he Exp $
+$NetBSD: distinfo,v 1.71 2017/11/30 16:03:18 adam Exp $
 
-SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82
-RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809
-SHA512 (icu4c-59_1-src.tgz) = 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4
-Size (icu4c-59_1-src.tgz) = 22706578 bytes
+SHA1 (icu4c-60_1-src.tgz) = 6403724943613c4f796a802ab9f944d0f7a62c26
+RMD160 (icu4c-60_1-src.tgz) = e88f9fea1c5e6395a9340847485f51df0fab2d04
+SHA512 (icu4c-60_1-src.tgz) = a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233
+Size (icu4c-60_1-src.tgz) = 23296064 bytes
 SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4
 SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09
 SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20
@@ -18,8 +18,6 @@ SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
 SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2
 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d
 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
-SHA1 (patch-i18n_digitlst.cpp) = 2091ec0d6fe376d4f3f7ebee63515b86b78d3646
-SHA1 (patch-i18n_zonemeta.cpp) = 8a222ef88837c3afdbc7c7e11a94245c97a1f0e5
 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2
 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110
diff --git a/textproc/icu/patches/patch-i18n_digitlst.cpp b/textproc/icu/patches/patch-i18n_digitlst.cpp
deleted file mode 100644
index b143f717af1..00000000000
--- a/textproc/icu/patches/patch-i18n_digitlst.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-i18n_digitlst.cpp,v 1.5 2017/10/06 15:20:42 maya Exp $
-
-Avoid including xlocale.h on linux and netbsd, which don't have
-xlocale.h
-
---- i18n/digitlst.cpp.orig	2017-01-20 00:20:31.000000000 +0000
-+++ i18n/digitlst.cpp
-@@ -61,10 +61,10 @@
- #endif
- 
- #if U_USE_STRTOD_L
--# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
--#   include <locale.h>
--# else
-+# if !defined(__NetBSD__) && !defined(__linux__)
- #   include <xlocale.h>
-+# else
-+#   include <locale.h>
- # endif
- #endif
- 
diff --git a/textproc/icu/patches/patch-i18n_zonemeta.cpp b/textproc/icu/patches/patch-i18n_zonemeta.cpp
deleted file mode 100644
index a61c6007c90..00000000000
--- a/textproc/icu/patches/patch-i18n_zonemeta.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-i18n_zonemeta.cpp,v 1.1 2017/11/16 09:58:26 he Exp $
-
-Fix for CVE-2017-14952 from
-http://bugs.icu-project.org/trac/changeset/40324/trunk/icu4c/source/i18n/zonemeta.cpp
-
---- i18n/zonemeta.cpp.orig	2017-03-14 19:39:30.000000000 +0000
-+++ i18n/zonemeta.cpp
-@@ -690,7 +690,6 @@ ZoneMeta::createMetazoneMappings(const U
-                     mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status);
-                     if (U_FAILURE(status)) {
-                         delete mzMappings;
--                        deleteOlsonToMetaMappingEntry(entry);
-                         uprv_free(entry);
-                         break;
-                     }