diff --git a/devel/icu/Makefile b/devel/icu/Makefile index 67763fcb5fa4..61420625ece0 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= icu -PORTVERSION= 4.8.1.1 -PORTREVISION= 1 +PORTVERSION= 50.1 CATEGORIES= devel MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \ SF/${PORTNAME}/ICU4C/${PORTVERSION}/ @@ -15,7 +14,7 @@ COMMENT= International Components for Unicode (from IBM) LICENSE= ICU LICENSE_NAME= ICU license -LICENSE_FILE= ${WRKSRC}/../unicode-license.txt +LICENSE_FILE= ${WRKSRC}/../license.html LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} GNU_CONFIGURE= yes @@ -42,7 +41,8 @@ INSTALL_TARGET= install install-manx MAN1+= derb.1 MAN1+= genbrk.1 MAN1+= gencnval.1 -MAN1+= genctd.1 +MAN1+= gencfu.1 +MAN1+= gendict.1 MAN1+= genrb.1 MAN1+= icu-config.1 MAN1+= makeconv.1 @@ -53,8 +53,8 @@ MAN8+= genccode.8 MAN8+= gencmn.8 MAN8+= gensprep.8 -ICUMAJOR= ${PORTVERSION:S/.//:C,\..*,,g} -ICUMINOR= ${PORTVERSION:C/[0-9]\.[0-9]\.//} +ICUMAJOR= 50 +ICUMINOR= 1 .if ${ICUMINOR} == "" ICUMINOR= 0 .endif @@ -76,7 +76,7 @@ CONFIGURE_ARGS+= --enable-threads=no post-patch: @${REINPLACE_CMD} -e '/CXXFLAGS=/s/-ansi//' \ ${WRKSRC}/configure -.if defined(WITHOUT_THREADS) +.if ! ${PORT_OPTIONS:MTHREADS} @${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=${PTHREAD_CFLAGS},g' ${WRKSRC}/config/mh-bsd-gcc .endif @${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,g' ${WRKSRC}/Makefile.in diff --git a/devel/icu/distinfo b/devel/icu/distinfo index fe13291d5c8a..3cdec9ce6ad3 100644 --- a/devel/icu/distinfo +++ b/devel/icu/distinfo @@ -1,2 +1,2 @@ -SHA256 (icu4c-4_8_1_1-src.tgz) = 0a70491c5fdfc5a0fa7429f820da73951e07d59a268b3d8ffe052eec65820ca1 -SIZE (icu4c-4_8_1_1-src.tgz) = 18675781 +SHA256 (icu4c-50_1-src.tgz) = 68592b3c07d9b86100f41d0172eb1a81f3ffb2a8fef1104d7395099079ba7350 +SIZE (icu4c-50_1-src.tgz) = 21181132 diff --git a/devel/icu/files/patch-cc-flags b/devel/icu/files/patch-cc-flags deleted file mode 100644 index 75c601dd2b80..000000000000 --- a/devel/icu/files/patch-cc-flags +++ /dev/null @@ -1,32 +0,0 @@ ---- ./runConfigureICU.orig 2010-08-30 21:24:42.000000000 +0200 -+++ ./runConfigureICU 2010-12-08 14:02:08.891252920 +0100 -@@ -277,10 +277,10 @@ - DEBUG_CXXFLAGS='-g -O0' - ;; - *BSD) -- THE_OS="BSD" -- THE_COMP="the GNU C++" -- CC=gcc; export CC -- CXX=g++; export CXX -+ THE_OS="$platform" -+ CC=${CC:=cc}; export CC -+ CXX=${CXX:=c++}; export CXX -+ THE_COMP="`$CC -v | fgrep -i ver`" - DEBUG_CFLAGS='-g -O0' - DEBUG_CXFLAGS='-g -O0' - ;; -@@ -327,14 +327,6 @@ - - if test $release -eq 1 - then -- if test "$RELEASE_CFLAGS" = "" -- then -- case $CC in -- gcc|*/gcc|*-gcc-*|*/*-gcc-*) -- RELEASE_CFLAGS=-O3 -- ;; -- esac -- fi - if test "$RELEASE_CFLAGS" != "" - then - CFLAGS="$CFLAGS $RELEASE_CFLAGS" diff --git a/devel/icu/files/patch-common-uloc.c b/devel/icu/files/patch-common-uloc.c deleted file mode 100644 index 0886b44dd7f7..000000000000 --- a/devel/icu/files/patch-common-uloc.c +++ /dev/null @@ -1,26 +0,0 @@ -$FreeBSD$ - -From http://bugs.icu-project.org/trac/ticket/8984 - -Submitted by: Andrei Lavreniyuk (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; - } - } diff --git a/devel/icu/files/patch-tools_genrb_derb.c b/devel/icu/files/patch-tools_genrb_derb.c new file mode 100644 index 000000000000..4515a92ebc78 --- /dev/null +++ b/devel/icu/files/patch-tools_genrb_derb.c @@ -0,0 +1,10 @@ +--- 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 cc31813f2e90..e1a482b3d038 100644 --- a/devel/icu/pkg-plist +++ b/devel/icu/pkg-plist @@ -58,7 +58,6 @@ include/unicode/utf32.h 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/ures.h 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,10 @@ include/unicode/ulocdata.h include/unicode/uloc.h include/unicode/uldnames.h include/unicode/uiter.h -include/unicode/uintrnal.h include/unicode/uidna.h +include/unicode/ugender.h include/unicode/uenum.h -include/unicode/udraft.h -include/unicode/udeprctd.h +include/unicode/udisplaycontext.h include/unicode/udatpg.h include/unicode/udata.h include/unicode/udat.h @@ -118,6 +115,8 @@ 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 @@ -141,10 +140,8 @@ include/unicode/regex.h 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 @@ -161,10 +158,12 @@ 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 @@ -227,7 +226,7 @@ bin/makeconv bin/icuinfo bin/icu-config bin/genrb -bin/genctd +bin/gendict bin/gencnval bin/gencfu bin/genbrk