From 62ca410ded0897d3cb00499fa28250caa8449dd8 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 22 Apr 2017 20:11:45 +0000
Subject: Changes 59.1: * Emoji 5.0 data * Includes bidi data files from
 Unicode 10 beta. * Includes segmentation data files and rules from Unicode 10
 beta and CLDR 31.0.1. * Does not yet include the Emoji_Component property. *
 Otherwise ICU 59 continues to use Unicode 9 data. CLDR 31.0.1 * Including
 updates for emoji 5.0, for example local names for England, Scotland, and
 Wales. * GMT and UTC are no longer unified, and CLDR provides distinct UTC
 display names, avoiding confusion with standard (winter) time in Britain. *
 See the CLDR download page for other CLDR features and migration issues in
 CLDR v31. New case mapping API (C++ & Java classes CaseMap) supports styled
 text.

---
 textproc/icu/Makefile                              |  9 ++--
 textproc/icu/PLIST                                 | 18 ++++---
 textproc/icu/distinfo                              | 31 +++++------
 textproc/icu/patches/patch-Makefile.in             | 34 ++++++++++++
 textproc/icu/patches/patch-aa                      | 34 ------------
 textproc/icu/patches/patch-ab                      | 16 ------
 textproc/icu/patches/patch-ac                      | 13 -----
 textproc/icu/patches/patch-ad                      | 20 -------
 textproc/icu/patches/patch-af                      | 15 ------
 textproc/icu/patches/patch-common_putil.cpp        |  6 +--
 textproc/icu/patches/patch-common_ulist.c          | 61 ----------------------
 textproc/icu/patches/patch-common_uposixdefs.h     | 22 +++++---
 textproc/icu/patches/patch-config_Makefile.inc.in  | 13 +++++
 textproc/icu/patches/patch-config_mh-darwin        | 16 ++++++
 textproc/icu/patches/patch-i18n_ucol__res.cpp      | 12 -----
 textproc/icu/patches/patch-icudefs.mk.in           | 20 +++++++
 textproc/icu/patches/patch-runConfigureICU         | 15 ++++++
 .../icu/patches/patch-test_intltest_apicoll.cpp    | 61 ----------------------
 textproc/icu/patches/patch-test_intltest_apicoll.h | 12 -----
 .../icu/patches/patch-tools-toolutil-pkg_genc.c    | 16 ------
 .../icu/patches/patch-tools-toolutil-pkg_genc.cpp  | 16 ++++++
 .../icu/patches/patch-tools_pkgdata_pkgdata.cpp    | 15 ------
 22 files changed, 159 insertions(+), 316 deletions(-)
 create mode 100644 textproc/icu/patches/patch-Makefile.in
 delete mode 100644 textproc/icu/patches/patch-aa
 delete mode 100644 textproc/icu/patches/patch-ab
 delete mode 100644 textproc/icu/patches/patch-ac
 delete mode 100644 textproc/icu/patches/patch-ad
 delete mode 100644 textproc/icu/patches/patch-af
 delete mode 100644 textproc/icu/patches/patch-common_ulist.c
 create mode 100644 textproc/icu/patches/patch-config_Makefile.inc.in
 create mode 100644 textproc/icu/patches/patch-config_mh-darwin
 delete mode 100644 textproc/icu/patches/patch-i18n_ucol__res.cpp
 create mode 100644 textproc/icu/patches/patch-icudefs.mk.in
 create mode 100644 textproc/icu/patches/patch-runConfigureICU
 delete mode 100644 textproc/icu/patches/patch-test_intltest_apicoll.cpp
 delete mode 100644 textproc/icu/patches/patch-test_intltest_apicoll.h
 delete mode 100644 textproc/icu/patches/patch-tools-toolutil-pkg_genc.c
 create mode 100644 textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp
 delete mode 100644 textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp

(limited to 'textproc/icu')

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index c53552d0b5a..5e143325a0f 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.107 2016/12/12 17:46:39 adam Exp $
+# $NetBSD: Makefile,v 1.108 2017/04/22 20:11:45 adam Exp $
 
-DISTNAME=	icu4c-58_2-src
+DISTNAME=	icu4c-59_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=icu/}
@@ -89,10 +89,6 @@ PLIST_SUBST+=		MH_NAME=mh-qnx
 PLIST_SUBST+=		MH_NAME=mh-unknown
 .endif
 
