Changes 4.6:

CLDR 1.9, Unicode 6.0, UTS #46 support, collation enhancements,
alternate number symbols

9 files changed, 113 insertions, 60 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index a2981b236ea..7dd55f7440d 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2009/08/05 17:01:17 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.61 2010/12/07 17:58:13 adam Exp $
 
-DISTNAME=	icu4c-4_2_1-src
-PKGNAME=	icu-4.2.1
+DISTNAME=	icu4c-4_6-src
+PKGNAME=	icu-4.6
 CATEGORIES=	textproc
-MASTER_SITES=	http://download.icu-project.org/files/icu4c/4.2.1/
+MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,17 +11,15 @@ HOMEPAGE=	http://www.icu-project.org/
 COMMENT=	Robust and full-featured Unicode services
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-MAKE_JOBS_SAFE=		no
 
 WRKSRC=			${WRKDIR}/icu/source
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 TEST_TARGET=		check
 UNLIMIT_RESOURCES+=	datasize
-
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-static
-CONFIGURE_ENV+=		U_MAKE=${TOOLS_GMAKE:Q}
+CONFIGURE_ENV+=		U_MAKE=${TOOLS_GMAKE}
 
 .include "../../mk/pthread.buildlink3.mk"
 
@@ -55,7 +52,7 @@ PLIST_SUBST+=		MH_NAME=mh-unknown
 .if ${OPSYS} == "Darwin"
 SO_EXT=
 SO_SUFFIX=.dylib
-INSTALL_UNSTRIPPED=     yes
+INSTALL_UNSTRIPPED=	yes
 .else
 SO_EXT=.so
 SO_SUFFIX=
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index e267e9d3585..8156202f70d 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/08/05 17:01:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.19 2010/12/07 17:58:13 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -6,6 +6,7 @@ bin/gencnval
 bin/genctd
 bin/genrb
 bin/icu-config
+bin/icuinfo
 bin/makeconv
 bin/pkgdata
 bin/uconv
@@ -53,12 +54,19 @@ include/unicode/errorcode.h
 include/unicode/fieldpos.h
 include/unicode/fmtable.h
 include/unicode/format.h
+include/unicode/fpositer.h
 include/unicode/gregocal.h
+include/unicode/icudataver.h
+include/unicode/icuplug.h
+include/unicode/idna.h
+include/unicode/localpointer.h
+include/unicode/locdspnm.h
 include/unicode/locid.h
 include/unicode/measfmt.h
 include/unicode/measunit.h
 include/unicode/measure.h
 include/unicode/msgfmt.h
+include/unicode/normalizer2.h
 include/unicode/normlzr.h
 include/unicode/numfmt.h
 include/unicode/numsys.h
@@ -68,6 +76,7 @@ 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
@@ -78,6 +87,7 @@ include/unicode/rep.h
 include/unicode/resbund.h
 include/unicode/schriter.h
 include/unicode/search.h
+include/unicode/selfmt.h
 include/unicode/simpletz.h
 include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
@@ -120,6 +130,7 @@ include/unicode/uenum.h
 include/unicode/uidna.h
 include/unicode/uintrnal.h
 include/unicode/uiter.h
+include/unicode/uldnames.h
 include/unicode/uloc.h
 include/unicode/ulocdata.h
 include/unicode/umachine.h
@@ -132,6 +143,7 @@ include/unicode/unirepl.h
 include/unicode/uniset.h
 include/unicode/unistr.h
 include/unicode/unorm.h
+include/unicode/unorm2.h
 include/unicode/unum.h
 include/unicode/uobject.h
 include/unicode/uobslete.h
@@ -160,6 +172,7 @@ include/unicode/utmscale.h
 include/unicode/utrace.h
 include/unicode/utrans.h
 include/unicode/utypes.h
+include/unicode/uvernum.h
 include/unicode/uversion.h
 include/unicode/vtzone.h
 lib/icu/${PKGVERSION}/Makefile.inc
@@ -168,33 +181,42 @@ lib/icu/Makefile.inc
 lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata${SO_EXT}${SO_SUFFIX}
-lib/libicudata${SO_EXT}.42${SO_SUFFIX}
-lib/libicudata${SO_EXT}.42.1${SO_SUFFIX}
+lib/libicudata${SO_EXT}.46${SO_SUFFIX}
+lib/libicudata${SO_EXT}.46.0${SO_SUFFIX}
+lib/libicudata.a
 lib/libicui18n${SO_EXT}${SO_SUFFIX}
