ICU 54 is a major release of ICU, with new features, new APIs and many bug fixes in data and code. It supports the latest versions of the Unicode locale data (CLDR 26, September 2014) and Unicode Standard (Unicode 7.0, June 2014). The improvements include 72 new measurement units, Unihan radical-stroke collation moved into root, new RBNF PluralFormat syntax, dictionary-based word and line break for Burmese, support for short locale display names, compatibility support for IANA time zone data abbreviations, a tech preview of FilteredBreakIterator using ULI break data, ICU4C thread safety fixes, and the ability to build ICU4C Paragraph Layout with HarfBuzz.

8 files changed, 46 insertions, 104 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 8153023f963..351ad41eb63 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2014/07/18 10:28:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2014/10/07 16:09:53 adam Exp $
 
-DISTNAME=	icu4c-53_1-src
+DISTNAME=	icu4c-54_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index c098fd01212..0189206ff62 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2014/04/07 11:49:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2014/10/07 16:09:53 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -94,6 +94,7 @@ include/unicode/reldatefmt.h
 include/unicode/rep.h
 include/unicode/resbund.h
 include/unicode/schriter.h
+include/unicode/scientificformathelper.h
 include/unicode/search.h
 include/unicode/selfmt.h
 include/unicode/simpletz.h
@@ -198,35 +199,35 @@ lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.53
+lib/libicudata.so.54
 lib/libicudata.so.${PKGVERSION}
 lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.53
+lib/libicui18n.so.54
 lib/libicui18n.so.${PKGVERSION}
 lib/libicuio.a
 lib/libicuio.so
-lib/libicuio.so.53
+lib/libicuio.so.54
 lib/libicuio.so.${PKGVERSION}
 lib/libicule.a
 lib/libicule.so
-lib/libicule.so.53
+lib/libicule.so.54
 lib/libicule.so.${PKGVERSION}
 lib/libiculx.a
 lib/libiculx.so
-lib/libiculx.so.53
+lib/libiculx.so.54
 lib/libiculx.so.${PKGVERSION}
 lib/libicutest.a
 lib/libicutest.so
-lib/libicutest.so.53
+lib/libicutest.so.54
 lib/libicutest.so.${PKGVERSION}
 lib/libicutu.a
 lib/libicutu.so
-lib/libicutu.so.53
+lib/libicutu.so.54
 lib/libicutu.so.${PKGVERSION}
 lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.53
+lib/libicuuc.so.54
 lib/libicuuc.so.${PKGVERSION}
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index fea82039060..52a76d6421e 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.49 2014/07/18 10:28:11 ryoon Exp $
+$NetBSD: distinfo,v 1.50 2014/10/07 16:09:53 adam Exp $
 
-SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f
-RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9
-Size (icu4c-53_1-src.tgz) = 23218952 bytes
-SHA1 (patch-aa) = dc4adcbd6e3115b0f58c7452f408fcab2dd77f45
+SHA1 (icu4c-54_1-src.tgz) = 8c752490bbf31cea26e20246430cee67d48abe34
+RMD160 (icu4c-54_1-src.tgz) = b1440e1a3330b12336742c881863a8de6a6d2235
+Size (icu4c-54_1-src.tgz) = 25485678 bytes
+SHA1 (patch-aa) = fd5c513e75ca17a46be4ed010455bda63731afff
 SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
-SHA1 (patch-acinclude.m4) = a6993fefca751d7e63e60130cdcd69f3adbc0589
+SHA1 (patch-acinclude.m4) = ab757e9bf7351e44edd92b96edbffc40acb44dae
 SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
-SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067
+SHA1 (patch-af) = 6f41d58f258361e28ce3283e1b46f8a762b7c5dd
 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
 SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c
 SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33
 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
-SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025
-SHA1 (patch-configure) = aae0978c1eb1b2bafa229ba0f2e9d581554f80b2
+SHA1 (patch-configure) = 2d17823ee06693ce382745ce345eca37001a0a7c
 SHA1 (patch-configure.ac) = ea7586eb8131ff53a483b5bd7ca162886e9045f1
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 153a3a794d6..c3c6688c6a6 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.16 2014/06/08 09:08:20 obache Exp $
+$NetBSD: patch-aa,v 1.17 2014/10/07 16:09:53 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	2012-11-05 17:18:12.000000000 +0000
+--- Makefile.in.orig	2014-10-03 16:18:36.000000000 +0000
 +++ Makefile.in
