Hi ports@, below is the diff for the recently released icu4c-4.6. Builds and regresses fine on i386, no problem building and regressing databases/apache-couchdb with it.
Tests wanted on 64-bit platforms.
--
Vincent / dermiste
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/icu4c/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 20 Nov 2010 19:56:48 -0000 1.14
+++ Makefile 5 Dec 2010 11:10:25 -0000
@@ -2,11 +2,11 @@
COMMENT= International Components for Unicode
-VERSION= 4.4
+VERSION= 4.6
DISTNAME= icu4c-${VERSION:S/./_/g}-src
PKGNAME= icu4c-${VERSION}
REVISION = 0
-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
@@ -48,9 +48,6 @@
PKGDATA_INVOKE_OPTS="SO_TARGET_VERSION=${SO_VERSION}
SO_TARGET_VERSION_MAJOR=${SO_VERSION:R}"
post-install:
-# Bug #7506, #7567 and #7574, libicutest is not installed
- ${INSTALL_PROGRAM} ${WRKBUILD}/tools/ctestfw/libicutest.a ${PREFIX}/lib/
- ${INSTALL_PROGRAM} ${WRKBUILD}/tools/ctestfw/libicutest.so.3.0
${PREFIX}/lib/
# who needs those annoying symlinks ?
find ${PREFIX}/lib -type l -name 'libicu*.so*' -exec rm '{}' \;
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 5 Dec 2010 11:10:25 -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_6-src.tgz) = Q+VrccQHvlFU3mgeqmRqSg==
+RMD160 (icu4c-4_6-src.tgz) = HLhIOThK9cunW9pjWMi9qoKtqpw=
+SHA1 (icu4c-4_6-src.tgz) = 78aKc6Qk1YIlZf6vRGgzb3cpTo4=
+SHA256 (icu4c-4_6-src.tgz) = taGtqBJ9i3kYf4h5A+NKh9vs6iZZoTmZO/ga1zCd3/w=
+SIZE (icu4c-4_6-src.tgz) = 15543712
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 5 Dec 2010 11:10:25 -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 Aug 30 20:59:02 2010
++++ source/Makefile.in Mon Oct 25 22:31:16 2010
+@@ -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_config_icu-config-bottom
===================================================================
RCS file:
/cvs/ports/textproc/icu4c/patches/patch-source_config_icu-config-bottom,v
retrieving revision 1.5
diff -u -r1.5 patch-source_config_icu-config-bottom
--- patches/patch-source_config_icu-config-bottom 5 Apr 2010 21:40:24
-0000 1.5
+++ patches/patch-source_config_icu-config-bottom 5 Dec 2010 11:10:25
-0000
@@ -21,13 +21,3 @@
echo " --ldflags-icuio Print ICU icuio link directive. Use in
addition to --ldflags "
echo " --ldflags-obsolete Print ICU obsolete link directive. Use in
addition to --ldflags. (requires icuapps/obsolete to be built and installed.) "
echo " --mandir Print manpage (man) path"
-@@ -94,7 +94,8 @@ usage()
- ## Check the sanity of current variables
- sanity()
- {
-- if [ ! -f "${ICUUC_FILE}" -a ! -f "${ICUUC_FILE_A}" ] && [
${IGNORE_ICUUC_FILE_CHECK} = "no" ] && [ ${SANITY} = "sane" ];
-+ libcnt=`find ${libdir} -name ${ICUUC_FILE} -o -name ${ICUUC_FILE_A} |
wc -l`
-+ if [ ${libcnt} -lt 1 ] && [ ${IGNORE_ICUUC_FILE_CHECK} = "no" ] && [
${SANITY} = "sane" ];
- then
- echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2
- echo "### Try the --prefix= option " 1>&2
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 5 Dec 2010 11:10:25 -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
+$OpenBSD$
+--- source/configure.orig Sun Nov 21 19:42:51 2010
++++ source/configure Sun Nov 21 19:43:06 2010
+@@ -5931,13 +5931,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. */
+
+@@ -5972,7 +5972,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
+@@ -6060,13 +6060,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. */
+
+@@ -6101,7 +6101,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 5 Dec 2010 11:10:25 -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 Aug 30 20:59:02 2010
++++ source/icudefs.mk.in Mon Oct 25 22:31:16 2010
+@@ -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 5 Dec 2010 11:10:25 -0000
@@ -1,18 +1,18 @@
-$OpenBSD: patch-source_layout_LESwaps_h,v 1.1 2009/01/27 22:11:15 landry Exp $
+$OpenBSD$
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 Oct 25 22:32:37 2010
++++ source/layout/LESwaps.h Mon Oct 25 22:35:48 2010
+@@ -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,25 @@ 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
+
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 5 Dec 2010 11:10:25 -0000
@@ -59,6 +59,7 @@
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
@@ -190,6 +191,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 +208,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 +220,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
pgpE9VqxsU3sO.pgp
Description: PGP signature