-lib/libicui18n${SO_EXT}.42${SO_SUFFIX}
-lib/libicui18n${SO_EXT}.42.1${SO_SUFFIX}
+lib/libicui18n${SO_EXT}.46${SO_SUFFIX}
+lib/libicui18n${SO_EXT}.46.0${SO_SUFFIX}
+lib/libicui18n.a
 lib/libicuio${SO_EXT}${SO_SUFFIX}
-lib/libicuio${SO_EXT}.42${SO_SUFFIX}
-lib/libicuio${SO_EXT}.42.1${SO_SUFFIX}
+lib/libicuio${SO_EXT}.46${SO_SUFFIX}
+lib/libicuio${SO_EXT}.46.0${SO_SUFFIX}
+lib/libicuio.a
 lib/libicule${SO_EXT}${SO_SUFFIX}
-lib/libicule${SO_EXT}.42${SO_SUFFIX}
-lib/libicule${SO_EXT}.42.1${SO_SUFFIX}
+lib/libicule${SO_EXT}.46${SO_SUFFIX}
+lib/libicule${SO_EXT}.46.0${SO_SUFFIX}
+lib/libicule.a
 lib/libiculx${SO_EXT}${SO_SUFFIX}
-lib/libiculx${SO_EXT}.42${SO_SUFFIX}
-lib/libiculx${SO_EXT}.42.1${SO_SUFFIX}
+lib/libiculx${SO_EXT}.46${SO_SUFFIX}
+lib/libiculx${SO_EXT}.46.0${SO_SUFFIX}
+lib/libiculx.a
+lib/libicutest${SO_EXT}${SO_SUFFIX}
+lib/libicutest${SO_EXT}.46${SO_SUFFIX}
+lib/libicutest${SO_EXT}.46.0${SO_SUFFIX}
+lib/libicutest.a
 lib/libicutu${SO_EXT}${SO_SUFFIX}
