update to ICU 3.6

Major changes in ICU 3.6 include the following:
-	Unicode: ICU uses and supports Unicode 5.0, which is the latest major release of Unicode. Unicode 5.0 will be used in many operating systems and applications, and this version of ICU is important maintain interoperability with these new operating systems and applications. More information about Unicode 5.0 can be found in the Unicode press release.
-	Locale Data: ICU uses and supports data from Common Locale Data Repository (CLDR) 1.4, which includes many improvements in quality and quantity of data. There is 25% more CLDR locale data in 245 locales in ICU.
-	ICU4C Specific Changes
-	Charset Detection: A charset detection framework was added, which provides heuristics for detecting the charset for unlabeled sequences of bytes.
-	Layout: The font layout engine has support added for Tibetan, Sinhala and Old Hangul.
-	BiDi: The BiDi algorithm was enhanced to be more flexible and efficient
-	ICU Data Management: The new icupkg tool provides an easier way to manage ICU's data library. This tool allows you to add, update or remove data from ICU's data archive.
-	Time Zones The time zone data is modularized to allow easier building and updating of the data.
-	Word Boundaries: The Thai word break iteration was improved to be more accurate. Also dictionary based detection of Thai word boundaries is now active for all locales.
-	UText
-	The BreakIterator uses UText for abstract text processing.
-	64-bit indexing is now used to allow access to larger chunks of text.
-	API for read-only locking for security and robustness was added.
-	Performance
-	The u_sprintf/u_sscanf performance from the icuio library has been improved for number formatting/parsing.
-	Constructing a DateFormat is significantly faster for many locales.
-	Opening and closing a charset converter is significantly faster.
-	The UTF-8 transformation functions and macros are faster.
-	The UText API was improved for performance.
-	The collation open and close functions have a small performance improvement.

7 files changed, 52 insertions, 49 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 45b38c47e42..57ad73230aa 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.51 2006/10/04 22:01:00 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/03/23 12:51:13 recht Exp $
 #
 
-DISTNAME=	icu-3.4.1
+DISTNAME=	icu4c-3_6-src
+PKGNAME=	icu-3.6
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.software.ibm.com/software/globalization/icu/${PKGVERSION}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www-306.ibm.com/software/globalization/icu/
+HOMEPAGE=	http://www.icu-project.org/
 COMMENT=	Robust and full-featured Unicode services
 
 WRKSRC=			${WRKDIR}/${PKGBASE}/source
@@ -20,10 +21,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ENV+=		U_MAKE=${TOOLS_GMAKE:Q}
 
-# ICU's configure script will automatically append "/icu" to the sysconfdir.
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
-PKG_SYSCONFSUBDIR=	icu
-
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index db42409f438..b1eb1c65eb5 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2006/07/26 11:04:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/03/23 12:51:13 recht Exp $
 bin/derb
 bin/genbrk
 bin/gencnval
+bin/genctd
 bin/genrb
 bin/icu-config
 bin/makeconv
@@ -80,6 +81,7 @@ include/unicode/ucnv_err.h
 include/unicode/ucol.h
 include/unicode/ucoleitr.h
 include/unicode/uconfig.h
+include/unicode/ucsdet.h
 include/unicode/ucurr.h
 include/unicode/udat.h
 include/unicode/udata.h
@@ -87,6 +89,7 @@ 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/uloc.h
 include/unicode/ulocdata.h
@@ -116,6 +119,7 @@ include/unicode/usprep.h
 include/unicode/ustdio.h
 include/unicode/ustream.h
 include/unicode/ustring.h
+include/unicode/usystem.h
 include/unicode/utext.h
 include/unicode/utf.h
 include/unicode/utf16.h
@@ -130,27 +134,27 @@ include/unicode/uversion.h
 lib/icu/${PKGVERSION}/Makefile.inc
 lib/icu/Makefile.inc
 lib/icu/current
-lib/libicudata.so
-lib/libicudata.so.34
-lib/libicudata.so.34.1
-lib/libicui18n.so
-lib/libicui18n.so.34
-lib/libicui18n.so.34.1
-lib/libicuio.so
-lib/libicuio.so.34
-lib/libicuio.so.34.1
-lib/libicule.so
-lib/libicule.so.34
-lib/libicule.so.34.1
-lib/libiculx.so
-lib/libiculx.so.34
-lib/libiculx.so.34.1
-lib/libicutu.so
-lib/libicutu.so.34
-lib/libicutu.so.34.1
-lib/libicuuc.so
-lib/libicuuc.so.34
-lib/libicuuc.so.34.1
+lib/libicudata.dylib
+lib/libicudata.dylib.36
+lib/libicudata.dylib.36.0
+lib/libicui18n.dylib
+lib/libicui18n.dylib.36
+lib/libicui18n.dylib.36.0
+lib/libicuio.dylib
+lib/libicuio.dylib.36
+lib/libicuio.dylib.36.0
+lib/libicule.dylib
+lib/libicule.dylib.36
+lib/libicule.dylib.36.0
+lib/libiculx.dylib
+lib/libiculx.dylib.36
+lib/libiculx.dylib.36.0
+lib/libicutu.dylib
+lib/libicutu.dylib.36
+lib/libicutu.dylib.36.0
+lib/libicuuc.dylib
+lib/libicuuc.dylib.36
+lib/libicuuc.dylib.36.0
 lib/libsicudata.a
 lib/libsicui18n.a
 lib/libsicuio.a