-@@ -256,7 +256,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
+@@ -272,7 +272,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
  	@echo "Name: $(PACKAGE)-i18n" >> $@
  	@echo "Requires: icu-uc" >> $@
@@ -14,7 +14,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo $@ updated.
  
  config/icu-io.pc: config/icu.pc Makefile icudefs.mk
-@@ -264,7 +264,7 @@ config/icu-io.pc: config/icu.pc Makefile
+@@ -280,7 +280,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" >> $@
@@ -23,7 +23,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo $@ updated.
  
  config/icu-le.pc: config/icu.pc Makefile icudefs.mk
-@@ -272,7 +272,7 @@ config/icu-le.pc: config/icu.pc Makefile
+@@ -288,7 +288,7 @@ config/icu-le.pc: config/icu.pc Makefile
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Layout library" >> $@
  	@echo "Name: $(PACKAGE)-le" >> $@
  	@echo "Requires: icu-uc" >> $@
@@ -31,17 +31,17 @@ Avoid using programs which need elevated privileges during the build.
 +	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LE}" >> $@
  	@echo $@ updated.
  
- config/icu-lx.pc: config/icu.pc Makefile icudefs.mk
-@@ -280,7 +280,7 @@ config/icu-lx.pc: config/icu.pc Makefile
- 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library" >> $@
- 	@echo "Name: $(PACKAGE)-lx" >> $@
+ ICULEHB_LIBS=@ICULEHB_LIBS@
+@@ -307,7 +307,7 @@ ifneq ($(ICULEHB_LIBS),)
+ else
  	@echo "Requires: icu-le" >> $@
+ endif
 -	@echo "Libs:" "${ICULIBS_LX}" >> $@
 +	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LX}" >> $@
  	@echo $@ updated.
  
  
-@@ -302,7 +302,7 @@ $(top_builddir)/config/pkgdataMakefile:
+@@ -329,7 +329,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-acinclude.m4 b/textproc/icu/patches/patch-acinclude.m4
index d5f7fc15377..69e45bbcefb 100644
--- a/textproc/icu/patches/patch-acinclude.m4
+++ b/textproc/icu/patches/patch-acinclude.m4
@@ -1,11 +1,10 @@
-$NetBSD: patch-acinclude.m4,v 1.2 2014/07/18 10:28:11 ryoon Exp $
+$NetBSD: patch-acinclude.m4,v 1.3 2014/10/07 16:09:53 adam Exp $
 
-Solaris seems to need -std=c99 with recent pkgsrc so keep it
-and at the same time fix a typo involving CXXFLAGS.
+Solaris seems to need -std=c99 with recent pkgsrc so keep it.
 
---- acinclude.m4.orig	2013-09-13 21:36:38.000000000 +0000
+--- acinclude.m4.orig	2014-10-03 16:18:36.000000000 +0000
 +++ acinclude.m4
-@@ -69,6 +69,7 @@ powerpc*-*-linux*)
+@@ -82,6 +82,7 @@ x86_64-*-cygwin) 
  *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
  *-*-nto*)	icu_cv_host_frag=mh-qnx ;;
  *-ncr-*)	icu_cv_host_frag=mh-mpras ;;
@@ -13,22 +12,3 @@ and at the same time fix a typo involving CXXFLAGS.
  *) 		icu_cv_host_frag=mh-unknown ;;
  esac
  		]
-@@ -262,7 +263,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
-                     if test "$CAN_BUILD_64" != yes; then
-                         # Nope. back out changes.
-                         CFLAGS="${CFLAGS_OLD}"
--                        CXXFLAGS="${CFLAGS_OLD}"
-+                        CXXFLAGS="${CXXFLAGS_OLD}"
-                         # 2. try xarch=v9 [deprecated]
-                         ## TODO: cross compile: the following won't work.
-                         SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
-@@ -457,9 +458,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
-         if test "$GCC" = yes
-         then
-             case "${host}" in
--            *-*-solaris*)
--                # Don't use -std=c99 option on Solaris/GCC
--                ;;
-             *)
-                 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
-                 # We use -std=c99 to disable the gnu99 defaults and its associated warnings
diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af
index 10f95868ba6..bede49377f5 100644
--- a/textproc/icu/patches/patch-af
+++ b/textproc/icu/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.13 2013/10/19 08:47:36 adam Exp $
+$NetBSD: patch-af,v 1.14 2014/10/07 16:09:53 adam Exp $
 
