Changes 4.8.1:

This is a maintenance release of ICU 4.8. No new APIs were added.

8 files changed, 38 insertions, 51 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index e5926cb1b50..ea9e12b52b5 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2011/06/02 07:06:10 adam Exp $
+# $NetBSD: Makefile,v 1.65 2011/07/25 10:16:54 adam Exp $
 
-DISTNAME=	icu4c-4_8-src
-PKGNAME=	icu-4.8
+DISTNAME=	icu4c-4_8_1-src
+PKGNAME=	icu-4.8.1
 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 a5d3825e0e5..d0dfba246cb 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2011/06/02 07:06:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/07/25 10:16:54 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -194,35 +194,35 @@ lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
 lib/libicudata.so.48
-lib/libicudata.so.48.0
+lib/libicudata.so.48.1
 lib/libicui18n.a
 lib/libicui18n.so
 lib/libicui18n.so.48
-lib/libicui18n.so.48.0
+lib/libicui18n.so.48.1
 lib/libicuio.a
 lib/libicuio.so
 lib/libicuio.so.48
-lib/libicuio.so.48.0
+lib/libicuio.so.48.1
 lib/libicule.a
 lib/libicule.so
 lib/libicule.so.48
-lib/libicule.so.48.0
+lib/libicule.so.48.1
 lib/libiculx.a
 lib/libiculx.so
 lib/libiculx.so.48
-lib/libiculx.so.48.0
+lib/libiculx.so.48.1
 lib/libicutest.a
 lib/libicutest.so
 lib/libicutest.so.48
-lib/libicutest.so.48.0
+lib/libicutest.so.48.1
 lib/libicutu.a
 lib/libicutu.so
 lib/libicutu.so.48
-lib/libicutu.so.48.0
+lib/libicutu.so.48.1
 lib/libicuuc.a
 lib/libicuuc.so
 lib/libicuuc.so.48
-lib/libicuuc.so.48.0
+lib/libicuuc.so.48.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 dd549b677aa..75c58b876c9 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.20 2011/06/02 07:06:10 adam Exp $
+$NetBSD: distinfo,v 1.21 2011/07/25 10:16:54 adam Exp $
 
-SHA1 (icu4c-4_8-src.tgz) = f458b41800cc21bbb92ceb119380ad3249252fd6
-RMD160 (icu4c-4_8-src.tgz) = 77674ce09823f80810b7f5a0898881b5a62d938c
-Size (icu4c-4_8-src.tgz) = 18620856 bytes
+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) = 30999774a19659299b5eb31d0fd3c0945468e0ea
-SHA1 (patch-ab) = ca4ce0d1cb3d989044102d093863ae9dfb09ea43
+SHA1 (patch-ab) = e6f4a08d0efabd8e6ae763289d975c1bc70e89c4
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
-SHA1 (patch-ad) = e3b21cef4f5d26b448d13f5743036b241e1837eb
-SHA1 (patch-ae) = a4f5c7c4d3e147646e4c09c766fa07506bda273a
-SHA1 (patch-af) = 0b085d7d72da4bc9d7ca382295ecad679b6c65ac
-SHA1 (patch-tools_toolutil_pkg_gencmn.c) = 30ff5589f2c9343db5631de6c986373903c58213
+SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb
+SHA1 (patch-ae) = c9c62d0bf698ab599351c5c2fc3c2ef4e40aff8e
+SHA1 (patch-af) = 924dab672eea2ec80f75f9e095906006e489d900
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index 66ce3bdefd2..ee80e918978 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.10 2010/12/07 17:58:13 adam Exp $
+$NetBSD: patch-ab,v 1.11 2011/07/25 10:16:54 adam Exp $
 
---- config/mh-darwin.orig	2010-04-28 15:27:52.000000000 +0000
+--- config/mh-darwin.orig	2011-07-19 21:16:46.000000000 +0000
 +++ config/mh-darwin
-@@ -25,7 +25,7 @@ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CF
+@@ -25,11 +25,7 @@ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CF
  SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
  
  ## Compiler switches to embed a library name and version information
+-ifeq ($(ENABLE_RPATH),YES)
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+-else
 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
-+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name ${prefix}/lib/$(notdir $(MIDDLE_SO_TARGET))
+-endif
  
  ## Compiler switch to embed a runtime search path
  LD_RPATH=
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
index bfa8cf2076a..656441e633a 100644
--- a/textproc/icu/patches/patch-ad
+++ b/textproc/icu/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2010/12/07 17:58:13 adam Exp $
+$NetBSD: patch-ad,v 1.10 2011/07/25 10:16:54 adam Exp $
 
 --- icudefs.mk.in.orig	2010-12-07 12:14:06.000000000 +0000
 +++ icudefs.mk.in
-@@ -189,13 +189,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
+@@ -190,13 +190,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
  
  ## If we can't use the shared libraries, use the static libraries
  ifneq ($(ENABLE_SHARED),YES)
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
index 0a9c6370b2f..7784a97e57b 100644
--- a/textproc/icu/patches/patch-ae
+++ b/textproc/icu/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.10 2011/06/02 07:06:11 adam Exp $
+$NetBSD: patch-ae,v 1.11 2011/07/25 10:16:54 adam Exp $
 
---- common/unicode/umachine.h.orig	2011-05-23 21:56:00.000000000 +0000
+--- 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))
+-#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 2ce7647794a..4b305b6f973 100644
--- a/textproc/icu/patches/patch-af
+++ b/textproc/icu/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.9 2010/12/07 17:58:13 adam Exp $
+$NetBSD: patch-af,v 1.10 2011/07/25 10:16:54 adam Exp $
 
---- runConfigureICU.orig	2010-08-30 19:24:42.000000000 +0000
+--- runConfigureICU.orig	2011-07-19 21:19:38.000000000 +0000
 +++ runConfigureICU
-@@ -276,7 +276,7 @@ case $platform in
-         DEBUG_CFLAGS='-g -O0'
-         DEBUG_CXXFLAGS='-g -O0'
+@@ -283,7 +283,7 @@ case $platform in
+         RELEASE_CFLAGS='-O3'
+         RELEASE_CXXFLAGS='-O3'
          ;;
 -    *BSD)
 +    *BSD | DragonFly)
diff --git a/textproc/icu/patches/patch-tools_toolutil_pkg_gencmn.c b/textproc/icu/patches/patch-tools_toolutil_pkg_gencmn.c
deleted file mode 100644
index 0721bc6cb5c..00000000000
--- a/textproc/icu/patches/patch-tools_toolutil_pkg_gencmn.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-tools_toolutil_pkg_gencmn.c,v 1.1 2011/06/02 07:06:11 adam Exp $
-
-Avoid out of memory.
-
---- tools/toolutil/pkg_gencmn.c.orig	2011-06-02 06:18:25.000000000 +0000
-+++ tools/toolutil/pkg_gencmn.c
-@@ -18,7 +18,7 @@
- #include "putilimp.h"
- #include "pkg_gencmn.h"
- 
--#define STRING_STORE_SIZE 100000
-+#define STRING_STORE_SIZE 131072
- 
- #define COMMON_DATA_NAME U_ICUDATA_NAME
- #define DATA_TYPE "dat"