@@ -159,22 +163,24 @@ lib/libsiculx.a
 lib/libsicutu.a
 lib/libsicuuc.a
 man/man1/derb.1
+man/man1/genbrk.1
 man/man1/gencnval.1
+man/man1/genctd.1
 man/man1/genrb.1
 man/man1/icu-config.1
 man/man1/makeconv.1
 man/man1/pkgdata.1
 man/man1/uconv.1
-man/man8/decmn.8
 man/man8/genccode.8
 man/man8/gencmn.8
 man/man8/gensprep.8
 man/man8/genuca.8
-sbin/decmn
+man/man8/icupkg.8
 sbin/genccode
 sbin/gencmn
 sbin/gensprep
 sbin/genuca
+sbin/icupkg
 sbin/icuswap
 share/icu/${PKGVERSION}/config/${MH_NAME}
 share/icu/${PKGVERSION}/license.html
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index e48748ec102..c71265cbe98 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2006/07/26 11:04:37 drochner Exp $
+$NetBSD: distinfo,v 1.14 2007/03/23 12:51:13 recht Exp $
 
-SHA1 (icu-3.4.1.tgz) = 598b6b6d4baebdc1c5a75cdd27afea618a476717
-RMD160 (icu-3.4.1.tgz) = fe8a189ec70dc2c92ccf61956a5982443fc73062
-Size (icu-3.4.1.tgz) = 9320610 bytes
-SHA1 (patch-aa) = 2d743ee3ab1ecd4aeeb01cc490eabedcd0c2ab97
-SHA1 (patch-ab) = 7f322ac242a600400930b3da14c2ec9acb7db5f6
-SHA1 (patch-ae) = 8a45c69700948346182155badfd40de4e6a5a0b9
-SHA1 (patch-af) = 3938acc179400d4e28ac965631d28a9fd42464f4
+SHA1 (icu4c-3_6-src.tgz) = b580c2802e74eb6af7e5e19b05c7d7c5d8c623f9
+RMD160 (icu4c-3_6-src.tgz) = b227ac9ff6019362bc4d01c18433869b0e0ff1c2
+Size (icu4c-3_6-src.tgz) = 10183358 bytes
+SHA1 (patch-aa) = b7299b3aac54410cb686980788dd0b6b435ae069
+SHA1 (patch-ab) = 32d2aeb38ed84352751d0f3d8db5d8b433ef03e4
+SHA1 (patch-ae) = 69caf7c0c226a0b45158a9620f045e943f00b820
+SHA1 (patch-af) = df50984a17111a69c517b26f303866f2d384e857
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 41d5e7a820f..5253da82c4c 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2006/01/03 00:04:42 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2007/03/23 12:51:13 recht Exp $
 
---- Makefile.in.orig	2004-11-18 22:22:10.000000000 +0100
+--- Makefile.in.orig	2006-03-30 02:33:20.000000000 +0200
 +++ Makefile.in
 @@ -174,7 +174,7 @@ $(top_builddir)/config/Makefile.inc: $(s
  
@@ -8,6 +8,6 @@ $NetBSD: patch-aa,v 1.10 2006/01/03 00:04:42 wiz Exp $
  	-$(RMV) $@
 -	$(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
 +	cp -f $(top_srcdir)/config/icu-config-top $@
+ 	chmod u+w $@
  	@echo "# Following from @platform_make_fragment@" >> $@
  	sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
- 	sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index c517ccb64c2..427e3aedc5e 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2006/01/03 00:04:42 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2007/03/23 12:51:13 recht Exp $
 
---- config/mh-darwin.orig	2004-05-18 23:54:24.000000000 +0200
+--- config/mh-darwin.orig	2006-02-01 08:52:42.000000000 +0100
 +++ config/mh-darwin
 @@ -25,7 +25,7 @@ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CF
  SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
index 091a0e8bb04..976b46935ba 100644
--- a/textproc/icu/patches/patch-ae
+++ b/textproc/icu/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.7 2006/01/03 00:04:42 wiz Exp $
+$NetBSD: patch-ae,v 1.8 2007/03/23 12:51:13 recht Exp $
 
---- common/unicode/umachine.h.orig	2005-06-25 01:24:54.000000000 +0200
+--- common/unicode/umachine.h.orig	2006-02-07 02:54:16.000000000 +0100
 +++ common/unicode/umachine.h
 @@ -43,7 +43,7 @@
  
diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af
index 2cca96436f6..3da3017799e 100644
--- a/textproc/icu/patches/patch-af
+++ b/textproc/icu/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.7 2006/01/03 00:04:42 wiz Exp $
+$NetBSD: patch-af,v 1.8 2007/03/23 12:51:13 recht Exp $
 
---- runConfigureICU.orig	2005-05-18 19:29:00.000000000 +0200
+--- runConfigureICU.orig	2006-07-14 01:36:36.000000000 +0200
 +++ runConfigureICU
-@@ -253,7 +253,7 @@ case $platform in
+@@ -232,7 +232,7 @@ case $platform in
          RELEASE_CFLAGS='-O2'
          RELEASE_CXXFLAGS='-O2'
          ;;