-.if ${OPSYS} == "Cygwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 PKGCONFIG_OVERRIDE+=	config/icu-i18n.pc
 PKGCONFIG_OVERRIDE+=	config/icu-io.pc
 PKGCONFIG_OVERRIDE+=	config/icu-le.pc
@@ -111,6 +107,7 @@ CFLAGS+=	-march=i486
 .endif
 
 .if ${OPSYS} == "Cygwin"
+INSTALL_UNSTRIPPED=	yes
 SO_MAJOR=		${PKGVERSION_NOREV:R}
 .  for l in data i18n io le lx test tu uc
 GENERATE_PLIST+=	${ECHO} bin/cygicu${l}${SO_MAJOR}.dll;
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index fdde8d9ef94..a0202d6af14 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2016/12/04 09:01:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2017/04/22 20:11:45 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -19,6 +19,8 @@ include/unicode/bytestrie.h
 include/unicode/bytestriebuilder.h
 include/unicode/calendar.h
 include/unicode/caniter.h
+include/unicode/casemap.h
+include/unicode/char16ptr.h
 include/unicode/chariter.h
 include/unicode/choicfmt.h
 include/unicode/coleitr.h
@@ -38,6 +40,7 @@ include/unicode/dtitvfmt.h
 include/unicode/dtitvinf.h
 include/unicode/dtptngen.h
 include/unicode/dtrule.h
+include/unicode/edits.h
 include/unicode/enumset.h
 include/unicode/errorcode.h
 include/unicode/fieldpos.h
@@ -189,27 +192,27 @@ lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.58
+lib/libicudata.so.59
 lib/libicudata.so.${PKGVERSION}
 lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.58
+lib/libicui18n.so.59
 lib/libicui18n.so.${PKGVERSION}
 lib/libicuio.a
 lib/libicuio.so
-lib/libicuio.so.58
+lib/libicuio.so.59
 lib/libicuio.so.${PKGVERSION}
 lib/libicutest.a
 lib/libicutest.so
-lib/libicutest.so.58
+lib/libicutest.so.59
 lib/libicutest.so.${PKGVERSION}
 lib/libicutu.a
 lib/libicutu.so
-lib/libicutu.so.58
+lib/libicutu.so.59
 lib/libicutu.so.${PKGVERSION}
 lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.58
+lib/libicuuc.so.59
 lib/libicuuc.so.${PKGVERSION}
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
@@ -228,6 +231,7 @@ man/man8/genccode.8
 man/man8/gencmn.8
 man/man8/gensprep.8
 man/man8/icupkg.8
+sbin/escapesrc
 sbin/genccode
 sbin/gencmn
 sbin/gennorm2
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index d24d10f7f26..438847c264d 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,29 +1,24 @@
-$NetBSD: distinfo,v 1.63 2016/12/12 17:46:39 adam Exp $
+$NetBSD: distinfo,v 1.64 2017/04/22 20:11:45 adam Exp $
 
-SHA1 (icu4c-58_2-src.tgz) = b67913c90a484c59fda011797c6f3959d84bdc7c
-RMD160 (icu4c-58_2-src.tgz) = df06e7b18a87e383d3762564f2e9a59fd75865f9
-SHA512 (icu4c-58_2-src.tgz) = 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
-Size (icu4c-58_2-src.tgz) = 23369902 bytes
-SHA1 (patch-aa) = 67440d3af9b62b8c0be258c490255ba17f778ab4
-SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
-SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
+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 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4
 SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09
-SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
-SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a
-SHA1 (patch-common_putil.cpp) = 3058a542bcb2fdfa34b36acf389570990acd0da5
+SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20
 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
-SHA1 (patch-common_ulist.c) = 8dd2c8152f99d762aab7e9d48293de3ccfb711cf
 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
 SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8
-SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33
+SHA1 (patch-common_uposixdefs.h) = 52a6fa2c531068de285d9babb1a98b84c564450e
+SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886
 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
+SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
 SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc
 SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4
 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
 SHA1 (patch-i18n_digitlst.cpp) = 2db1a8e28e353ecf201f965d9719d451534865ad
