update to 4.2.1

major changes:
Locale Data: ICU uses and supports data from Common Locale Data Repository
(CLDR) 1.7 , which includes data for 146 languages, 159 territories,
468 locales- 21% more locale data than the previous release.
Number system support and the number keyword.
Number system override in DateFormat
Numerics used by Hebrew Calendar date in Hebrew locale
BCP47 (language tag) / Locale transformation
BCP47 mapping of LDML keywords
Encoding selector: Return a list of charsets that can handle the input text
Simple duration: Implementation of CLDR duration format
Available/Preferred keywords for a locale (Calendar, Collation, and Currency)
StringPrep standard profiles: RFC3491 NAMEPREP, RFC3530 NFS4, RFC3722 iSCSI,
RFC3920 NodePrep/ResourcePrep, RFC4011 MIB, RFC4013 SASLprep, RFC4505 trace
and RFC4518 LDAPprep
Miscellaneous Arabic shaping enhancements
UTF-8 friendly internal data structure for Unicode data lookup
API to get CLDR version used by ICU
ISCII charset converter updates (added Gurumukhi, other updates)
Performance improvements in Time Zone Name format/parse, and in
DateIntervalFormat construction

3 files changed, 38 insertions, 25 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index cdc19b32eb6..a2981b236ea 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2009/07/25 13:02:05 jdolecek Exp $
+# $NetBSD: Makefile,v 1.60 2009/08/05 17:01:17 drochner Exp $
 #
 
-DISTNAME=	icu4c-4_0_1-src
-PKGNAME=	icu-4.0.1
-PKGREVISION=	1
+DISTNAME=	icu4c-4_2_1-src
+PKGNAME=	icu-4.2.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://download.icu-project.org/files/icu4c/4.0.1/
+MASTER_SITES=	http://download.icu-project.org/files/icu4c/4.2.1/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index 88950e23051..e267e9d3585 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.17 2009/07/25 13:02:05 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/08/05 17:01:17 drochner Exp $
 bin/derb
 bin/genbrk
+bin/gencfu
 bin/gencnval
 bin/genctd
 bin/genrb
@@ -26,6 +27,7 @@ include/unicode/basictz.h
 include/unicode/bms.h
 include/unicode/bmsearch.h
 include/unicode/brkiter.h
+include/unicode/bytestream.h
 include/unicode/calendar.h
 include/unicode/caniter.h
 include/unicode/chariter.h
@@ -34,6 +36,7 @@ include/unicode/coleitr.h
 include/unicode/coll.h
 include/unicode/colldata.h
 include/unicode/curramt.h
+include/unicode/currpinf.h
 include/unicode/currunit.h
 include/unicode/datefmt.h
 include/unicode/dbbi.h
@@ -46,6 +49,7 @@ include/unicode/dtitvfmt.h
 include/unicode/dtitvinf.h
 include/unicode/dtptngen.h
 include/unicode/dtrule.h
+include/unicode/errorcode.h
 include/unicode/fieldpos.h
 include/unicode/fmtable.h
 include/unicode/format.h
@@ -57,6 +61,7 @@ include/unicode/measure.h
 include/unicode/msgfmt.h
 include/unicode/normlzr.h
 include/unicode/numfmt.h
+include/unicode/numsys.h
 include/unicode/parseerr.h
 include/unicode/parsepos.h
 include/unicode/platform.h
@@ -76,11 +81,16 @@ include/unicode/search.h
 include/unicode/simpletz.h
 include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
+include/unicode/std_string.h
 include/unicode/strenum.h
+include/unicode/stringpiece.h
 include/unicode/stsearch.h
 include/unicode/symtable.h
 include/unicode/tblcoll.h
 include/unicode/timezone.h
+include/unicode/tmunit.h
+include/unicode/tmutamt.h
+include/unicode/tmutfmt.h
 include/unicode/translit.h
 include/unicode/tzrule.h
 include/unicode/tztrans.h
@@ -95,6 +105,7 @@ include/unicode/uclean.h
 include/unicode/ucnv.h
 include/unicode/ucnv_cb.h
 include/unicode/ucnv_err.h
+include/unicode/ucnvsel.h
 include/unicode/ucol.h
 include/unicode/ucoleitr.h
 include/unicode/uconfig.h
@@ -133,6 +144,7 @@ include/unicode/usearch.h
 include/unicode/uset.h
 include/unicode/usetiter.h
 include/unicode/ushape.h
+include/unicode/uspoof.h
 include/unicode/usprep.h
 include/unicode/ustdio.h
 include/unicode/ustream.h
@@ -151,34 +163,37 @@ include/unicode/utypes.h
 include/unicode/uversion.h
 include/unicode/vtzone.h
 lib/icu/${PKGVERSION}/Makefile.inc
