Changes 49.1.1:

* Unicode 6.1: New scripts & blocks; changes to grapheme break & line break
  property values; some characters change from symbol to Po or No; etc.
* CLDR 21.0.1: Changes in segmentation data to match Unicode 6.1; new structures
  for support of Chinese calendar, for context-dependent capitalization, for
  gender of lists of people, for ordinal categories, and for multiple number
  systems per locale; deprecation of "commonlyUsed" element in timezone names;
  removal of "whole-locale" aliases; major cleanups of timezone names,
  delimiter data, abbreviated number data.
* Normalizer2 API additions
* Easier-to-use getInstance() variants; e.g., getNFDInstance()
* Getter for the combining-class value for a code point
* Getter for the raw Decomposition_Mapping
* Pairwise composition
* TimeZone class: (C++) Getter for unknown time zone, (Java) fields for GMT &
  unknown zone
* Support for deprecation of the "commonlyUsed" element for CLDR metazones
* DateTimePatternGenerator can now use separate patterns for skeletons that
  differ only in MMM vs MMMM or EEE vs EEEE,  etc.
* Support for custom DecimalFormatSymbols in RuleBasedNumberFormat
* Format and parse Chinese calendar dates including support for intercalary
  months
* Context Transforms for context-dependent capitalization behavior
* APIs for TimeZoneNames and TimeZoneFormat
* Support for new date format pattern "ZZZZZ" for ISO 8601 zone format
* Options for ambiguous local time resolution in Calendar
* Support for ISO 4217 numeric currency code

8 files changed, 49 insertions, 94 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 2a52eb0b52d..829c9eeb43b 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2012/04/12 13:59:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.69 2012/04/25 18:53:43 adam Exp $
 
-DISTNAME=	icu4c-4_8_1-src
+DISTNAME=	icu4c-49_1_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
-PKGREVISION=	3
 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 d0dfba246cb..2eb7e2b4826 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2011/07/25 10:16:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2012/04/25 18:53:43 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -80,10 +80,8 @@ include/unicode/parsepos.h
 include/unicode/platform.h
 include/unicode/plurfmt.h
 include/unicode/plurrule.h
-include/unicode/ppalmos.h
 include/unicode/ptypes.h
 include/unicode/putil.h
-include/unicode/pwin32.h
 include/unicode/rbbi.h
 include/unicode/rbnf.h
 include/unicode/rbtz.h
@@ -108,6 +106,8 @@ include/unicode/tmunit.h
 include/unicode/tmutamt.h
 include/unicode/tmutfmt.h
 include/unicode/translit.h
+include/unicode/tzfmt.h
+include/unicode/tznames.h
 include/unicode/tzrule.h
 include/unicode/tztrans.h
 include/unicode/ubidi.h
@@ -133,11 +133,8 @@ include/unicode/udat.h
 include/unicode/udata.h
 include/unicode/udateintervalformat.h
 include/unicode/udatpg.h
-include/unicode/udeprctd.h
-include/unicode/udraft.h
 include/unicode/uenum.h
 include/unicode/uidna.h
-include/unicode/uintrnal.h
 include/unicode/uiter.h
 include/unicode/uldnames.h
 include/unicode/uloc.h
@@ -155,7 +152,6 @@ include/unicode/unorm.h
 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
@@ -172,7 +168,6 @@ 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
 include/unicode/utf16.h
@@ -193,36 +188,36 @@ lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.48
-lib/libicudata.so.48.1
+lib/libicudata.so.49
+lib/libicudata.so.49.1.1
 lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.48
-lib/libicui18n.so.48.1
+lib/libicui18n.so.49
+lib/libicui18n.so.49.1.1
 lib/libicuio.a
 lib/libicuio.so
-lib/libicuio.so.48
-lib/libicuio.so.48.1
+lib/libicuio.so.49
+lib/libicuio.so.49.1.1
 lib/libicule.a
 lib/libicule.so
-lib/libicule.so.48
-lib/libicule.so.48.1
+lib/libicule.so.49
+lib/libicule.so.49.1.1
 lib/libiculx.a
 lib/libiculx.so
-lib/libiculx.so.48
-lib/libiculx.so.48.1
+lib/libiculx.so.49
+lib/libiculx.so.49.1.1
 lib/libicutest.a
 lib/libicutest.so
-lib/libicutest.so.48
-lib/libicutest.so.48.1
+lib/libicutest.so.49
+lib/libicutest.so.49.1.1
 lib/libicutu.a
 lib/libicutu.so
-lib/libicutu.so.48
-lib/libicutu.so.48.1
+lib/libicutu.so.49
+lib/libicutu.so.49.1.1
 lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.48
-lib/libicuuc.so.48.1
+lib/libicuuc.so.49
+lib/libicuuc.so.49.1.1
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
 lib/pkgconfig/icu-le.pc
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index cee9258ee8f..be8966d255a 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.24 2012/04/12 13:59:59 ryoon Exp $
+$NetBSD: distinfo,v 1.25 2012/04/25 18:53:43 adam Exp $
 
-SHA1 (icu4c-4_8_1-src.tgz) = f0252b2b7ad1ef861ac39b177b7a6fcb6c94eb45
-RMD160 (icu4c-4_8_1-src.tgz) = 2196dffbc2d074cf56f5dcbb4e2b802c950cfcf0
-Size (icu4c-4_8_1-src.tgz) = 18677882 bytes
-SHA1 (patch-aa) = 07504c42121f798ec3f8b945533c63f80466a17f
+SHA1 (icu4c-49_1_1-src.tgz) = f407d7e2808b76e3a6ca316aab896aef74bf6722
+RMD160 (icu4c-49_1_1-src.tgz) = ad47b292be561398b25d198a35c025670432c3f1
+Size (icu4c-49_1_1-src.tgz) = 19001722 bytes
+SHA1 (patch-aa) = e4020ec11a9754cebb96de754b0982eaa2ad2fe6
 SHA1 (patch-ab) = e6f4a08d0efabd8e6ae763289d975c1bc70e89c4
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
 SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb
-SHA1 (patch-ae) = c9c62d0bf698ab599351c5c2fc3c2ef4e40aff8e
-SHA1 (patch-af) = 924dab672eea2ec80f75f9e095906006e489d900
-SHA1 (patch-ag) = 5a1b1e75e1e5387c33a8205233cbfc5f432bbaa1
-SHA1 (patch-config_icu-config-bottom) = f2fad275ada56a7489639efba3fe605a46578f8d
+SHA1 (patch-af) = c81168246649f191ebb19a61fb216e172aac3cc2
+SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index afa801c0014..bb05f54ee92 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.13 2012/02/01 23:53:32 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2012/04/25 18:53:44 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	2011-07-19 21:19:38.000000000 +0000
+--- Makefile.in.orig	2012-04-05 20:49:28.000000000 +0000
 +++ Makefile.in
-@@ -225,7 +225,7 @@ config/icu-uc.pc: config/icu.pc Makefile
+@@ -238,7 +238,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.
  
-@@ -234,7 +234,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
+@@ -247,7 +247,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
-@@ -242,7 +242,7 @@ config/icu-io.pc: config/icu.pc Makefile
+@@ -255,7 +255,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
-@@ -250,7 +250,7 @@ config/icu-le.pc: config/icu.pc Makefile
+@@ -263,7 +263,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
-@@ -258,7 +258,7 @@ config/icu-lx.pc: config/icu.pc Makefile
+@@ -271,7 +271,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.
  
  
-@@ -280,7 +280,7 @@ $(top_builddir)/config/pkgdataMakefile:
+@@ -293,7 +293,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-ae b/textproc/icu/patches/patch-ae
deleted file mode 100644
index 7784a97e57b..00000000000
--- a/textproc/icu/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2011/07/25 10:16:54 adam Exp $
-
---- common/unicode/umachine.h.orig	2011-07-19 21:16:18.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))
- /*
-  * 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-af b/textproc/icu/patches/patch-af
index 4b305b6f973..5dfa2da64d0 100644
--- a/textproc/icu/patches/patch-af
+++ b/textproc/icu/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.10 2011/07/25 10:16:54 adam Exp $
+$NetBSD: patch-af,v 1.11 2012/04/25 18:53:44 adam Exp $
 
 --- runConfigureICU.orig	2011-07-19 21:19:38.000000000 +0000
 +++ runConfigureICU
-@@ -283,7 +283,7 @@ case $platform in
+@@ -286,7 +286,7 @@ case $platform in
          RELEASE_CFLAGS='-O3'
          RELEASE_CXXFLAGS='-O3'
          ;;
diff --git a/textproc/icu/patches/patch-ag b/textproc/icu/patches/patch-ag
deleted file mode 100644
index 56bbe854d26..00000000000
--- a/textproc/icu/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2011/12/09 16:11:54 drochner Exp $
-
-Ticket #8984
-
---- common/uloc.c.orig	2011-07-19 21:16:28.000000000 +0000
-+++ common/uloc.c
-@@ -1797,7 +1797,7 @@ _canonicalize(const char* localeID,
-                 int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
-                 len -= variantLen;
-                 if (variantLen > 0) {
--                    if (name[len-1] == '_') { /* delete trailing '_' */
-+                    if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
-                         --len;
-                     }
-                     addKeyword = VARIANT_MAP[j].keyword;
-@@ -1805,7 +1805,7 @@ _canonicalize(const char* localeID,
-                     break;
-                 }
-             }
--            if (name[len-1] == '_') { /* delete trailing '_' */
-+            if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */
-                 --len;
-             }
-         }
diff --git a/textproc/icu/patches/patch-config_icu-config-bottom b/textproc/icu/patches/patch-config_icu-config-bottom
index d110fa85781..82f63c38e01 100644
--- a/textproc/icu/patches/patch-config_icu-config-bottom
+++ b/textproc/icu/patches/patch-config_icu-config-bottom
@@ -1,18 +1,18 @@
-$NetBSD: patch-config_icu-config-bottom,v 1.1 2012/04/12 14:00:00 ryoon Exp $
+$NetBSD: patch-config_icu-config-bottom,v 1.2 2012/04/25 18:53:44 adam Exp $
 
---- config/icu-config-bottom.orig	2011-07-19 21:16:46.000000000 +0000
+--- config/icu-config-bottom.orig	2012-04-05 20:46:38.000000000 +0000
 +++ config/icu-config-bottom
 @@ -352,11 +352,11 @@ do
  	    ;;
  
  	--version)
--        echo $ECHO_N $VERSION
-+        echo $ECHO_N $VERSION${ECHO_C}
-         ;;
- 
-     --unicode-version)
--        echo $ECHO_N $UNICODE_VERSION
-+        echo $ECHO_N $UNICODE_VERSION${ECHO_C}
-         ;;
+-	    echo $ECHO_N $VERSION
++	    echo $ECHO_N $VERSION${ECHO_C}
+ 	    ;;
  
- 	--help)
+ 	--unicode-version)
+-	    echo $ECHO_N $UNICODE_VERSION
++	    echo $ECHO_N $UNICODE_VERSION${ECHO_C}
+ 	    ;;
+ 	
+ 	--host)