-lib/libicutu${SO_EXT}.42${SO_SUFFIX}
-lib/libicutu${SO_EXT}.42.1${SO_SUFFIX}
+lib/libicutu${SO_EXT}.46${SO_SUFFIX}
+lib/libicutu${SO_EXT}.46.0${SO_SUFFIX}
+lib/libicutu.a
 lib/libicuuc${SO_EXT}${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
+lib/libicuuc${SO_EXT}.46${SO_SUFFIX}
+lib/libicuuc${SO_EXT}.46.0${SO_SUFFIX}
+lib/libicuuc.a
+lib/pkgconfig/icu-i18n.pc
+lib/pkgconfig/icu-io.pc
+lib/pkgconfig/icu-le.pc
+lib/pkgconfig/icu-lx.pc
+lib/pkgconfig/icu-uc.pc
 man/man1/derb.1
 man/man1/genbrk.1
 man/man1/gencnval.1
@@ -207,12 +229,11 @@ man/man1/uconv.1
 man/man8/genccode.8
 man/man8/gencmn.8
 man/man8/gensprep.8
-man/man8/genuca.8
 man/man8/icupkg.8
 sbin/genccode
 sbin/gencmn
+sbin/gennorm2
 sbin/gensprep
-sbin/genuca
 sbin/icupkg
 share/icu/${PKGVERSION}/config/${MH_NAME}
 share/icu/${PKGVERSION}/install-sh
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 0f542fcfe78..76726d48b9d 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.17 2009/08/05 17:01:17 drochner Exp $
+$NetBSD: distinfo,v 1.18 2010/12/07 17:58:13 adam Exp $
 
-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
-SHA1 (patch-af) = df50984a17111a69c517b26f303866f2d384e857
+SHA1 (icu4c-4_6-src.tgz) = efc68a73a424d5822565feaf4468336f77294e8e
+RMD160 (icu4c-4_6-src.tgz) = 1cb84839384af5cba75bda6358c8bdaa82adaa9c
+Size (icu4c-4_6-src.tgz) = 15543712 bytes
+SHA1 (patch-aa) = 30999774a19659299b5eb31d0fd3c0945468e0ea
+SHA1 (patch-ab) = ca4ce0d1cb3d989044102d093863ae9dfb09ea43
+SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
+SHA1 (patch-ad) = e3b21cef4f5d26b448d13f5743036b241e1837eb
+SHA1 (patch-ae) = e89e71f79d32bc8471eb99a54c8c1350aa139552
+SHA1 (patch-af) = 0b085d7d72da4bc9d7ca382295ecad679b6c65ac
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 5253da82c4c..50997731451 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2007/03/23 12:51:13 recht Exp $
+$NetBSD: patch-aa,v 1.12 2010/12/07 17:58:13 adam Exp $
 
---- Makefile.in.orig	2006-03-30 02:33:20.000000000 +0200
+--- Makefile.in.orig	2010-10-07 00:23:38.000000000 +0000
 +++ Makefile.in
-@@ -174,7 +174,7 @@ $(top_builddir)/config/Makefile.inc: $(s
+@@ -280,7 +280,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) $@
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.11 2007/03/23 12:51:13 recht Exp $
 +	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 >> $@
+ 	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index 427e3aedc5e..66ce3bdefd2 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.9 2007/03/23 12:51:13 recht Exp $
+$NetBSD: patch-ab,v 1.10 2010/12/07 17:58:13 adam Exp $
 
---- config/mh-darwin.orig	2006-02-01 08:52:42.000000000 +0100
+--- config/mh-darwin.orig	2010-04-28 15:27:52.000000000 +0000
 +++ config/mh-darwin
 @@ -25,7 +25,7 @@ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CF
- SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
+ SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
  
  ## Compiler switches to embed a library name and version information
 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac
new file mode 100644
index 00000000000..fcd477f07ae
--- /dev/null
+++ b/textproc/icu/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.7 2010/12/07 17:58:13 adam Exp $
+
+--- config/Makefile.inc.in.orig	2010-12-07 11:22:10.000000000 +0000
++++ config/Makefile.inc.in
+@@ -44,7 +44,7 @@ PACKAGE = @PACKAGE@
+ LIBICU = lib$(ICUPREFIX)
+ 
+ # Static library prefix and file extension
+-STATIC_PREFIX = s
++STATIC_PREFIX =
+ LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ 
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
new file mode 100644
index 00000000000..bfa8cf2076a
--- /dev/null
+++ b/textproc/icu/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.9 2010/12/07 17:58:13 adam Exp $
+
+--- icudefs.mk.in.orig	2010-12-07 12:14:06.000000000 +0000
++++ icudefs.mk.in
+@@ -189,13 +189,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
+ 
+ ## If we can't use the shared libraries, use the static libraries
+ ifneq ($(ENABLE_SHARED),YES)
+-STATIC_PREFIX_WHEN_USED = s
++STATIC_PREFIX_WHEN_USED = 
+ else
+ STATIC_PREFIX_WHEN_USED = 
+ endif
+ 
+ # Static library prefix and file extension
+-STATIC_PREFIX = s
++STATIC_PREFIX =
+ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ SOBJ = $(SO)
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
index 976b46935ba..7fe25439115 100644
--- a/textproc/icu/patches/patch-ae
+++ b/textproc/icu/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.8 2007/03/23 12:51:13 recht Exp $
+$NetBSD: patch-ae,v 1.9 2010/12/07 17:58:13 adam Exp $
 
---- common/unicode/umachine.h.orig	2006-02-07 02:54:16.000000000 +0100
+--- common/unicode/umachine.h.orig	2010-06-03 15:51:19.000000000 +0000
 +++ common/unicode/umachine.h
 @@ -43,7 +43,7 @@
  
  #if defined(U_PALMOS)
  #   include "unicode/ppalmos.h"
--#elif defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-+#elif (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(__NetBSDPE__)
- #   include "unicode/pwin32.h"
- #else
+-#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
diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af
index 3da3017799e..2ce7647794a 100644
--- a/textproc/icu/patches/patch-af
+++ b/textproc/icu/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.8 2007/03/23 12:51:13 recht Exp $
+$NetBSD: patch-af,v 1.9 2010/12/07 17:58:13 adam Exp $
 
---- runConfigureICU.orig	2006-07-14 01:36:36.000000000 +0200
+--- runConfigureICU.orig	2010-08-30 19:24:42.000000000 +0000
 +++ runConfigureICU
-@@ -232,7 +232,7 @@ case $platform in
-         RELEASE_CFLAGS='-O2'
-         RELEASE_CXXFLAGS='-O2'
+@@ -276,7 +276,7 @@ case $platform in
+         DEBUG_CFLAGS='-g -O0'
+         DEBUG_CXXFLAGS='-g -O0'
          ;;
 -    *BSD)
 +    *BSD | DragonFly)