-SHA1 (patch-i18n_ucol__res.cpp) = 5e13b689941cf07bee997544aca19a6d6ce64511
-SHA1 (patch-test_intltest_apicoll.cpp) = e55d7cd13d2bb9f6b08f2c9c59ae475b875f110f
-SHA1 (patch-test_intltest_apicoll.h) = e2a93be1da65e08abe3e6b28bd8aee33307a7c3e
-SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e
-SHA1 (patch-tools_pkgdata_pkgdata.cpp) = 1c87fcc511f0e6cedbaf01c5164e522c33f19458
+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-Makefile.in b/textproc/icu/patches/patch-Makefile.in
new file mode 100644
index 00000000000..fe5ea33eb31
--- /dev/null
+++ b/textproc/icu/patches/patch-Makefile.in
@@ -0,0 +1,34 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/04/22 20:11:45 adam Exp $
+
+Add linker flags for finding the libraries to pkg-config files.
+Avoid using programs which need elevated privileges during the build.
+
+--- Makefile.in.orig	2016-09-09 21:28:18.000000000 +0000
++++ Makefile.in
+@@ -272,7 +272,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
+ 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
+ 	@echo "Name: $(PACKAGE)-i18n" >> $@
+ 	@echo "Requires: icu-uc" >> $@
+-	@echo "Libs:" "${ICULIBS_I18N}" >> $@
++	@echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@
+ 	@echo $@ updated.
+ 
+ config/icu-io.pc: config/icu.pc Makefile icudefs.mk
+@@ -280,7 +280,7 @@ config/icu-io.pc: config/icu.pc Makefile
+ 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@
+ 	@echo "Name: $(PACKAGE)-io" >> $@
+ 	@echo "Requires: icu-i18n" >> $@
+-	@echo "Libs:" "${ICULIBS_IO}" >> $@
++	@echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@
+ 	@echo $@ updated.
+ 
+ ICULEHB_LIBS=@ICULEHB_LIBS@
+@@ -299,7 +299,7 @@ ifneq ($(ICULEHB_LIBS),)
+ else
+ 	@echo "Requires: icu-le" >> $@
+ endif
+-	@echo "Libs:" "${ICULIBS_LX}" >> $@
++	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LX}" >> $@
+ 	@echo $@ updated.
+ 
+ 
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
deleted file mode 100644
index edc6361470f..00000000000
--- a/textproc/icu/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2016/12/04 04:11:33 ryoon Exp $
-
-Add linker flags for finding the libraries to pkg-config files.
-Avoid using programs which need elevated privileges during the build.
-
---- Makefile.in.orig	2016-09-09 21:28:18.000000000 +0000
-+++ Makefile.in
-@@ -272,7 +272,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
- 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
- 	@echo "Name: $(PACKAGE)-i18n" >> $@
- 	@echo "Requires: icu-uc" >> $@
--	@echo "Libs:" "${ICULIBS_I18N}" >> $@
-+	@echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@
- 	@echo $@ updated.
- 
- config/icu-io.pc: config/icu.pc Makefile icudefs.mk
-@@ -280,7 +280,7 @@ config/icu-io.pc: config/icu.pc Makefile
- 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@
- 	@echo "Name: $(PACKAGE)-io" >> $@
- 	@echo "Requires: icu-i18n" >> $@
--	@echo "Libs:" "${ICULIBS_IO}" >> $@
-+	@echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@
- 	@echo $@ updated.
- 
- ICULEHB_LIBS=@ICULEHB_LIBS@
-@@ -299,7 +299,7 @@ ifneq ($(ICULEHB_LIBS),)
- else
- 	@echo "Requires: icu-le" >> $@
- endif
--	@echo "Libs:" "${ICULIBS_LX}" >> $@
-+	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LX}" >> $@
- 	@echo $@ updated.
- 
- 
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
deleted file mode 100644
index b3c90251a5a..00000000000
--- a/textproc/icu/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2012/11/07 20:59:51 adam Exp $
-
---- config/mh-darwin.orig	2011-07-19 21:16:46.000000000 +0000
-+++ config/mh-darwin
-@@ -28,11 +28,7 @@ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CF
- SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
- 
- ## Compiler switches to embed a library name and version information
--ifeq ($(ENABLE_RPATH),YES)
- LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
--else
--LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
--endif
- 
- ## Compiler switch to embed a runtime search path
- LD_RPATH=
diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac
deleted file mode 100644
index fcd477f07ae..00000000000
--- a/textproc/icu/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2010/12/07 17:58:13 adam Exp $
-
---- config/Makefile.inc.in.orig	2010-12-07 11:22:10.000000000 +0000
-+++ config/Makefile.inc.in
-@@ -44,7 +44,7 @@ PACKAGE = @PACKAGE@
- LIBICU = lib$(ICUPREFIX)
- 
- # Static library prefix and file extension
--STATIC_PREFIX = s
-+STATIC_PREFIX =
- LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
- A = a
- 
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
deleted file mode 100644
index a4ef00ae7cc..00000000000
--- a/textproc/icu/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.14 2014/06/08 08:32:10 obache Exp $
-
---- icudefs.mk.in.orig	2013-10-04 20:54:58.000000000 +0000
-+++ icudefs.mk.in
-@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
- 
- ## If we can't use the shared libraries, use the static libraries
- ifneq ($(ENABLE_SHARED),YES)
--STATIC_PREFIX_WHEN_USED = s
-+STATIC_PREFIX_WHEN_USED = 
- else
- STATIC_PREFIX_WHEN_USED = 
- endif
- 
- # Static library prefix and file extension
--STATIC_PREFIX = s
-+STATIC_PREFIX =
- LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
- A = a
- SOBJ = $(SO)
diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af
deleted file mode 100644
index 0303ff452fe..00000000000
--- a/textproc/icu/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.15 2015/08/31 15:26:19 sevan Exp $
-
-Add support for DragonFlyBSD & Bitrig
-
---- runConfigureICU.orig	Fri Mar 27 21:17:48 2015
-+++ runConfigureICU
-@@ -327,7 +327,7 @@ case $platform in
-         DEBUG_CXXFLAGS='-Zi -MDd'
-         DEBUG_LDFLAGS='-DEBUG'
-         ;;
--    *BSD)
-+    *BSD | DragonFly | Bitrig)
-         THE_OS="BSD"
-         THE_COMP="the GNU C++"
-         DEBUG_CFLAGS='-g -O0'
diff --git a/textproc/icu/patches/patch-common_putil.cpp b/textproc/icu/patches/patch-common_putil.cpp
index ee65d796fe1..be09315c004 100644
--- a/textproc/icu/patches/patch-common_putil.cpp
+++ b/textproc/icu/patches/patch-common_putil.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_putil.cpp,v 1.2 2015/10/09 23:15:34 ryoon Exp $
+$NetBSD: patch-common_putil.cpp,v 1.3 2017/04/22 20:11:45 adam Exp $
 
