Changes 50.1:

* Unicode 6.2: Turkish Lira Sign, improved word & line segmentation (BreakIterator) for symbols
* CLDR 22.1: Data coverage & quality improved across all major languages; new short width type for weekday names; new zhuyin (Bopomofo) collation for Chinese; improved data for CompactDecimalFormat & RBNF
* Time zone data: 2012h
* Ordinal-number support in MessageFormat & PluralRules
* Deprecate setLocale(locale) in PluralFormat
* Dictionary-based break iterators (word segmentation):
* Support Chinese & Japanese, use more compact dictionary format, port all but Khmer support to Java
* Update Khmer dictionary
* Change Java util.ListFormat to text.ListFormatter and other updates, use CLDR data, port to C++
* Add updated IBM-eucJP and IBM-5233 converter
* Improve number formatting performance
* C++ GenderInfo: Effective combined gender of a list of people's genders (ported from Java)
* Thread safety support cannot be removed (see the Readme)
* Default compilers: Clang is now used if available (see the Readme)
* C++ Collator API cleanup, subclassing-API-breaking changes (see the Readme)
* Add option to genrb tool for writing java resource bundle files
* Time zone format APIs

11 files changed, 112 insertions, 65 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index c5cc3341be3..e9f6843d9ef 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2012/10/25 06:55:56 asau Exp $
+# $NetBSD: Makefile,v 1.77 2012/11/07 20:59:50 adam Exp $
 
-DISTNAME=	icu4c-49_1_2-src
+DISTNAME=	icu4c-50_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
-PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index 5d3eec6d5ee..2fef1612d19 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.25 2012/07/03 18:37:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2012/11/07 20:59:50 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
 bin/gencnval
-bin/genctd
+bin/gendict
 bin/genrb
 bin/icu-config
 bin/icuinfo
@@ -59,10 +59,12 @@ include/unicode/fieldpos.h
 include/unicode/fmtable.h
 include/unicode/format.h
 include/unicode/fpositer.h
+include/unicode/gender.h
 include/unicode/gregocal.h
 include/unicode/icudataver.h
 include/unicode/icuplug.h
 include/unicode/idna.h
+include/unicode/listformatter.h
 include/unicode/localpointer.h
 include/unicode/locdspnm.h
 include/unicode/locid.h
@@ -133,7 +135,9 @@ include/unicode/udat.h
 include/unicode/udata.h
 include/unicode/udateintervalformat.h
 include/unicode/udatpg.h
+include/unicode/udisplaycontext.h
 include/unicode/uenum.h
+include/unicode/ugender.h
 include/unicode/uidna.h
 include/unicode/uiter.h
 include/unicode/uldnames.h
@@ -188,35 +192,35 @@ lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.49
+lib/libicudata.so.50
 lib/libicudata.so.${PKGVERSION}
 lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.49
+lib/libicui18n.so.50
 lib/libicui18n.so.${PKGVERSION}
 lib/libicuio.a
 lib/libicuio.so
-lib/libicuio.so.49
+lib/libicuio.so.50
 lib/libicuio.so.${PKGVERSION}
 lib/libicule.a
 lib/libicule.so
-lib/libicule.so.49
+lib/libicule.so.50
 lib/libicule.so.${PKGVERSION}
 lib/libiculx.a
 lib/libiculx.so
-lib/libiculx.so.49
+lib/libiculx.so.50
 lib/libiculx.so.${PKGVERSION}
 lib/libicutest.a
 lib/libicutest.so
-lib/libicutest.so.49
+lib/libicutest.so.50
 lib/libicutest.so.${PKGVERSION}
 lib/libicutu.a
 lib/libicutu.so
-lib/libicutu.so.49
+lib/libicutu.so.50
 lib/libicutu.so.${PKGVERSION}
 lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.49
+lib/libicuuc.so.50
 lib/libicuuc.so.${PKGVERSION}
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
@@ -225,8 +229,9 @@ lib/pkgconfig/icu-lx.pc
 lib/pkgconfig/icu-uc.pc
 man/man1/derb.1
 man/man1/genbrk.1
+man/man1/gencfu.1
 man/man1/gencnval.1
