Changes 4.8:

* CLDR 2.0: The CLDR 2.0 release contains numerous improvements and bug fixes
  approved by the CLDR committee, including much additional data for many
  languages.
* Explicit parent locale support in data imported from CLDR.
* MessageFormat and related classes (choice/plural/select) have been
  reimplemented, with several improvements and some incompatible changes.
* Extended PluralFormat pattern syntax supports explicit-value forms and
  offsets.
* Utility APIs in PluralRules (get some/all/unique keyword values)
* Time zone API to return a list of available canonical system time zone IDs.
* Time zone API to return a region.
* Collation: Full implementation & public API for script reordering
* Dictionary-type trie
* GB18030-2005 update

6 files changed, 61 insertions, 34 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 1c9cccb28d5..e5926cb1b50 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2011/03/14 13:46:32 adam Exp $
+# $NetBSD: Makefile,v 1.64 2011/06/02 07:06:10 adam Exp $
 
-DISTNAME=	icu4c-4_6_1-src
-PKGNAME=	icu-4.6.1
+DISTNAME=	icu4c-4_8-src
+PKGNAME=	icu-4.8
 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 1657a62312c..a5d3825e0e5 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2011/03/14 13:46:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2011/06/02 07:06:10 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -24,11 +24,15 @@ include/layout/RunArrays.h
 include/layout/loengine.h
 include/layout/playout.h
 include/layout/plruns.h
+include/unicode/alphaindex.h
+include/unicode/appendable.h
 include/unicode/basictz.h
 include/unicode/bms.h
 include/unicode/bmsearch.h
 include/unicode/brkiter.h
 include/unicode/bytestream.h
+include/unicode/bytestrie.h
+include/unicode/bytestriebuilder.h
 include/unicode/calendar.h
 include/unicode/caniter.h
 include/unicode/chariter.h
@@ -65,6 +69,7 @@ include/unicode/locid.h
 include/unicode/measfmt.h
 include/unicode/measunit.h
 include/unicode/measure.h
+include/unicode/messagepattern.h
 include/unicode/msgfmt.h
 include/unicode/normalizer2.h
 include/unicode/normlzr.h
@@ -94,6 +99,7 @@ include/unicode/sortkey.h
 include/unicode/std_string.h
 include/unicode/strenum.h
 include/unicode/stringpiece.h
+include/unicode/stringtriebuilder.h
 include/unicode/stsearch.h
 include/unicode/symtable.h
 include/unicode/tblcoll.h
@@ -110,6 +116,8 @@ include/unicode/ucal.h
 include/unicode/ucasemap.h
 include/unicode/ucat.h
 include/unicode/uchar.h
+include/unicode/ucharstrie.h
+include/unicode/ucharstriebuilder.h
 include/unicode/uchriter.h
 include/unicode/uclean.h
 include/unicode/ucnv.h
@@ -123,6 +131,7 @@ include/unicode/ucsdet.h
 include/unicode/ucurr.h
 include/unicode/udat.h
 include/unicode/udata.h
+include/unicode/udateintervalformat.h
 include/unicode/udatpg.h
 include/unicode/udeprctd.h
 include/unicode/udraft.h
@@ -147,6 +156,7 @@ include/unicode/unorm2.h
 include/unicode/unum.h
 include/unicode/uobject.h
 include/unicode/uobslete.h
+include/unicode/upluralrules.h
 include/unicode/uregex.h
 include/unicode/urename.h
 include/unicode/urep.h
@@ -161,6 +171,7 @@ include/unicode/usprep.h
 include/unicode/ustdio.h
 include/unicode/ustream.h
 include/unicode/ustring.h
+include/unicode/ustringtrie.h
 include/unicode/usystem.h
 include/unicode/utext.h
 include/unicode/utf.h
@@ -182,36 +193,36 @@ lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.46
-lib/libicudata.so.46.1
+lib/libicudata.so.48
+lib/libicudata.so.48.0
 lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.46
-lib/libicui18n.so.46.1
+lib/libicui18n.so.48
+lib/libicui18n.so.48.0
 lib/libicuio.a
 lib/libicuio.so
-lib/libicuio.so.46
-lib/libicuio.so.46.1
+lib/libicuio.so.48
+lib/libicuio.so.48.0
 lib/libicule.a
 lib/libicule.so
-lib/libicule.so.46
-lib/libicule.so.46.1
+lib/libicule.so.48
+lib/libicule.so.48.0
 lib/libiculx.a
 lib/libiculx.so
-lib/libiculx.so.46
-lib/libiculx.so.46.1
+lib/libiculx.so.48
+lib/libiculx.so.48.0
 lib/libicutest.a
 lib/libicutest.so
-lib/libicutest.so.46
-lib/libicutest.so.46.1
+lib/libicutest.so.48
+lib/libicutest.so.48.0
 lib/libicutu.a
 lib/libicutu.so
