Hi folks,
summary of this diff:
- corrects a timezone bug
- fixes a potential problem with some fonts (thanks to jasper)
- changes -lpthread to -pthread in ./configure (thanks to jasper)
- tweaks some configure options
- fixes a testcase compilation error
- remove the patches that prevented unwanted symlinks and comments
out the relevant lines in PLIST
as usual, please test and report.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/icu4c/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 31 Oct 2008 09:56:15 -0000 1.6
+++ Makefile 16 Nov 2008 16:35:05 -0000
@@ -5,7 +5,7 @@
COMMENT= International Components for Unicode
DISTNAME= icu4c-4_0-src
-PKGNAME= icu4c-4.0
+PKGNAME= icu4c-4.0p0
SO_VERSION= 1.0
.for _lib in icudata icui18n icuio icule iculx icutu icuuc
SHARED_LIBS+= ${_lib} ${SO_VERSION}
@@ -31,7 +31,11 @@
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --disable-renaming
+ --disable-renaming \
+ --disable-extras \
+ --disable-samples
+
+SEPARATE_BUILD= concurrent
WRKDIST= ${WRKDIR}/icu
WRKSRC= ${WRKDIST}/source
Index: patches/patch-source_common_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_common_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-source_common_Makefile_in
--- patches/patch-source_common_Makefile_in 31 Oct 2008 09:56:15 -0000
1.3
+++ patches/patch-source_common_Makefile_in 16 Nov 2008 16:35:05 -0000
@@ -10,25 +10,3 @@
# $(LIBICUDT) is either stub data or the real DLL common data.
LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
-@@ -126,21 +126,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
-
- $(SVC_HOOK_INC):
Index: patches/patch-source_configure
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_configure,v
retrieving revision 1.3
diff -u -r1.3 patch-source_configure
--- patches/patch-source_configure 31 Oct 2008 09:56:15 -0000 1.3
+++ patches/patch-source_configure 16 Nov 2008 16:35:05 -0000
@@ -1,8 +1,10 @@
Needed to adjust the version numbering scheme. Without it,
librairies ends up with weird names.
+Also, change every -lpthread into -pthread
+
--- source/configure.orig Mon Sep 22 21:04:14 2008
-+++ source/configure Wed Oct 29 11:15:42 2008
++++ source/configure Sun Nov 16 14:26:09 2008
@@ -1359,6 +1359,7 @@ echo "$as_me: error: Cannot determine ICU version numb
{ (exit 1); exit 1; }; }
fi
@@ -10,6 +12,58 @@
+ENTRYPOINT_VERSION=`echo $VERSION | sed -e 's/\.//'`
LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`
LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
+
+@@ -4108,13 +4109,13 @@ OLD_LIBS=${LIBS}
+ if test $threads = true; then
+
+
+-echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_attr_init in -pthread" >&5
++echo $ECHO_N "checking for pthread_attr_init in -pthread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
++LIBS="-pthread $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -4177,7 +4178,7 @@ if test $ac_cv_lib_pthread_pthread_attr_init = yes; th
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+
+- LIBS="-lpthread $LIBS"
++ LIBS="-pthread $LIBS"
+
+ fi
+
+@@ -4318,13 +4319,13 @@ fi
+ ICU_USE_THREADS=1
+ else
+
+-echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
++echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
++LIBS="-pthread $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -4387,7 +4388,7 @@ if test $ac_cv_lib_pthread_pthread_mutex_init = yes; t
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+
+- LIBS="-lpthread $LIBS"
++ LIBS="-pthread $LIBS"
+
+ fi
@@ -9091,6 +9092,7 @@ s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
Index: patches/patch-source_i18n_Makefile_in
===================================================================
RCS file: patches/patch-source_i18n_Makefile_in
diff -N patches/patch-source_i18n_Makefile_in
--- patches/patch-source_i18n_Makefile_in 31 Oct 2008 09:56:15 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_i18n_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/i18n/Makefile.in.orig Mon Sep 22 21:03:06 2008
-+++ source/i18n/Makefile.in Wed Oct 29 11:29:53 2008
-@@ -118,21 +118,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
-
- install-headers:
Index: patches/patch-source_i18n_timezone_cpp
===================================================================
RCS file: patches/patch-source_i18n_timezone_cpp
diff -N patches/patch-source_i18n_timezone_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_i18n_timezone_cpp 16 Nov 2008 16:35:05 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix for a timezone bug
+original ticket : http://bugs.icu-project.org/trac/ticket/6597
+
+--- source/i18n/timezone.cpp.orig Sat Nov 15 15:33:30 2008
++++ source/i18n/timezone.cpp Sat Nov 15 15:32:42 2008
+@@ -1235,6 +1235,8 @@ TimeZone::getDisplayName(UBool daylight, EDisplayType
+ return result.remove();
+ }
+ format.adoptTimeZone(tz);
++ } else {
++ format.setTimeZone(*this);
+ }
+ } else {
+ // The display name for standard time was requested, but currently in
DST
Index: patches/patch-source_io_Makefile_in
===================================================================
RCS file: patches/patch-source_io_Makefile_in
diff -N patches/patch-source_io_Makefile_in
--- patches/patch-source_io_Makefile_in 31 Oct 2008 09:56:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_io_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/io/Makefile.in.orig Mon Sep 22 21:03:42 2008
-+++ source/io/Makefile.in Wed Oct 29 11:45:50 2008
-@@ -101,21 +101,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
-
- install-headers:
Index: patches/patch-source_layout_LESwaps_h
===================================================================
RCS file: patches/patch-source_layout_LESwaps_h
diff -N patches/patch-source_layout_LESwaps_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_layout_LESwaps_h 16 Nov 2008 16:35:05 -0000
@@ -0,0 +1,62 @@
+$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 @@
+ /*
+ *
+ * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved
++ * with additions by Sun Microsystems 2002-2006
+ *
+ */
+
+@@ -17,12 +18,21 @@
+
+ U_NAMESPACE_BEGIN
+
++// There exist popular font file which contain unaligned tables
++// (e.g. "Watanabe Gothic"'s "mort" table)
++// On some platforms unaligned memory accesses cause a crash.
++// The ALLOW_UNALIGNED hack prevents these crashes by assuming that
++// every use of the SWAPx macros in ICU's layout engine is intended
++// for loading a big endian value and replaces them appropriately.
++#define ALLOW_UNALIGNED_HACK
++
+ /**
+ * A convenience macro which invokes the swapWord member function
+ * from a concise call.
+ *
+ * @stable ICU 2.8
+ */
++#ifndef ALLOW_UNALIGNED_HACK
+ #define SWAPW(value) LESwaps::swapWord((const le_uint16 &) (value))
+
+ /**
+@@ -32,6 +42,25 @@ U_NAMESPACE_BEGIN
+ * @stable ICU 2.8
+ */
+ #define SWAPL(value) LESwaps::swapLong((const le_uint32 &) (value))
++
++#else // ALLOW_UNALIGNED_HACK
++
++#define SWAPW(rValue) loadBigEndianWord(reinterpret_cast<const
le_uint16&>(rValue))
++#define SWAPL(rValue) loadBigEndianLong(reinterpret_cast<const
le_uint32&>(rValue))
++
++inline le_uint16 loadBigEndianWord( const le_uint16& rValue )
++{
++ const le_uint8* p = reinterpret_cast<const le_uint8*>(&rValue);
++ return ((p[0] << 8) + p[1]);
++}
++
++inline le_uint32 loadBigEndianLong( const le_uint32& rValue )
++{
++ const le_uint8* p = reinterpret_cast<const le_uint8*>(&rValue);
++ return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) +p[3]);
++}
++
++#endif // ALLOW_UNALIGNED_HACK
+
+ /**
+ * This class is used to access data which stored in big endian order
Index: patches/patch-source_layout_Makefile_in
===================================================================
RCS file: patches/patch-source_layout_Makefile_in
diff -N patches/patch-source_layout_Makefile_in
--- patches/patch-source_layout_Makefile_in 31 Oct 2008 09:56:15 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_layout_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp
$
---- source/layout/Makefile.in.orig Mon Sep 22 21:04:12 2008
-+++ source/layout/Makefile.in Wed Oct 29 11:34:57 2008
-@@ -171,21 +171,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
-
- install-headers:
Index: patches/patch-source_layoutex_Makefile_in
===================================================================
RCS file: patches/patch-source_layoutex_Makefile_in
diff -N patches/patch-source_layoutex_Makefile_in
--- patches/patch-source_layoutex_Makefile_in 31 Oct 2008 09:56:15 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_layoutex_Makefile_in,v 1.2 2008/10/31 09:56:15 landry
Exp $
---- source/layoutex/Makefile.in.orig Mon Sep 22 21:04:10 2008
-+++ source/layoutex/Makefile.in Wed Oct 29 11:35:11 2008
-@@ -102,21 +102,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
-
- install-headers:
Index: patches/patch-source_stubdata_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/icu4c/patches/patch-source_stubdata_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-source_stubdata_Makefile_in
--- patches/patch-source_stubdata_Makefile_in 31 Oct 2008 09:56:15 -0000
1.3
+++ patches/patch-source_stubdata_Makefile_in 16 Nov 2008 16:35:05 -0000
@@ -11,25 +11,3 @@
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
ifneq ($(top_builddir),$(top_srcdir))
-@@ -87,21 +88,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s
$(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
-
- dist-local:
Index: patches/patch-source_test_intltest_usettest_cpp
===================================================================
RCS file: patches/patch-source_test_intltest_usettest_cpp
diff -N patches/patch-source_test_intltest_usettest_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_test_intltest_usettest_cpp 16 Nov 2008 16:35:05
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Workaround for a compilation failure in the testsuite
+
+--- source/test/intltest/usettest.cpp.orig Sun Nov 16 16:06:58 2008
++++ source/test/intltest/usettest.cpp Sun Nov 16 16:08:01 2008
+@@ -1641,7 +1641,7 @@ void UnicodeSetTest::TestSurrogate() {
+ for (int i=0; DATA[i] != 0; ++i) {
+ UErrorCode ec = U_ZERO_ERROR;
+ logln((UnicodeString)"Test pattern " + i + " :" +
UnicodeString(DATA[i], -1, US_INV));
+- UnicodeSet set(UnicodeString(DATA[i], -1, US_INV), ec);
++ UnicodeSet set(UnicodeString((const char *)DATA[i], -1, US_INV), ec);
+ if (U_FAILURE(ec)) {
+ errln("FAIL: UnicodeSet constructor");
+ continue;
Index: patches/patch-source_tools_toolutil_Makefile_in
===================================================================
RCS file: patches/patch-source_tools_toolutil_Makefile_in
diff -N patches/patch-source_tools_toolutil_Makefile_in
--- patches/patch-source_tools_toolutil_Makefile_in 31 Oct 2008 09:56:15
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-source_tools_toolutil_Makefile_in,v 1.2 2008/10/31 09:56:15
landry Exp $
---- source/tools/toolutil/Makefile.in.orig Mon Sep 22 21:03:38 2008
-+++ source/tools/toolutil/Makefile.in Wed Oct 29 11:15:42 2008
-@@ -85,12 +85,6 @@ install-library: all-local
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
- ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
-- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s
$(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
--endif
--endif
- endif
-
- dist-local:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/icu4c/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 31 Oct 2008 09:56:15 -0000 1.3
+++ pkg/PLIST 16 Nov 2008 16:35:05 -0000
@@ -7,7 +7,6 @@
bin/icu-config
@bin bin/makeconv
@bin bin/pkgdata
[EMAIL PROTECTED] bin/uconv
include/layout/
include/layout/LEFontInstance.h
include/layout/LEGlyphFilter.h
@@ -154,13 +153,27 @@
lib/icu/4.0/Makefile.inc
lib/icu/Makefile.inc
lib/icu/current
[EMAIL PROTECTED] lib/libicudata.so
@lib lib/libicudata.so.${LIBicudata_VERSION}
[EMAIL PROTECTED] lib/libicudata.so.40
[EMAIL PROTECTED] lib/libicui18n.so
@lib lib/libicui18n.so.${LIBicui18n_VERSION}
[EMAIL PROTECTED] lib/libicui18n.so.40
[EMAIL PROTECTED] lib/libicuio.so
@lib lib/libicuio.so.${LIBicuio_VERSION}
[EMAIL PROTECTED] lib/libicuio.so.40
[EMAIL PROTECTED] lib/libicule.so
@lib lib/libicule.so.${LIBicule_VERSION}
[EMAIL PROTECTED] lib/libicule.so.40
[EMAIL PROTECTED] lib/libiculx.so
@lib lib/libiculx.so.${LIBiculx_VERSION}
[EMAIL PROTECTED] lib/libiculx.so.40
[EMAIL PROTECTED] lib/libicutu.so
@lib lib/libicutu.so.${LIBicutu_VERSION}
[EMAIL PROTECTED] lib/libicutu.so.40
[EMAIL PROTECTED] lib/libicuuc.so
@lib lib/libicuuc.so.${LIBicuuc_VERSION}
[EMAIL PROTECTED] lib/libicuuc.so.40
@man man/man1/derb.1
@man man/man1/genbrk.1
@man man/man1/gencnval.1
@@ -169,7 +182,6 @@
@man man/man1/icu-config.1
@man man/man1/makeconv.1
@man man/man1/pkgdata.1
[EMAIL PROTECTED] man/man1/uconv.1
@man man/man8/genccode.8
@man man/man8/gencmn.8
@man man/man8/gensprep.8
@@ -185,6 +197,6 @@
share/icu/4.0/
share/icu/4.0/config/
share/icu/4.0/config/mh-bsd-gcc
-share/icu/4.0/license.html
@comment share/icu/4.0/install-sh
+share/icu/4.0/license.html
@comment share/icu/4.0/mkinstalldirs
--
Vincent Gross
"So, the essence of XML is this: the problem it solves is not hard, and
it does not solve the problem well." -- Jerome Simeon & Phil Wadler