-man/man1/genctd.1
+man/man1/gendict.1
 man/man1/genrb.1
 man/man1/icu-config.1
 man/man1/makeconv.1
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index c57f17f23a1..2e2d28928d6 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.30 2012/07/10 19:14:47 bsiegert Exp $
+$NetBSD: distinfo,v 1.31 2012/11/07 20:59:50 adam Exp $
 
-SHA1 (icu4c-49_1_2-src.tgz) = d8cee6d2b2a91a0da7464acd97a5b7b462d93225
-RMD160 (icu4c-49_1_2-src.tgz) = e34aa54f4387ae4c195c72427a2bd25933456e94
-Size (icu4c-49_1_2-src.tgz) = 19010646 bytes
-SHA1 (patch-aa) = e4020ec11a9754cebb96de754b0982eaa2ad2fe6
-SHA1 (patch-ab) = e6f4a08d0efabd8e6ae763289d975c1bc70e89c4
+SHA1 (icu4c-50_1-src.tgz) = 9a3369c00a8be8eff935d2893849ad2eb246c0ef
+RMD160 (icu4c-50_1-src.tgz) = 454afee3631da53520d2b66126a8b5f528685b7d
+Size (icu4c-50_1-src.tgz) = 21181132 bytes
+SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230
+SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
-SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb
-SHA1 (patch-af) = c81168246649f191ebb19a61fb216e172aac3cc2
-SHA1 (patch-common_putilimp.h) = 45aa7bf3fcf1da1bf8705aa64a135f8a1caeba7e
-SHA1 (patch-common_unicode_platform.h) = b95b826d8b1d9104fca71db85b8eaaa6b0c19843
-SHA1 (patch-common_unicode_uset_h) = 4a429952f1ff3ca787217e65eb62198f3d3f967e
+SHA1 (patch-ad) = 75e57734ad508140e87513b37ade4b295821696e
+SHA1 (patch-af) = b6314fb4f807b64e1b37f67d2aefe86e30707842
+SHA1 (patch-common_putilimp.h) = ff97ae0b8fd96ec8296e5164c135610a1a358810
+SHA1 (patch-common_unicode_platform.h) = 36cb68164fcf9b2858acabe95f0206e8088bfbaa
 SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91
 SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a
+SHA1 (patch-tools_genrb_derb.c) = 2c652a66f842236721f03e159efc14b0313e4a8f
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index bb05f54ee92..348acdff270 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.14 2012/04/25 18:53:44 adam Exp $
+$NetBSD: patch-aa,v 1.15 2012/11/07 20:59:51 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	2012-04-05 20:49:28.000000000 +0000
+--- Makefile.in.orig	2012-11-05 17:18:12.000000000 +0000
 +++ Makefile.in
-@@ -238,7 +238,7 @@ config/icu-uc.pc: config/icu.pc Makefile
+@@ -247,7 +247,7 @@ config/icu-uc.pc: config/icu.pc Makefile
  	@cat config/icu.pc > $@
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@
  	@echo "Name: $(PACKAGE)-uc" >> $@
@@ -14,7 +14,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo "Libs.private:" '$${baselibs}' >> $@
  	@echo $@ updated.
  
-@@ -247,7 +247,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
+@@ -256,7 +256,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
  	@echo "Name: $(PACKAGE)-i18n" >> $@
  	@echo "Requires: icu-uc" >> $@
@@ -23,7 +23,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo $@ updated.
  
  config/icu-io.pc: config/icu.pc Makefile icudefs.mk
-@@ -255,7 +255,7 @@ config/icu-io.pc: config/icu.pc Makefile
+@@ -264,7 +264,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" >> $@
@@ -32,7 +32,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo $@ updated.
  
  config/icu-le.pc: config/icu.pc Makefile icudefs.mk
-@@ -263,7 +263,7 @@ config/icu-le.pc: config/icu.pc Makefile
+@@ -272,7 +272,7 @@ config/icu-le.pc: config/icu.pc Makefile
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Layout library" >> $@
  	@echo "Name: $(PACKAGE)-le" >> $@
  	@echo "Requires: icu-uc" >> $@