---- common/putil.cpp.orig	2015-10-08 03:53:44.000000000 +0000
+--- common/putil.cpp.orig	2017-04-10 14:22:16.000000000 +0000
 +++ common/putil.cpp
-@@ -117,6 +117,14 @@
+@@ -136,6 +140,14 @@ using namespace Microsoft::WRL::Wrappers
  #endif
  
  /*
diff --git a/textproc/icu/patches/patch-common_ulist.c b/textproc/icu/patches/patch-common_ulist.c
deleted file mode 100644
index dbf5d0789f6..00000000000
--- a/textproc/icu/patches/patch-common_ulist.c
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-common_ulist.c,v 1.1 2016/12/04 04:11:33 ryoon Exp $
-
---- common/ulist.c.orig	2016-06-15 18:58:17.000000000 +0000
-+++ common/ulist.c
-@@ -29,7 +29,6 @@ struct UList {
-     UListNode *tail;
-     
-     int32_t size;
--    int32_t currentIndex;
- };
- 
- static void ulist_addFirstItem(UList *list, UListNode *newItem);
-@@ -51,7 +50,6 @@ U_CAPI UList *U_EXPORT2 ulist_createEmpt
-     newList->head = NULL;
-     newList->tail = NULL;
-     newList->size = 0;
--    newList->currentIndex = -1;
-     
-     return newList;
- }
-@@ -80,8 +78,9 @@ static void ulist_removeItem(UList *list
-     } else {
-         p->next->previous = p->previous;
-     }
--    list->curr = NULL;
--    list->currentIndex = 0;
-+    if (p == list->curr) {
-+        list->curr = p->next;
-+    }
-     --list->size;
-     if (p->forceDelete) {
-         uprv_free(p->data);
-@@ -150,7 +149,6 @@ U_CAPI void U_EXPORT2 ulist_addItemBegin
-         newItem->next = list->head;
-         list->head->previous = newItem;
-         list->head = newItem;
--        list->currentIndex++;
-     }
-     
-     list->size++;
-@@ -193,7 +191,6 @@ U_CAPI void *U_EXPORT2 ulist_getNext(ULi
-     
-     curr = list->curr;
-     list->curr = curr->next;
--    list->currentIndex++;
-     
-     return curr->data;
- }
-@@ -209,7 +206,6 @@ U_CAPI int32_t U_EXPORT2 ulist_getListSi
- U_CAPI void U_EXPORT2 ulist_resetList(UList *list) {
-     if (list != NULL) {
-         list->curr = list->head;
--        list->currentIndex = 0;
-     }
- }
- 
-@@ -272,4 +268,3 @@ U_CAPI void U_EXPORT2 ulist_reset_keywor
- U_CAPI UList * U_EXPORT2 ulist_getListFromEnum(UEnumeration *en) {
-     return (UList *)(en->context);
- }
--
diff --git a/textproc/icu/patches/patch-common_uposixdefs.h b/textproc/icu/patches/patch-common_uposixdefs.h
index 85d20a822db..eaaee5a0581 100644
--- a/textproc/icu/patches/patch-common_uposixdefs.h
+++ b/textproc/icu/patches/patch-common_uposixdefs.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_uposixdefs.h,v 1.2 2014/07/18 10:28:11 ryoon Exp $
+$NetBSD: patch-common_uposixdefs.h,v 1.3 2017/04/22 20:11:45 adam Exp $
 
---- common/uposixdefs.h.orig	2013-10-04 20:49:24.000000000 +0000
+--- common/uposixdefs.h.orig	2017-03-09 02:12:45.000000000 +0000
 +++ common/uposixdefs.h
-@@ -42,8 +42,10 @@
+@@ -44,8 +44,10 @@
       * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__.
       * In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all.
       */