+lib/icu/${PKGVERSION}/pkgdata.inc
 lib/icu/Makefile.inc
 lib/icu/current
+lib/icu/pkgdata.inc
 lib/libicudata${SO_EXT}${SO_SUFFIX}
-lib/libicudata${SO_EXT}.40${SO_SUFFIX}
-lib/libicudata${SO_EXT}.40.1${SO_SUFFIX}
+lib/libicudata${SO_EXT}.42${SO_SUFFIX}
+lib/libicudata${SO_EXT}.42.1${SO_SUFFIX}
 lib/libicui18n${SO_EXT}${SO_SUFFIX}
-lib/libicui18n${SO_EXT}.40${SO_SUFFIX}
-lib/libicui18n${SO_EXT}.40.1${SO_SUFFIX}
+lib/libicui18n${SO_EXT}.42${SO_SUFFIX}
+lib/libicui18n${SO_EXT}.42.1${SO_SUFFIX}
 lib/libicuio${SO_EXT}${SO_SUFFIX}
-lib/libicuio${SO_EXT}.40${SO_SUFFIX}
-lib/libicuio${SO_EXT}.40.1${SO_SUFFIX}
+lib/libicuio${SO_EXT}.42${SO_SUFFIX}
+lib/libicuio${SO_EXT}.42.1${SO_SUFFIX}
 lib/libicule${SO_EXT}${SO_SUFFIX}
-lib/libicule${SO_EXT}.40${SO_SUFFIX}
-lib/libicule${SO_EXT}.40.1${SO_SUFFIX}
+lib/libicule${SO_EXT}.42${SO_SUFFIX}
+lib/libicule${SO_EXT}.42.1${SO_SUFFIX}
 lib/libiculx${SO_EXT}${SO_SUFFIX}
-lib/libiculx${SO_EXT}.40${SO_SUFFIX}
-lib/libiculx${SO_EXT}.40.1${SO_SUFFIX}
+lib/libiculx${SO_EXT}.42${SO_SUFFIX}
+lib/libiculx${SO_EXT}.42.1${SO_SUFFIX}
 lib/libicutu${SO_EXT}${SO_SUFFIX}
-lib/libicutu${SO_EXT}.40${SO_SUFFIX}
-lib/libicutu${SO_EXT}.40.1${SO_SUFFIX}
+lib/libicutu${SO_EXT}.42${SO_SUFFIX}
+lib/libicutu${SO_EXT}.42.1${SO_SUFFIX}
 lib/libicuuc${SO_EXT}${SO_SUFFIX}
-lib/libicuuc${SO_EXT}.40${SO_SUFFIX}
-lib/libicuuc${SO_EXT}.40.1${SO_SUFFIX}
+lib/libicuuc${SO_EXT}.42${SO_SUFFIX}
+lib/libicuuc${SO_EXT}.42.1${SO_SUFFIX}
 lib/libsicudata.a
 lib/libsicui18n.a
 lib/libsicuio.a
 lib/libsicule.a
 lib/libsiculx.a
+lib/libsicutu.a
 lib/libsicuuc.a
 man/man1/derb.1
 man/man1/genbrk.1
@@ -199,7 +214,6 @@ sbin/gencmn
 sbin/gensprep
 sbin/genuca
 sbin/icupkg
-sbin/icuswap
 share/icu/${PKGVERSION}/config/${MH_NAME}
 share/icu/${PKGVERSION}/install-sh
 share/icu/${PKGVERSION}/license.html
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 4b2d372eab9..0f542fcfe78 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2009/03/25 22:30:19 he Exp $
+$NetBSD: distinfo,v 1.17 2009/08/05 17:01:17 drochner Exp $
 
-SHA1 (icu4c-4_0_1-src.tgz) = 65a65e9cd5670e113031def9448f65fb8f84f47a
-RMD160 (icu4c-4_0_1-src.tgz) = e40e7ffddd3134a34fe7e7bc98d776c5b67b637c
-Size (icu4c-4_0_1-src.tgz) = 12356471 bytes
+SHA1 (icu4c-4_2_1-src.tgz) = 872a77fca51325ab0b335cbbadc1739576078434
+RMD160 (icu4c-4_2_1-src.tgz) = 1b94317a117c40d564ec047cff9cb2de2de3bd9e
+Size (icu4c-4_2_1-src.tgz) = 13161131 bytes
 SHA1 (patch-aa) = b7299b3aac54410cb686980788dd0b6b435ae069
 SHA1 (patch-ab) = 32d2aeb38ed84352751d0f3d8db5d8b433ef03e4
 SHA1 (patch-ae) = 69caf7c0c226a0b45158a9620f045e943f00b820