@@ -41,7 +41,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo $@ updated.
  
  config/icu-lx.pc: config/icu.pc Makefile icudefs.mk
-@@ -271,7 +271,7 @@ config/icu-lx.pc: config/icu.pc Makefile
+@@ -280,7 +280,7 @@ config/icu-lx.pc: config/icu.pc Makefile
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library" >> $@
  	@echo "Name: $(PACKAGE)-lx" >> $@
  	@echo "Requires: icu-le" >> $@
@@ -50,7 +50,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo $@ updated.
  
  
-@@ -293,7 +293,7 @@ $(top_builddir)/config/pkgdataMakefile:
+@@ -302,7 +302,7 @@ $(top_builddir)/config/pkgdataMakefile:
  
  $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
  	-$(RMV) $@
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index ee80e918978..b3c90251a5a 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2011/07/25 10:16:54 adam Exp $
+$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
-@@ -25,11 +25,7 @@ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CF
+@@ -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
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
index 656441e633a..c8ded01d7c4 100644
--- a/textproc/icu/patches/patch-ad
+++ b/textproc/icu/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2011/07/25 10:16:54 adam Exp $
+$NetBSD: patch-ad,v 1.11 2012/11/07 20:59:51 adam Exp $
 
 --- icudefs.mk.in.orig	2010-12-07 12:14:06.000000000 +0000
 +++ icudefs.mk.in
-@@ -190,13 +190,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
+@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
  
  ## If we can't use the shared libraries, use the static libraries
  ifneq ($(ENABLE_SHARED),YES)
diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af
index 5dfa2da64d0..fb25f6aaed9 100644
--- a/textproc/icu/patches/patch-af
+++ b/textproc/icu/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.11 2012/04/25 18:53:44 adam Exp $
+$NetBSD: patch-af,v 1.12 2012/11/07 20:59:51 adam Exp $
 
 --- runConfigureICU.orig	2011-07-19 21:19:38.000000000 +0000
 +++ runConfigureICU
-@@ -286,7 +286,7 @@ case $platform in
+@@ -284,7 +284,7 @@ case $platform in
          RELEASE_CFLAGS='-O3'
          RELEASE_CXXFLAGS='-O3'
          ;;
diff --git a/textproc/icu/patches/patch-common_putilimp.h b/textproc/icu/patches/patch-common_putilimp.h
index 02809415d9b..5c656a3896a 100644
--- a/textproc/icu/patches/patch-common_putilimp.h
+++ b/textproc/icu/patches/patch-common_putilimp.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-common_putilimp.h,v 1.1 2012/07/10 19:14:48 bsiegert Exp $
+$NetBSD: patch-common_putilimp.h,v 1.2 2012/11/07 20:59:51 adam Exp $
 
---- common/putilimp.h.orig	Fri Jun 22 08:38:46 2012
+--- common/putilimp.h.orig	2012-11-05 17:14:50.000000000 +0000
 +++ common/putilimp.h
-@@ -119,6 +119,8 @@ typedef size_t uintptr_t;
- #   define U_TIMEZONE _timezone
+@@ -123,6 +123,8 @@ typedef size_t uintptr_t;
+    /* not defined */
  #elif U_PLATFORM == U_PF_OS400
     /* not defined */
 +#elif defined(__MirBSD__)
diff --git a/textproc/icu/patches/patch-common_unicode_platform.h b/textproc/icu/patches/patch-common_unicode_platform.h
index 91389529c73..5ce33938da0 100644
--- a/textproc/icu/patches/patch-common_unicode_platform.h
+++ b/textproc/icu/patches/patch-common_unicode_platform.h
@@ -1,18 +1,17 @@
-$NetBSD: patch-common_unicode_platform.h,v 1.2 2012/07/03 18:37:26 adam Exp $
+$NetBSD: patch-common_unicode_platform.h,v 1.3 2012/11/07 20:59:51 adam Exp $
 
---- common/unicode/platform.h.orig	2012-06-01 14:52:38.000000000 +0000
+--- common/unicode/platform.h.orig	2012-11-05 17:14:34.000000000 +0000
 +++ common/unicode/platform.h
