Changes 4.6:

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

6 files changed, 51 insertions, 18 deletions

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)