@@ -13,15 +13,23 @@ $NetBSD: patch-common_uposixdefs.h,v 1.2 2014/07/18 10:28:11 ryoon Exp $
  
  /*
   * Make sure things like readlink and such functions work.
-@@ -52,9 +54,11 @@
+@@ -54,9 +56,11 @@
   *
   * z/OS needs this definition for timeval and to get usleep.
   */
 +#if !defined(__sun) && !defined(_SCO_DS)
- #if !defined(_XOPEN_SOURCE_EXTENDED)
+ #if !defined(_XOPEN_SOURCE_EXTENDED) && defined(__TOS_MVS__)
  #   define _XOPEN_SOURCE_EXTENDED 1
  #endif
 +#endif
  
- /*
-  * There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms.
+ /**
+  * Solaris says:
+@@ -68,4 +72,7 @@
+ #   define _STDC_C99
+ #endif
+ 
++#if defined(__cplusplus) && defined(__NetBSD__)
++#define _ISOC99_SOURCE
++#endif
+ #endif  /* __UPOSIXDEFS_H__ */
diff --git a/textproc/icu/patches/patch-config_Makefile.inc.in b/textproc/icu/patches/patch-config_Makefile.inc.in
new file mode 100644
index 00000000000..5553f8d552c
--- /dev/null
+++ b/textproc/icu/patches/patch-config_Makefile.inc.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-config_Makefile.inc.in,v 1.1 2017/04/22 20:11:45 adam Exp $
+
+--- config/Makefile.inc.in.orig	2010-12-07 11:22:10.000000000 +0000
++++ config/Makefile.inc.in
+@@ -44,7 +44,7 @@ PACKAGE = @PACKAGE@
+ LIBICU = lib$(ICUPREFIX)
+ 
+ # Static library prefix and file extension
+-STATIC_PREFIX = s
++STATIC_PREFIX =
+ LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ 
diff --git a/textproc/icu/patches/patch-config_mh-darwin b/textproc/icu/patches/patch-config_mh-darwin
new file mode 100644
index 00000000000..eab82e67be5
--- /dev/null
+++ b/textproc/icu/patches/patch-config_mh-darwin
@@ -0,0 +1,16 @@
+$NetBSD: patch-config_mh-darwin,v 1.1 2017/04/22 20:11:45 adam Exp $
+
+--- config/mh-darwin.orig	2011-07-19 21:16:46.000000000 +0000
++++ config/mh-darwin
+@@ -28,11 +28,7 @@ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CF
+ SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
+ 
+ ## Compiler switches to embed a library name and version information
+-ifeq ($(ENABLE_RPATH),YES)
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+-else
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
+-endif
+ 
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
diff --git a/textproc/icu/patches/patch-i18n_ucol__res.cpp b/textproc/icu/patches/patch-i18n_ucol__res.cpp
deleted file mode 100644
index a049b820e99..00000000000
--- a/textproc/icu/patches/patch-i18n_ucol__res.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-i18n_ucol__res.cpp,v 1.1 2016/12/04 04:11:33 ryoon Exp $
-
---- i18n/ucol_res.cpp.orig	2016-09-28 02:26:02.000000000 +0000
-+++ i18n/ucol_res.cpp
-@@ -680,6 +680,7 @@ ucol_getKeywordValuesForLocale(const cha
-         return NULL;
-     }
-     memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
-+    ulist_resetList(sink.values);  // Initialize the iterator.
-     en->context = sink.values;
-     sink.values = NULL;  // Avoid deletion in the sink destructor.
-     return en;
diff --git a/textproc/icu/patches/patch-icudefs.mk.in b/textproc/icu/patches/patch-icudefs.mk.in
new file mode 100644
index 00000000000..6571f54bd02
--- /dev/null
+++ b/textproc/icu/patches/patch-icudefs.mk.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-icudefs.mk.in,v 1.1 2017/04/22 20:11:45 adam Exp $
+
+--- icudefs.mk.in.orig	2013-10-04 20:54:58.000000000 +0000
++++ icudefs.mk.in
+@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
+ 
+ ## If we can't use the shared libraries, use the static libraries
+ ifneq ($(ENABLE_SHARED),YES)
+-STATIC_PREFIX_WHEN_USED = s
++STATIC_PREFIX_WHEN_USED = 
+ else
+ STATIC_PREFIX_WHEN_USED = 
+ endif
+ 
+ # Static library prefix and file extension
+-STATIC_PREFIX = s
++STATIC_PREFIX =
+ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ SOBJ = $(SO)
diff --git a/textproc/icu/patches/patch-runConfigureICU b/textproc/icu/patches/patch-runConfigureICU
new file mode 100644
index 00000000000..74caf36679d
--- /dev/null
+++ b/textproc/icu/patches/patch-runConfigureICU
@@ -0,0 +1,15 @@
+$NetBSD: patch-runConfigureICU,v 1.1 2017/04/22 20:11:45 adam Exp $
+
+Add support for DragonFlyBSD and Bitrig.
+
+--- runConfigureICU.orig	Fri Mar 27 21:17:48 2015
++++ runConfigureICU
+@@ -327,7 +327,7 @@ case $platform in
+         DEBUG_CXXFLAGS='-Zi -MDd'
+         DEBUG_LDFLAGS='-DEBUG'
+         ;;
+-    *BSD)
++    *BSD | DragonFly | Bitrig)
+         THE_OS="BSD"
+         THE_COMP="the GNU C++"
+         DEBUG_CFLAGS='-g -O0'
diff --git a/textproc/icu/patches/patch-test_intltest_apicoll.cpp b/textproc/icu/patches/patch-test_intltest_apicoll.cpp
deleted file mode 100644
index 314e2338258..00000000000
--- a/textproc/icu/patches/patch-test_intltest_apicoll.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-test_intltest_apicoll.cpp,v 1.1 2016/12/04 04:11:33 ryoon Exp $
-
---- test/intltest/apicoll.cpp.orig	2016-09-20 04:30:06.000000000 +0000
-+++ test/intltest/apicoll.cpp
-@@ -81,17 +81,10 @@ CollationAPITest::TestProperty(/* char* 
-     logln("Test ctors : ");
-     col = Collator::createInstance(Locale::getEnglish(), success);
-     if (U_FAILURE(success)){
--        errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success));
-+        errcheckln(success, "English Collator creation failed. - %s", u_errorName(success));
-         return;
-     }
- 
--    StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success);
--    if (U_FAILURE(success)){
--        errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success));
--        return;
--    }
--    delete kwEnum;
--
-     col->getVersion(versionArray);
-     // Check for a version greater than some value rather than equality
-     // so that we need not update the expected version each time.
-@@ -231,6 +224,29 @@ CollationAPITest::TestProperty(/* char* 
-     delete junk;
- }
- 
-+void CollationAPITest::TestKeywordValues() {
-+    IcuTestErrorCode errorCode(*this, "TestKeywordValues");
-+    LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(), errorCode));
-+    if (errorCode.logIfFailureAndReset("English Collator creation failed")) {
-+        return;
-+    }
-+
-+    LocalPointer<StringEnumeration> kwEnum(
-+        col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode));
-+    if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) {
-+        return;
-+    }
-+    assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0);
-+    const char *kw;
-+    UBool hasStandard = FALSE;
-+    while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {
-+        if (strcmp(kw, "standard") == 0) {
-+            hasStandard = TRUE;
-+        }
-+    }
-+    assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard);
-+}
-+
- void 
- CollationAPITest::TestRuleBasedColl()
- {
-@@ -2466,6 +2482,7 @@ void CollationAPITest::runIndexedTest( i
-     if (exec) logln("TestSuite CollationAPITest: ");
-     TESTCASE_AUTO_BEGIN;
-     TESTCASE_AUTO(TestProperty);
-+    TESTCASE_AUTO(TestKeywordValues);
-     TESTCASE_AUTO(TestOperators);
-     TESTCASE_AUTO(TestDuplicate);
-     TESTCASE_AUTO(TestCompare);
diff --git a/textproc/icu/patches/patch-test_intltest_apicoll.h b/textproc/icu/patches/patch-test_intltest_apicoll.h
deleted file mode 100644
index 6c4dcf1ee07..00000000000
--- a/textproc/icu/patches/patch-test_intltest_apicoll.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-test_intltest_apicoll.h,v 1.1 2016/12/04 04:11:33 ryoon Exp $
-
---- test/intltest/apicoll.h.orig	2016-06-15 18:58:17.000000000 +0000
-+++ test/intltest/apicoll.h
-@@ -35,6 +35,7 @@ public:
-      * - displayable name in the desired locale
-      */
-     void TestProperty(/* char* par */);
-+    void TestKeywordValues();
- 
-     /**
-     * This tests the RuleBasedCollator
diff --git a/textproc/icu/patches/patch-tools-toolutil-pkg_genc.c b/textproc/icu/patches/patch-tools-toolutil-pkg_genc.c
deleted file mode 100644
index cb3ae317c11..00000000000
--- a/textproc/icu/patches/patch-tools-toolutil-pkg_genc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-tools-toolutil-pkg_genc.c,v 1.2 2015/04/06 07:22:54 adam Exp $
-
-Older assemblers for Darwin (like the one from Xcode 2.5) do not
-have .balign, but they take .align 4 to mean 2^4 = 16 bytes.
-
---- tools/toolutil/pkg_genc.c.orig	2015-03-27 21:10:56.000000000 +0000
-+++ tools/toolutil/pkg_genc.c
-@@ -137,7 +137,7 @@ static const struct AssemblyType {
-         "#endif\n"
-         "\t.data\n"
-         "\t.const\n"
--        "\t.balign 16\n"
-+        "\t.align 4\n"
-         "_%s:\n\n",
- 
-         ".long ","",HEX_0X
diff --git a/textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp b/textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp
new file mode 100644
index 00000000000..7798faee609
--- /dev/null
+++ b/textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-tools-toolutil-pkg_genc.cpp,v 1.1 2017/04/22 20:11:45 adam Exp $
+
+Older assemblers for Darwin (like the one from Xcode 2.5) do not
+have .balign, but they take .align 4 to mean 2^4 = 16 bytes.
+
+--- tools/toolutil/pkg_genc.cpp.orig	2015-03-27 21:10:56.000000000 +0000
++++ tools/toolutil/pkg_genc.cpp
+@@ -139,7 +139,7 @@ static const struct AssemblyType {
+         "#endif\n"
+         "\t.data\n"
+         "\t.const\n"
+-        "\t.balign 16\n"
++        "\t.align 4\n"
+         "_%s:\n\n",
+ 
+         ".long ","",HEX_0X
diff --git a/textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp b/textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp
deleted file mode 100644
index 5e99d504e93..00000000000
--- a/textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-tools_pkgdata_pkgdata.cpp,v 1.1 2015/10/26 09:48:14 jperkin Exp $
-
-Fix preprocessor logic bug.
-
---- tools/pkgdata/pkgdata.cpp.orig	2015-10-08 03:54:02.000000000 +0000
-+++ tools/pkgdata/pkgdata.cpp
-@@ -24,7 +24,7 @@
- #include "putilimp.h"
- 
- #if U_HAVE_POPEN
--#if (U_PF_MINGW <= U_PLATFORM || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
-+#if (U_PLATFORM <= U_PF_MINGW || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
- /* popen/pclose aren't defined in strict ANSI on Cygwin and MinGW */
- #undef __STRICT_ANSI__
- #endif
-- 
cgit v1.2.3