-@@ -131,7 +131,8 @@
+@@ -144,7 +144,7 @@
  #   include <android/api-level.h>
  #elif defined(linux) || defined(__linux__) || defined(__linux)
  #   define U_PLATFORM U_PF_LINUX
--#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
-+	defined(__NetBSD__) || defined(__DragonFly__)
+-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)
++#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
  #   define U_PLATFORM U_PF_BSD
  #elif defined(sun) || defined(__sun)
      /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
-@@ -346,6 +347,13 @@
+@@ -381,6 +381,13 @@
  #   define U_IS_BIG_ENDIAN 1
  #elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN)
  #   define U_IS_BIG_ENDIAN 0
diff --git a/textproc/icu/patches/patch-common_unicode_uset_h b/textproc/icu/patches/patch-common_unicode_uset_h
deleted file mode 100644
index 80d1cdc1add..00000000000
--- a/textproc/icu/patches/patch-common_unicode_uset_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-common_unicode_uset_h,v 1.1 2012/07/06 04:54:25 dholland Exp $
-
-Declare functions with prototypes. (Otherwise some client packages break.)
-
---- common/unicode/uset.h.orig	2012-06-01 14:52:36.000000000 +0000
-+++ common/unicode/uset.h
-@@ -251,7 +251,7 @@ typedef struct USerializedSet {
-  * @stable ICU 4.2
-  */
- U_STABLE USet* U_EXPORT2
--uset_openEmpty();
-+uset_openEmpty(void);
- 
- /**
-  * Creates a USet object that contains the range of characters
diff --git a/textproc/icu/patches/patch-tools_genrb_derb.c b/textproc/icu/patches/patch-tools_genrb_derb.c
new file mode 100644
index 00000000000..dd33e4f3794
--- /dev/null
+++ b/textproc/icu/patches/patch-tools_genrb_derb.c
@@ -0,0 +1,59 @@
+$NetBSD: patch-tools_genrb_derb.c,v 1.1 2012/11/07 20:59:51 adam Exp $
+
+Changes "truncate" variable to "trunc" to avoid compilation error.
+
+--- tools/genrb/derb.c.orig	2012-11-07 20:07:56.000000000 +0000
++++ tools/genrb/derb.c
+@@ -54,7 +54,7 @@ static UConverter *defaultConverter = 0;
+ 
+ static const int32_t indentsize = 4;
+ static int32_t truncsize = DERB_DEFAULT_TRUNC;
+-static UBool truncate = FALSE;
++static UBool trunc = FALSE;
+ 
+ static const char *getEncodingName(const char *encoding);
+ static void reportError(const char *pname, UErrorCode *status, const char *when);
+@@ -152,14 +152,14 @@ main(int argc, char* argv[]) {
+     }
+ 
+     if(options[4].doesOccur) {
+-        truncate = TRUE;
++        trunc = TRUE;
+         if(options[4].value != NULL) {
+             truncsize = atoi(options[4].value); /* user defined printable size */
+         } else {
+             truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
+         }
+     } else {
+-        truncate = FALSE;
++        trunc = FALSE;
+     }
+ 
+     if(options[5].doesOccur) {
+@@ -473,7 +473,7 @@ static void printOutAlias(FILE *out,  UC
+     int32_t len = 0;
+     const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
+     UChar *string = quotedString(thestr);
+-    if(truncate && len > truncsize) {
++    if(trunc && len > truncsize) {
+         char msg[128];
+         printIndent(out, converter, indent);
+         sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
+@@ -517,7 +517,7 @@ static void printOutBundle(FILE *out, UC
+             UChar *string = quotedString(thestr);
+ 
+             /* TODO: String truncation */
+-            if(truncate && len > truncsize) {
++            if(trunc && len > truncsize) {
+                 char msg[128];
+                 printIndent(out, converter, indent);
+                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
+@@ -576,7 +576,7 @@ static void printOutBundle(FILE *out, UC
+         {
+             int32_t len = 0;
+             const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
+-            if(truncate && len > truncsize) {
++            if(trunc && len > truncsize) {
+                 char msg[128];
+                 printIndent(out, converter, indent);
+                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",