On Tue, 7 Jun 2011, Antoine Jacoutot wrote:
> Hi.
>
> This diff updates icu4c to the latest release.
> I only slightly tested it, so I'd appreciate tests with your favorite
> application on as many arches as possible.
>
> Note that this will go in a bulk.
New diff, fixes build on 64bits.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/icu4c/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 14 Mar 2011 09:15:34 -0000 1.15
+++ Makefile 10 Jun 2011 06:54:32 -0000
@@ -2,11 +2,10 @@
COMMENT= International Components for Unicode
-VERSION= 4.4
+VERSION= 4.8
DISTNAME= icu4c-${VERSION:S/./_/g}-src
PKGNAME= icu4c-${VERSION}
-REVISION = 1
-SO_VERSION= 3.0
+SO_VERSION= 4.0
.for _lib in icudata icui18n icuio icule iculx icutest icutu icuuc
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
@@ -23,6 +22,7 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+
WANTLIB= c m pthread stdc++
MASTER_SITES= http://download.icu-project.org/files/icu4c/${VERSION}/
\
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/icu4c/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 5 Apr 2010 21:40:24 -0000 1.6
+++ distinfo 10 Jun 2011 06:54:32 -0000
@@ -1,5 +1,5 @@
-MD5 (icu4c-4_4-src.tgz) = Nrd+aOc/Dun3u4YmKeMzQg==
-RMD160 (icu4c-4_4-src.tgz) = 73d7oTJMztK029FDjtdUPq8RXWM=
-SHA1 (icu4c-4_4-src.tgz) = bwH+cA5LoDWIjBDsfpZOF3LH9iY=
-SHA256 (icu4c-4_4-src.tgz) = lsqrAR54SwBM5YZ2Zf5xFAKlPrbRmogX9YLIGXEfk/M=
-SIZE (icu4c-4_4-src.tgz) = 16428350
+MD5 (icu4c-4_8-src.tgz) = 54GUxJ1/2BMTU6oYDRG3iQ==
+RMD160 (icu4c-4_8-src.tgz) = d2dM4Jgj+AgQt/WgiYiBtaYtk4w=
+SHA1 (icu4c-4_8-src.tgz) = 9Fi0GADMIbu5LOsRk4CtMkklL9Y=
+SHA256 (icu4c-4_8-src.tgz) = ReF2Z7XGiGtJtD6YuKP2aE535dztqOk5r29ci+vXqTk=
+SIZE (icu4c-4_8-src.tgz) = 18620856
Index: patches/patch-source_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-source_Makefile_in
--- patches/patch-source_Makefile_in 5 Apr 2010 21:40:24 -0000 1.4
+++ patches/patch-source_Makefile_in 10 Jun 2011 06:54:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-source_Makefile_in,v 1.4 2010/04/05 21:40:24 landry Exp $
---- source/Makefile.in.orig Tue Mar 16 06:15:14 2010
-+++ source/Makefile.in Sat Apr 3 14:53:41 2010
-@@ -216,8 +216,8 @@ $(top_builddir)/config/pkgdataMakefile:
+--- source/Makefile.in.orig Mon May 23 23:59:04 2011
++++ source/Makefile.in Tue Jun 7 14:42:15 2011
+@@ -280,8 +280,8 @@ $(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,5 +10,5 @@
+ cp $(top_srcdir)/config/icu-config-top $@
+ chmod 755 $@
@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 >> $@
+ LC_ALL=C 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 <
@platform_make_fragment@ | grep -v '#M#' | uniq >> $@
Index: patches/patch-source_common_unicode_rbbi_h
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_common_unicode_rbbi_h,v
retrieving revision 1.2
diff -u -r1.2 patch-source_common_unicode_rbbi_h
--- patches/patch-source_common_unicode_rbbi_h 7 Jun 2009 00:54:43 -0000
1.2
+++ patches/patch-source_common_unicode_rbbi_h 10 Jun 2011 06:54:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-source_common_unicode_rbbi_h,v 1.2 2009/06/07 00:54:43 landry
Exp $
---- source/common/unicode/rbbi.h.orig Fri May 8 18:12:14 2009
-+++ source/common/unicode/rbbi.h Sat May 9 20:17:36 2009
-@@ -633,12 +633,14 @@ class U_COMMON_API RuleBasedBreakIterator : public Bre
+--- source/common/unicode/rbbi.h.orig Mon May 23 23:56:00 2011
++++ source/common/unicode/rbbi.h Tue Jun 7 14:42:15 2011
+@@ -663,12 +663,14 @@ class U_COMMON_API RuleBasedBreakIterator : public Bre
virtual int32_t getBreakType() const;
#endif
Index: patches/patch-source_configure
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_configure,v
retrieving revision 1.7
diff -u -r1.7 patch-source_configure
--- patches/patch-source_configure 5 Apr 2010 21:40:24 -0000 1.7
+++ patches/patch-source_configure 10 Jun 2011 06:54:32 -0000
@@ -1,24 +1,24 @@
$OpenBSD: patch-source_configure,v 1.7 2010/04/05 21:40:24 landry Exp $
---- source/configure.orig Tue Mar 16 06:15:14 2010
-+++ source/configure Sat Mar 20 11:16:31 2010
-@@ -6915,13 +6915,13 @@ if test $threads = true; then
+--- source/configure.orig Mon May 23 23:59:04 2011
++++ source/configure Tue Jun 7 14:44:28 2011
+@@ -5958,13 +5958,13 @@ if test $threads = true; then
+ # If this fails, then we must test for HPUX specials, before
# moving on to a more generic test
-
--{ $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in
-lpthread" >&5
-$as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -pthread" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in
-pthread" >&5
+$as_echo_n "checking for pthread_attr_init in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
+ if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6985,7 +6985,7 @@ if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""y
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -5999,7 +5999,7 @@ if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""y
#define HAVE_LIBPTHREAD 1
_ACEOF
@@ -27,24 +27,24 @@
fi
-@@ -7136,13 +7136,13 @@ fi
+@@ -6087,13 +6087,13 @@ fi
+ ICU_USE_THREADS=1
else
# For HP 11
-
--{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
pthread_mutex_init in -lpthread" >&5
-$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
pthread_mutex_init in -pthread" >&5
+$as_echo_n "checking for pthread_mutex_init in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
+ if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -7206,7 +7206,7 @@ if test "x$ac_cv_lib_pthread_pthread_mutex_init" = x""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -6128,7 +6128,7 @@ if test "x$ac_cv_lib_pthread_pthread_mutex_init" = x""
#define HAVE_LIBPTHREAD 1
_ACEOF
Index: patches/patch-source_icudefs_mk_in
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_icudefs_mk_in,v
retrieving revision 1.5
diff -u -r1.5 patch-source_icudefs_mk_in
--- patches/patch-source_icudefs_mk_in 5 Apr 2010 21:40:24 -0000 1.5
+++ patches/patch-source_icudefs_mk_in 10 Jun 2011 06:54:32 -0000
@@ -2,9 +2,9 @@
libraries
$OpenBSD: patch-source_icudefs_mk_in,v 1.5 2010/04/05 21:40:24 landry Exp $
---- source/icudefs.mk.in.orig Fri Apr 2 18:09:15 2010
-+++ source/icudefs.mk.in Fri Apr 2 18:10:15 2010
-@@ -193,7 +193,7 @@ STATIC_PREFIX_WHEN_USED =
+--- source/icudefs.mk.in.orig Mon May 23 23:59:04 2011
++++ source/icudefs.mk.in Tue Jun 7 14:42:16 2011
+@@ -195,7 +195,7 @@ STATIC_PREFIX_WHEN_USED =
endif
# Static library prefix and file extension
Index: patches/patch-source_layout_LESwaps_h
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_layout_LESwaps_h,v
retrieving revision 1.1
diff -u -r1.1 patch-source_layout_LESwaps_h
--- patches/patch-source_layout_LESwaps_h 27 Jan 2009 22:11:15 -0000
1.1
+++ patches/patch-source_layout_LESwaps_h 10 Jun 2011 06:54:32 -0000
@@ -2,17 +2,17 @@
Suggested by jasper. workaround for broken font tables.
---- source/layout/LESwaps.h.orig Mon Sep 22 21:04:12 2008
-+++ source/layout/LESwaps.h Sun Nov 16 15:12:06 2008
-@@ -2,6 +2,7 @@
+--- source/layout/LESwaps.h.orig Mon May 23 23:59:02 2011
++++ source/layout/LESwaps.h Tue Jun 7 14:44:02 2011
+@@ -1,6 +1,7 @@
/*
*
- * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2010 - All Rights Reserved
+ * with additions by Sun Microsystems 2002-2006
*
*/
-@@ -17,12 +18,21 @@
+@@ -16,12 +17,21 @@
U_NAMESPACE_BEGIN
@@ -31,13 +31,13 @@
* @stable ICU 2.8
*/
+#ifndef ALLOW_UNALIGNED_HACK
- #define SWAPW(value) LESwaps::swapWord((const le_uint16 &) (value))
+ #define SWAPW(value) LESwaps::swapWord((le_uint16)(value))
/**
-@@ -32,6 +42,25 @@ U_NAMESPACE_BEGIN
+@@ -31,6 +41,26 @@ U_NAMESPACE_BEGIN
* @stable ICU 2.8
*/
- #define SWAPL(value) LESwaps::swapLong((const le_uint32 &) (value))
+ #define SWAPL(value) LESwaps::swapLong((le_uint32)(value))
+
+#else // ALLOW_UNALIGNED_HACK
+
@@ -57,6 +57,7 @@
+}
+
+#endif // ALLOW_UNALIGNED_HACK
++
/**
* This class is used to access data which stored in big endian order
Index: patches/patch-source_tools_toolutil_pkg_gencmn_c
===================================================================
RCS file: patches/patch-source_tools_toolutil_pkg_gencmn_c
diff -N patches/patch-source_tools_toolutil_pkg_gencmn_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_tools_toolutil_pkg_gencmn_c 10 Jun 2011 06:54:32
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+gencmn: out of memory
+
+--- source/tools/toolutil/pkg_gencmn.c.orig Fri Jun 10 08:37:20 2011
++++ source/tools/toolutil/pkg_gencmn.c Fri Jun 10 08:37:31 2011
+@@ -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"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/icu4c/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 5 Apr 2010 21:40:24 -0000 1.6
+++ pkg/PLIST 10 Jun 2011 06:54:32 -0000
@@ -25,11 +25,15 @@
include/layout/playout.h
include/layout/plruns.h
include/unicode/
+include/unicode/alphaindex.h
+include/unicode/appendable.h
include/unicode/basictz.h
include/unicode/bms.h
include/unicode/bmsearch.h
include/unicode/brkiter.h
include/unicode/bytestream.h
+include/unicode/bytestrie.h
+include/unicode/bytestriebuilder.h
include/unicode/calendar.h
include/unicode/caniter.h
include/unicode/chariter.h
@@ -59,12 +63,14 @@
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/messagepattern.h
include/unicode/msgfmt.h
include/unicode/normalizer2.h
include/unicode/normlzr.h
@@ -94,6 +100,7 @@
include/unicode/std_string.h
include/unicode/strenum.h
include/unicode/stringpiece.h
+include/unicode/stringtriebuilder.h
include/unicode/stsearch.h
include/unicode/symtable.h
include/unicode/tblcoll.h
@@ -110,6 +117,8 @@
include/unicode/ucasemap.h
include/unicode/ucat.h
include/unicode/uchar.h
+include/unicode/ucharstrie.h
+include/unicode/ucharstriebuilder.h
include/unicode/uchriter.h
include/unicode/uclean.h
include/unicode/ucnv.h
@@ -123,6 +132,7 @@
include/unicode/ucurr.h
include/unicode/udat.h
include/unicode/udata.h
+include/unicode/udateintervalformat.h
include/unicode/udatpg.h
include/unicode/udeprctd.h
include/unicode/udraft.h
@@ -147,6 +157,7 @@
include/unicode/unum.h
include/unicode/uobject.h
include/unicode/uobslete.h
+include/unicode/upluralrules.h
include/unicode/uregex.h
include/unicode/urename.h
include/unicode/urep.h
@@ -161,6 +172,7 @@
include/unicode/ustdio.h
include/unicode/ustream.h
include/unicode/ustring.h
+include/unicode/ustringtrie.h
include/unicode/usystem.h
include/unicode/utext.h
include/unicode/utf.h
@@ -190,6 +202,12 @@
lib/libicutest.a
lib/libicutu.a
lib/libicuuc.a
+lib/pkgconfig/
+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 man/man1/derb.1
@man man/man1/genbrk.1
@man man/man1/gencnval.1
@@ -201,13 +219,11 @@
@man man/man8/genccode.8
@man man/man8/gencmn.8
@man man/man8/gensprep.8
-@man man/man8/genuca.8
@man man/man8/icupkg.8
@bin sbin/genccode
@bin sbin/gencmn
@bin sbin/gennorm2
@bin sbin/gensprep
-@bin sbin/genuca
@bin sbin/icupkg
share/icu/
share/icu/${VERSION}/
@@ -215,5 +231,5 @@
share/icu/${VERSION}/config/mh-bsd-gcc
@comment share/icu/${VERSION}/install-sh
share/icu/${VERSION}/license.html
-@comment share/icu/${VERSION}/mkinstalldirs
%%SHARED%%
+@comment share/icu/${VERSION}/mkinstalldirs
--
Antoine