---- runConfigureICU.orig	2013-10-04 20:54:58.000000000 +0000
+--- runConfigureICU.orig	2014-10-03 16:18:36.000000000 +0000
 +++ runConfigureICU
-@@ -315,7 +315,7 @@ case $platform in
-         CXXFLAGS="--std=c++03"
-         export CXXFLAGS
+@@ -327,7 +327,7 @@ case $platform in
+         DEBUG_CXXFLAGS='-Zi -MDd'
+         DEBUG_LDFLAGS='-DEBUG'
          ;;
 -    *BSD)
 +    *BSD | DragonFly)
          THE_OS="BSD"
          THE_COMP="the GNU C++"
-         CC=gcc; export CC
+         DEBUG_CFLAGS='-g -O0'
diff --git a/textproc/icu/patches/patch-config_mh-solaris-gcc b/textproc/icu/patches/patch-config_mh-solaris-gcc
deleted file mode 100644
index 4bfe1dee710..00000000000
--- a/textproc/icu/patches/patch-config_mh-solaris-gcc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-config_mh-solaris-gcc,v 1.1 2013/12/04 21:02:23 richard Exp $
-
-sys/feature_tests.h needs hints found in CFLAGS/CXXFLAGS while
-generating depency files.
-
---- config/mh-solaris-gcc.orig	2013-10-04 20:50:00.000000000 +0000
-+++ config/mh-solaris-gcc
-@@ -9,8 +9,8 @@ SHAREDLIBCXXFLAGS = -fPIC
- SHAREDLIBCPPFLAGS = -DPIC
- 
- ## Commands to generate dependency files
--GEN_DEPS.c= 	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
--GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.c= 	$(CC) -E -MM $(DEFS) $(CPPFLAGS) $(CFLAGS)
-+GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
- 
- ## These are the library specific LDFLAGS
- LDFLAGSICUDT=-nodefaultlibs -nostdlib
diff --git a/textproc/icu/patches/patch-configure b/textproc/icu/patches/patch-configure
index 3bcf9034f25..d0122d6af0a 100644
--- a/textproc/icu/patches/patch-configure
+++ b/textproc/icu/patches/patch-configure
@@ -1,31 +1,11 @@
-$NetBSD: patch-configure,v 1.5 2014/07/18 10:28:11 ryoon Exp $
+$NetBSD: patch-configure,v 1.6 2014/10/07 16:09:53 adam Exp $
 
 Portability fix.
-Solaris seems to need -std=c99 with recent pkgsrc so keep it
-and at the same time fix a typo involving CXXFLAGS.
+Solaris seems to need -std=c99 with recent pkgsrc so keep it.
 
---- configure.orig	2013-12-09 17:32:25.000000000 +0000
+--- configure.orig	2014-10-03 16:18:36.000000000 +0000
 +++ configure
-@@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; }
-         if test "$GCC" = yes
-         then
-             case "${host}" in
--            *-*-solaris*)
--                # Don't use -std=c99 option on Solaris/GCC
--                ;;
-             *)
-                 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
-                 # We use -std=c99 to disable the gnu99 defaults and its associated warnings
-@@ -4578,7 +4575,7 @@ fi
-                     if test "$CAN_BUILD_64" != yes; then
-                         # Nope. back out changes.
-                         CFLAGS="${CFLAGS_OLD}"
--                        CXXFLAGS="${CFLAGS_OLD}"
-+                        CXXFLAGS="${CXXFLAGS_OLD}"
-                         # 2. try xarch=v9 [deprecated]
-                         ## TODO: cross compile: the following won't work.
-                         SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
-@@ -4942,6 +4939,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -5172,6 +5172,7 @@ rm -f core conftest.err conftest.$ac_obj
  *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
  *-*-nto*)	icu_cv_host_frag=mh-qnx ;;
  *-ncr-*)	icu_cv_host_frag=mh-mpras ;;
@@ -33,7 +13,7 @@ and at the same time fix a typo involving CXXFLAGS.
  *) 		icu_cv_host_frag=mh-unknown ;;
  esac
  
-@@ -5452,6 +5450,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
+@@ -5682,6 +5683,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
      CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
  fi
  
@@ -63,7 +43,7 @@ and at the same time fix a typo involving CXXFLAGS.
  U_ENABLE_DYLOAD=1
  enable=yes
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5
-@@ -7442,13 +7463,13 @@ fi
+@@ -7691,13 +7715,13 @@ fi
  # Now that we're done using CPPFLAGS etc. for tests, we can change it
  # for build.