-lib/libicutu.so.46
-lib/libicutu.so.46.1
+lib/libicutu.so.48
+lib/libicutu.so.48.0
 lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.46
-lib/libicuuc.so.46.1
+lib/libicuuc.so.48
+lib/libicuuc.so.48.0
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
 lib/pkgconfig/icu-le.pc
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 53b5849669e..a7b42972ca4 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/12/17 07:36:08 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2011/06/02 07:06:10 adam Exp $
 
 BUILDLINK_TREE+=	icu
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	icu
 ICU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.icu+=	icu>=3.4
-BUILDLINK_ABI_DEPENDS.icu?=	icu>=4.6
+BUILDLINK_ABI_DEPENDS.icu+=	icu>=4.6
 BUILDLINK_PKGSRCDIR.icu?=	../../textproc/icu
 .endif # ICU_BUILDLINK3_MK
 
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 561e959d232..dd549b677aa 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.19 2011/03/14 13:46:32 adam Exp $
+$NetBSD: distinfo,v 1.20 2011/06/02 07:06:10 adam Exp $
 
-SHA1 (icu4c-4_6_1-src.tgz) = b8bbf80dff1727a7528f9601b0502db1633658c3
-RMD160 (icu4c-4_6_1-src.tgz) = decd6e5fb17e1369af91aad6685c1a39d6f63132
-Size (icu4c-4_6_1-src.tgz) = 15561883 bytes
+SHA1 (icu4c-4_8-src.tgz) = f458b41800cc21bbb92ceb119380ad3249252fd6
+RMD160 (icu4c-4_8-src.tgz) = 77674ce09823f80810b7f5a0898881b5a62d938c
+Size (icu4c-4_8-src.tgz) = 18620856 bytes
 SHA1 (patch-aa) = 30999774a19659299b5eb31d0fd3c0945468e0ea
 SHA1 (patch-ab) = ca4ce0d1cb3d989044102d093863ae9dfb09ea43
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
 SHA1 (patch-ad) = e3b21cef4f5d26b448d13f5743036b241e1837eb
-SHA1 (patch-ae) = e89e71f79d32bc8471eb99a54c8c1350aa139552
+SHA1 (patch-ae) = a4f5c7c4d3e147646e4c09c766fa07506bda273a
 SHA1 (patch-af) = 0b085d7d72da4bc9d7ca382295ecad679b6c65ac
+SHA1 (patch-tools_toolutil_pkg_gencmn.c) = 30ff5589f2c9343db5631de6c986373903c58213
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
index 7fe25439115..0a9c6370b2f 100644
--- a/textproc/icu/patches/patch-ae
+++ b/textproc/icu/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.9 2010/12/07 17:58:13 adam Exp $
+$NetBSD: patch-ae,v 1.10 2011/06/02 07:06:11 adam Exp $
 
---- common/unicode/umachine.h.orig	2010-06-03 15:51:19.000000000 +0000
+--- common/unicode/umachine.h.orig	2011-05-23 21:56:00.000000000 +0000
 +++ common/unicode/umachine.h
 @@ -43,7 +43,7 @@
  
  #if defined(U_PALMOS)
  #   include "unicode/ppalmos.h"
--#elif !defined(__MINGW32__) && (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64))
-+#elif !defined(__MINGW32__) && !defined(__NetBSDPE__) && (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64))
- #ifdef CYGWINMSVC
- #   include "unicode/platform.h"
- #endif
+-#elif /*!defined(__MINGW32__) && */(defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64))
++#elif /*!defined(__MINGW32__) && */ !defined(__NetBSDPE__) && (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64))
+ /*
+  * platform.h is now also generated by MSVC Solution/Project files
+  * from platform.win and should always be included unless you are
diff --git a/textproc/icu/patches/patch-tools_toolutil_pkg_gencmn.c b/textproc/icu/patches/patch-tools_toolutil_pkg_gencmn.c
new file mode 100644
index 00000000000..0721bc6cb5c
--- /dev/null
+++ b/textproc/icu/patches/patch-tools_toolutil_pkg_gencmn.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_toolutil_pkg_gencmn.c,v 1.1 2011/06/02 07:06:11 adam Exp $
+
+Avoid out of memory.
+
+--- tools/toolutil/pkg_gencmn.c.orig	2011-06-02 06:18:25.000000000 +0000
++++ tools/toolutil/pkg_gencmn.c
+@@ -18,7 +18,7 @@
+ #include "putilimp.h"
+ #include "pkg_gencmn.h"
+ 
+-#define STRING_STORE_SIZE 100000
++#define STRING_STORE_SIZE 131072
+ 
+ #define COMMON_DATA_NAME U_ICUDATA_NAME
+ #define DATA_TYPE "dat"