diff --git a/devel/icu/Makefile b/devel/icu/Makefile index a7e7ff13da96..e6ebd29f3573 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= icu -PORTVERSION= 50.1.2 +PORTVERSION= 52.1 CATEGORIES= devel MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \ SF/${PORTNAME}/ICU4C/${PORTVERSION}/ @@ -40,18 +40,11 @@ INSTALL_TARGET= install install-manx ICUMAJOR= ${PORTVERSION:C/\..*//} PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION} -.include - -.if ${ARCH} == "arm" -BROKEN= Does not compile on arm -.endif - -.if ${PORT_OPTIONS:MTHREADS} # This builds thread-safe, but not the thread-using version: -CONFIGURE_ARGS+= --enable-weak-threads -.else -CONFIGURE_ARGS+= --enable-threads=no -.endif +THREADS_CONFIGURE_ON= --enable-weak-threads +THREADS_CONFIGURE_OFF= --enable-threads=no + +.include post-patch: @${REINPLACE_CMD} -e '/CXXFLAGS=/s/-ansi//' \ @@ -69,4 +62,4 @@ iotest cintltst intltest: test regression-test: iotest cintltst intltest -.include +.include diff --git a/devel/icu/distinfo b/devel/icu/distinfo index 7f2bbc305d88..d750644e865e 100644 --- a/devel/icu/distinfo +++ b/devel/icu/distinfo @@ -1,2 +1,2 @@ -SHA256 (icu4c-50_1_2-src.tgz) = cb68067dcc60d682f8e037bf0961bdd5169cb4652ef8aa136e893780047dafd3 -SIZE (icu4c-50_1_2-src.tgz) = 21189361 +SHA256 (icu4c-52_1-src.tgz) = 2f4d5e68d4698e87759dbdc1a586d053d96935787f79961d192c477b029d8092 +SIZE (icu4c-52_1-src.tgz) = 23875368 diff --git a/devel/icu/files/patch-layout_LookupProcessor.cpp b/devel/icu/files/patch-layout_LookupProcessor.cpp deleted file mode 100644 index 07340568e931..000000000000 --- a/devel/icu/files/patch-layout_LookupProcessor.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- layout/LookupProcessor.cpp -+++ layout/LookupProcessor.cpp -@@ -201,7 +201,9 @@ - - if (requiredFeatureIndex != 0xFFFF) { - requiredFeatureTable = featureListTable->getFeatureTable(requiredFeatureIndex, &requiredFeatureTag); -- featureReferences += SWAPW(featureTable->lookupCount); -+ if (requiredFeatureTable) { -+ featureReferences += SWAPW(requiredFeatureTable->lookupCount); -+ } - } - - lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences); diff --git a/devel/icu/files/patch-tools_genrb_derb.c b/devel/icu/files/patch-tools_genrb_derb.c deleted file mode 100644 index 4515a92ebc78..000000000000 --- a/devel/icu/files/patch-tools_genrb_derb.c +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/genrb/derb.c.orig 2012-11-05 18:14:54.000000000 +0100 -+++ tools/genrb/derb.c 2012-12-17 04:02:54.787359037 +0100 -@@ -27,6 +27,7 @@ - #include "ustrfmt.h" - - #include -+#define _TRUNCATE_DECLARED - #include - #include - diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist index 944f1847550d..bd1c5280e48d 100644 --- a/devel/icu/pkg-plist +++ b/devel/icu/pkg-plist @@ -3,38 +3,38 @@ sbin/gensprep sbin/gennorm2 sbin/gencmn sbin/genccode -lib/libsicuuc.a -lib/libsicutu.a -lib/libsicutest.a -lib/libsiculx.a -lib/libsicule.a -lib/libsicuio.a -lib/libsicui18n.a -lib/libsicudata.a -lib/libicuuc.so.%%ICUVER%% -lib/libicuuc.so.%%ICUMAJOR%% -lib/libicuuc.so -lib/libicutu.so.%%ICUVER%% -lib/libicutu.so.%%ICUMAJOR%% -lib/libicutu.so -lib/libicutest.so.%%ICUVER%% -lib/libicutest.so.%%ICUMAJOR%% -lib/libicutest.so -lib/libiculx.so.%%ICUVER%% -lib/libiculx.so.%%ICUMAJOR%% -lib/libiculx.so -lib/libicule.so.%%ICUVER%% -lib/libicule.so.%%ICUMAJOR%% -lib/libicule.so -lib/libicuio.so.%%ICUVER%% -lib/libicuio.so.%%ICUMAJOR%% -lib/libicuio.so -lib/libicui18n.so.%%ICUVER%% -lib/libicui18n.so.%%ICUMAJOR%% -lib/libicui18n.so -lib/libicudata.so.%%ICUVER%% -lib/libicudata.so.%%ICUMAJOR%% +lib/libicudata.a lib/libicudata.so +lib/libicudata.so.%%ICUMAJOR%% +lib/libicudata.so.%%ICUVER%% +lib/libicui18n.a +lib/libicui18n.so +lib/libicui18n.so.%%ICUMAJOR%% +lib/libicui18n.so.%%ICUVER%% +lib/libicuio.a +lib/libicuio.so +lib/libicuio.so.%%ICUMAJOR%% +lib/libicuio.so.%%ICUVER%% +lib/libicule.a +lib/libicule.so +lib/libicule.so.%%ICUMAJOR%% +lib/libicule.so.%%ICUVER%% +lib/libiculx.a +lib/libiculx.so +lib/libiculx.so.%%ICUMAJOR%% +lib/libiculx.so.%%ICUVER%% +lib/libicutest.a +lib/libicutest.so +lib/libicutest.so.%%ICUMAJOR%% +lib/libicutest.so.%%ICUVER%% +lib/libicutu.a +lib/libicutu.so +lib/libicutu.so.%%ICUMAJOR%% +lib/libicutu.so.%%ICUVER%% +lib/libicuuc.a +lib/libicuuc.so +lib/libicuuc.so.%%ICUMAJOR%% +lib/libicuuc.so.%%ICUVER%% lib/icu/pkgdata.inc lib/icu/current lib/icu/Makefile.inc @@ -45,182 +45,185 @@ libdata/pkgconfig/icu-le.pc libdata/pkgconfig/icu-i18n.pc libdata/pkgconfig/icu-lx.pc libdata/pkgconfig/icu-uc.pc -include/unicode/vtzone.h -include/unicode/uversion.h -include/unicode/uvernum.h -include/unicode/utypes.h -include/unicode/utrans.h -include/unicode/utrace.h -include/unicode/utmscale.h -include/unicode/utf_old.h -include/unicode/utf8.h -include/unicode/utf32.h -include/unicode/utf16.h -include/unicode/utf.h -include/unicode/utext.h -include/unicode/ustring.h -include/unicode/ustream.h -include/unicode/ustdio.h -include/unicode/usprep.h -include/unicode/uspoof.h -include/unicode/ushape.h -include/unicode/usetiter.h -include/unicode/uset.h -include/unicode/usearch.h -include/unicode/uscript.h -include/unicode/ures.h -include/unicode/urep.h -include/unicode/urename.h -include/unicode/uregex.h -include/unicode/uobject.h -include/unicode/unum.h -include/unicode/unorm2.h -include/unicode/unorm.h -include/unicode/unistr.h -include/unicode/uniset.h -include/unicode/unirepl.h -include/unicode/unimatch.h -include/unicode/unifunct.h -include/unicode/unifilt.h -include/unicode/umsg.h -include/unicode/umisc.h -include/unicode/umachine.h -include/unicode/ulocdata.h -include/unicode/uloc.h -include/unicode/uldnames.h -include/unicode/uiter.h -include/unicode/uidna.h -include/unicode/ugender.h -include/unicode/uenum.h -include/unicode/udisplaycontext.h -include/unicode/udatpg.h -include/unicode/udata.h -include/unicode/udat.h -include/unicode/ucurr.h -include/unicode/ucsdet.h -include/unicode/uconfig.h -include/unicode/ucoleitr.h -include/unicode/ucol.h -include/unicode/ucnvsel.h -include/unicode/ucnv_err.h -include/unicode/ucnv_cb.h -include/unicode/ucnv.h -include/unicode/uclean.h -include/unicode/uchriter.h -include/unicode/uchar.h -include/unicode/ucat.h -include/unicode/ucasemap.h -include/unicode/ucal.h -include/unicode/ubrk.h -include/unicode/ubidi.h -include/unicode/tztrans.h -include/unicode/tzrule.h -include/unicode/tznames.h -include/unicode/tzfmt.h -include/unicode/translit.h -include/unicode/tmutfmt.h -include/unicode/tmutamt.h -include/unicode/tmunit.h -include/unicode/timezone.h -include/unicode/tblcoll.h -include/unicode/symtable.h -include/unicode/stsearch.h -include/unicode/stringpiece.h -include/unicode/strenum.h -include/unicode/std_string.h -include/unicode/sortkey.h -include/unicode/smpdtfmt.h -include/unicode/simpletz.h -include/unicode/selfmt.h -include/unicode/search.h -include/unicode/schriter.h -include/unicode/resbund.h -include/unicode/rep.h -include/unicode/regex.h -include/unicode/rbtz.h -include/unicode/rbnf.h -include/unicode/rbbi.h -include/unicode/putil.h -include/unicode/ptypes.h -include/unicode/plurrule.h -include/unicode/plurfmt.h -include/unicode/platform.h -include/unicode/parsepos.h -include/unicode/parseerr.h -include/unicode/numsys.h -include/unicode/numfmt.h -include/unicode/normlzr.h -include/unicode/normalizer2.h -include/unicode/msgfmt.h -include/unicode/measure.h -include/unicode/measunit.h -include/unicode/measfmt.h -include/unicode/locid.h -include/unicode/locdspnm.h -include/unicode/localpointer.h -include/unicode/listformatter.h -include/unicode/idna.h -include/unicode/icuplug.h -include/unicode/icudataver.h -include/unicode/gregocal.h -include/unicode/gender.h -include/unicode/fpositer.h -include/unicode/format.h -include/unicode/fmtable.h -include/unicode/fieldpos.h -include/unicode/enumset.h -include/unicode/errorcode.h -include/unicode/dtrule.h -include/unicode/dtptngen.h -include/unicode/dtitvinf.h -include/unicode/dtitvfmt.h -include/unicode/dtintrv.h -include/unicode/dtfmtsym.h -include/unicode/docmain.h -include/unicode/decimfmt.h -include/unicode/dcfmtsym.h -include/unicode/dbbi.h -include/unicode/datefmt.h -include/unicode/currunit.h -include/unicode/currpinf.h -include/unicode/curramt.h -include/unicode/colldata.h -include/unicode/coll.h -include/unicode/coleitr.h -include/unicode/choicfmt.h -include/unicode/chariter.h -include/unicode/caniter.h -include/unicode/calendar.h -include/unicode/bytestream.h -include/unicode/brkiter.h -include/unicode/bmsearch.h -include/unicode/bms.h -include/unicode/basictz.h +include/layout/LEFontInstance.h +include/layout/LEGlyphFilter.h +include/layout/LEGlyphStorage.h +include/layout/LEInsertionList.h +include/layout/LELanguages.h +include/layout/LEScripts.h +include/layout/LESwaps.h +include/layout/LETableReference.h +include/layout/LETypes.h +include/layout/LayoutEngine.h +include/layout/ParagraphLayout.h +include/layout/RunArrays.h +include/layout/loengine.h +include/layout/playout.h +include/layout/plruns.h +include/unicode/alphaindex.h include/unicode/appendable.h +include/unicode/basictz.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 +include/unicode/choicfmt.h +include/unicode/coleitr.h +include/unicode/coll.h +include/unicode/compactdecimalformat.h +include/unicode/curramt.h +include/unicode/currpinf.h +include/unicode/currunit.h +include/unicode/datefmt.h +include/unicode/dbbi.h +include/unicode/dcfmtsym.h +include/unicode/decimfmt.h +include/unicode/docmain.h +include/unicode/dtfmtsym.h +include/unicode/dtintrv.h +include/unicode/dtitvfmt.h +include/unicode/dtitvinf.h +include/unicode/dtptngen.h +include/unicode/dtrule.h +include/unicode/enumset.h +include/unicode/errorcode.h +include/unicode/fieldpos.h +include/unicode/fmtable.h +include/unicode/format.h +include/unicode/fpositer.h +include/unicode/gender.h +include/unicode/gregocal.h +include/unicode/icudataver.h +include/unicode/icuplug.h +include/unicode/idna.h +include/unicode/listformatter.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 +include/unicode/numfmt.h +include/unicode/numsys.h +include/unicode/parseerr.h +include/unicode/parsepos.h +include/unicode/platform.h +include/unicode/plurfmt.h +include/unicode/plurrule.h +include/unicode/ptypes.h +include/unicode/putil.h +include/unicode/rbbi.h +include/unicode/rbnf.h +include/unicode/rbtz.h +include/unicode/regex.h +include/unicode/region.h +include/unicode/rep.h +include/unicode/resbund.h +include/unicode/schriter.h +include/unicode/search.h +include/unicode/selfmt.h +include/unicode/simpletz.h +include/unicode/smpdtfmt.h +include/unicode/sortkey.h +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 +include/unicode/timezone.h +include/unicode/tmunit.h +include/unicode/tmutamt.h +include/unicode/tmutfmt.h +include/unicode/translit.h +include/unicode/tzfmt.h +include/unicode/tznames.h +include/unicode/tzrule.h +include/unicode/tztrans.h +include/unicode/ubidi.h +include/unicode/ubrk.h +include/unicode/ucal.h +include/unicode/ucasemap.h +include/unicode/ucat.h +include/unicode/uchar.h include/unicode/ucharstrie.h include/unicode/ucharstriebuilder.h -include/unicode/ustringtrie.h -include/unicode/alphaindex.h +include/unicode/uchriter.h +include/unicode/uclean.h +include/unicode/ucnv.h +include/unicode/ucnv_cb.h +include/unicode/ucnv_err.h +include/unicode/ucnvsel.h +include/unicode/ucol.h +include/unicode/ucoleitr.h +include/unicode/uconfig.h +include/unicode/ucsdet.h +include/unicode/ucurr.h +include/unicode/udat.h +include/unicode/udata.h include/unicode/udateintervalformat.h +include/unicode/udatpg.h +include/unicode/udisplaycontext.h +include/unicode/uenum.h +include/unicode/uformattable.h +include/unicode/ugender.h +include/unicode/uidna.h +include/unicode/uiter.h +include/unicode/uldnames.h +include/unicode/uloc.h +include/unicode/ulocdata.h +include/unicode/umachine.h +include/unicode/umisc.h +include/unicode/umsg.h +include/unicode/unifilt.h +include/unicode/unifunct.h +include/unicode/unimatch.h +include/unicode/unirepl.h +include/unicode/uniset.h +include/unicode/unistr.h +include/unicode/unorm.h +include/unicode/unorm2.h +include/unicode/unum.h +include/unicode/unumsys.h +include/unicode/uobject.h include/unicode/upluralrules.h -include/layout/plruns.h -include/layout/playout.h -include/layout/loengine.h -include/layout/RunArrays.h -include/layout/ParagraphLayout.h -include/layout/LayoutEngine.h -include/layout/LETypes.h -include/layout/LESwaps.h -include/layout/LEScripts.h -include/layout/LELanguages.h -include/layout/LEInsertionList.h -include/layout/LEGlyphStorage.h -include/layout/LEGlyphFilter.h -include/layout/LEFontInstance.h +include/unicode/uregex.h +include/unicode/uregion.h +include/unicode/urename.h +include/unicode/urep.h +include/unicode/ures.h +include/unicode/uscript.h +include/unicode/usearch.h +include/unicode/uset.h +include/unicode/usetiter.h +include/unicode/ushape.h +include/unicode/uspoof.h +include/unicode/usprep.h +include/unicode/ustdio.h +include/unicode/ustream.h +include/unicode/ustring.h +include/unicode/ustringtrie.h +include/unicode/utext.h +include/unicode/utf.h +include/unicode/utf16.h +include/unicode/utf32.h +include/unicode/utf8.h +include/unicode/utf_old.h +include/unicode/utmscale.h +include/unicode/utrace.h +include/unicode/utrans.h +include/unicode/utypes.h +include/unicode/uvernum.h +include/unicode/uversion.h +include/unicode/vtzone.h bin/uconv bin/pkgdata bin/makeconv