Legwork to upgrade devel/icu
Mel Flynn
mel at rachie.is-a-geek.net
Fri Mar 23 01:28:00 UTC 2012
Hiya,
was trying to see if 1.49 also has a problem on clang/i386 so I did the
legwork to upgrade devel/icu. Unfortunately the problem persists, but
I'm not able to find the cause. Either way, maybe this helps someone.
diff is attached and build archive here:
https://redports.org/buildarchive/20120323005457-06149/
--
Mel
-------------- next part --------------
Index: distinfo
===================================================================
--- distinfo (revision 2749)
+++ distinfo (revision 2754)
@@ -1,2 +1,2 @@
-SHA256 (icu4c-4_8_1_1-src.tgz) = 0a70491c5fdfc5a0fa7429f820da73951e07d59a268b3d8ffe052eec65820ca1
-SIZE (icu4c-4_8_1_1-src.tgz) = 18675781
+SHA256 (icu4c-49_1-src.tgz) = b6399f00941d982c64fef96b0094dd2f7c1421f8a0c113686d5f123daf8eabca
+SIZE (icu4c-49_1-src.tgz) = 19000749
Index: files/patch-common-uloc.c
===================================================================
--- files/patch-common-uloc.c (revision 2749)
+++ files/patch-common-uloc.c (revision 2754)
@@ -1,26 +0,0 @@
-$FreeBSD: ports/devel/icu/files/patch-common-uloc.c,v 1.1 2011/12/23 14:54:18 crees Exp $
-
-From http://bugs.icu-project.org/trac/ticket/8984
-
-Submitted by: Andrei Lavreniyuk <andy.lavr at gmail.com> (thanks!)
-
---- common/uloc.c
-+++ common/uloc.c
-@@ -1797,7 +1797,7 @@
- int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
- len -= variantLen;
- if (variantLen > 0) {
-- if (name[len-1] == '_') { /* delete trailing '_' */
-+ if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
- --len;
- }
- addKeyword = VARIANT_MAP[j].keyword;
-@@ -1805,7 +1805,7 @@
- break;
- }
- }
-- if (name[len-1] == '_') { /* delete trailing '_' */
-+ if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */
- --len;
- }
- }
Index: files/patch-common__putil.cpp
===================================================================
--- files/patch-common__putil.cpp (revision 0)
+++ files/patch-common__putil.cpp (revision 2754)
@@ -0,0 +1,11 @@
+--- common/putil.cpp.orig 2012-03-21 09:35:10.000000000 -0800
++++ common/putil.cpp 2012-03-22 15:51:14.000000000 -0800
+@@ -633,7 +633,7 @@
+ U_CAPI int32_t U_EXPORT2
+ uprv_timezone()
+ {
+-#ifdef U_TIMEZONE
++#if HAVE_U_TIMEZONE
+ return U_TIMEZONE;
+ #else
+ time_t t, t1, t2;
Index: files/patch-test__iotest__filetst.c
===================================================================
--- files/patch-test__iotest__filetst.c (revision 0)
+++ files/patch-test__iotest__filetst.c (revision 2754)
@@ -0,0 +1,20 @@
+--- test/iotest/filetst.c.orig 2011-10-18 15:11:48.000000000 -0800
++++ test/iotest/filetst.c 2012-03-22 14:06:50.000000000 -0800
+@@ -1430,6 +1430,8 @@
+ u_uastrcpy(uBuffer2, expectedResult);
+ if (u_strcmp(uBuffer, uBuffer2) != 0) {
+ log_err("Got two different results for \"%s\" expected \"%s\"\n", format, expectedResult);
++ log_err("uBuffer...: %s\n", uBuffer);
++ log_err("uBuffer2..: %s\n", uBuffer2);
+ }
+ u_fclose(myFile);
+
+@@ -1457,6 +1459,8 @@
+ u_uastrcpy(uBuffer2, expectedResult);
+ if (u_strcmp(uBuffer, uBuffer2) != 0) {
+ log_err("Got two different results for \"%s\" expected \"%s\"\n", format, expectedResult);
++ log_err("uBuffer...: %s\n", uBuffer);
++ log_err("uBuffer2..: %s\n", uBuffer2);
+ }
+ u_fclose(myFile);
+ }
Index: pkg-plist
===================================================================
--- pkg-plist (revision 2749)
+++ pkg-plist (revision 2754)
@@ -58,7 +58,6 @@
include/unicode/utf16.h
include/unicode/utf.h
include/unicode/utext.h
-include/unicode/usystem.h
include/unicode/ustring.h
include/unicode/ustream.h
include/unicode/ustdio.h
@@ -73,7 +72,6 @@
include/unicode/urep.h
include/unicode/urename.h
include/unicode/uregex.h
-include/unicode/uobslete.h
include/unicode/uobject.h
include/unicode/unum.h
include/unicode/unorm2.h
@@ -91,11 +89,8 @@
include/unicode/uloc.h
include/unicode/uldnames.h
include/unicode/uiter.h
-include/unicode/uintrnal.h
include/unicode/uidna.h
include/unicode/uenum.h
-include/unicode/udraft.h
-include/unicode/udeprctd.h
include/unicode/udatpg.h
include/unicode/udata.h
include/unicode/udat.h
@@ -116,6 +111,8 @@
include/unicode/ucal.h
include/unicode/ubrk.h
include/unicode/ubidi.h
+include/unicode/tzfmt.h
+include/unicode/tznames.h
include/unicode/tztrans.h
include/unicode/tzrule.h
include/unicode/translit.h
@@ -141,10 +138,8 @@
include/unicode/rbtz.h
include/unicode/rbnf.h
include/unicode/rbbi.h
-include/unicode/pwin32.h
include/unicode/putil.h
include/unicode/ptypes.h
-include/unicode/ppalmos.h
include/unicode/plurrule.h
include/unicode/plurfmt.h
include/unicode/platform.h
Index: Makefile
===================================================================
--- Makefile (revision 2749)
+++ Makefile (revision 2754)
@@ -6,8 +6,7 @@
#
PORTNAME= icu
-PORTVERSION= 4.8.1.1
-PORTREVISION= 1
+PORTVERSION= 49.1
CATEGORIES= devel
MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \
SF/${PORTNAME}/ICU4C/${PORTVERSION}/
@@ -35,7 +34,6 @@
--enable-release \
--enable-shared \
--enable-static
-
MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
@@ -55,8 +53,8 @@
MAN8+= gencmn.8
MAN8+= gensprep.8
-ICUMAJOR= ${PORTVERSION:S/.//:C,\..*,,g}
-ICUMINOR= ${PORTVERSION:C/[0-9]\.[0-9]\.//}
+ICUMAJOR= ${PORTVERSION:R}
+ICUMINOR= ${PORTVERSION:E}
.if ${ICUMINOR} == ""
ICUMINOR= 0
.endif
More information about the freebsd-office
mailing list