From ebcdf588dc9d7976725c29583a4d13670d00a13a Mon Sep 17 00:00:00 2001 From: Mikhail Teterin Date: Thu, 18 Nov 2004 19:58:21 +0000 Subject: [PATCH] Update this port (long obsoleted by icu2) to the latest icu-3.2. Add Ukrainian KOI8-U encoding and fix Ukrainian spell-out rules. Build the vendor's tests and run them automatically after build. Once the wrinkles (if any) are ironed out, the current users of icu2 should switch to icu and icu2 deleted. PR: ports/71790 Submitted by: Andriy Gapon --- devel/icu/Makefile | 85 ++++++++-- devel/icu/distinfo | 4 +- devel/icu/files/koi8-u.ucm | 272 ++++++++++++++++++++++++++++++++ devel/icu/files/patch-aa | 16 ++ devel/icu/files/patch-ab | 255 ++++++++++++++++++++++++++++++ devel/icu/files/patch-cc-flags | 27 ++++ devel/icu/files/patch-convrtrs | 10 ++ devel/icu/files/patch-uk | 17 ++ devel/icu/pkg-descr | 25 +-- devel/icu/pkg-plist | 155 ++++++++++++------ devel/icu4/Makefile | 85 ++++++++-- devel/icu4/distinfo | 4 +- devel/icu4/files/koi8-u.ucm | 272 ++++++++++++++++++++++++++++++++ devel/icu4/files/patch-aa | 16 ++ devel/icu4/files/patch-ab | 255 ++++++++++++++++++++++++++++++ devel/icu4/files/patch-cc-flags | 27 ++++ devel/icu4/files/patch-convrtrs | 10 ++ devel/icu4/files/patch-uk | 17 ++ devel/icu4/pkg-descr | 25 +-- devel/icu4/pkg-plist | 155 ++++++++++++------ 20 files changed, 1568 insertions(+), 164 deletions(-) create mode 100644 devel/icu/files/koi8-u.ucm create mode 100644 devel/icu/files/patch-aa create mode 100644 devel/icu/files/patch-ab create mode 100644 devel/icu/files/patch-cc-flags create mode 100644 devel/icu/files/patch-convrtrs create mode 100644 devel/icu/files/patch-uk create mode 100644 devel/icu4/files/koi8-u.ucm create mode 100644 devel/icu4/files/patch-aa create mode 100644 devel/icu4/files/patch-ab create mode 100644 devel/icu4/files/patch-cc-flags create mode 100644 devel/icu4/files/patch-convrtrs create mode 100644 devel/icu4/files/patch-uk diff --git a/devel/icu/Makefile b/devel/icu/Makefile index ca96539232f1..54e3c1e0b44e 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -6,27 +6,82 @@ # PORTNAME= icu -PORTVERSION= 1.7 -PORTREVISION= 1 +PORTVERSION= 3.2 CATEGORIES= devel -MASTER_SITES= http://oss.software.ibm.com/developerworks/opensource/icu/project/download/${PORTVERSION}/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ftp://www-126.ibm.com/pub/icu/${PORTVERSION}/ +EXTRACT_SUFX= -d02.tgz MAINTAINER= ports@FreeBSD.org -COMMENT= International Components for Unicode (from IBM)(old version) +COMMENT= International Components for Unicode (from IBM) -WRKSRC= ${WRKDIR}/${PORTNAME}/source -GNU_CONFIGURE= yes -USE_GMAKE= yes +INSTALLS_SHLIB= yes +NO_FILTER_SHLIBS= yes -CONFIGURE_ARGS+=--disable-shared --enable-static -CONFIGURE_ENV= CXXFLAGS="-O3" -CONFIGURE_ENV+= CFLAGS="-O3" +WRKSRC= ${WRKDIR}/icu +ICUWRKSRC= ${WRKSRC}/source +CONFIGURE_WRKSRC= ${ICUWRKSRC} +BUILD_WRKSRC= ${ICUWRKSRC} +INSTALL_WRKSRC= ${ICUWRKSRC} -.include +GNU_CONFIGURE= yes +CONFIGURE_SCRIPT= runConfigureICU +CONFIGURE_ARGS+= ${OPSYS} +CONFIGURE_ARGS+= --enable-shared +CONFIGURE_ARGS+= --enable-static +CONFIGURE_ARGS+= --enable-samples=no --enable-tests=yes +.if defined(NO_THREADS) +CONFIGURE_ARGS+= --enable-threads=no +.else +CONFIGURE_ENV+= THREADSCPPFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCXXFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" +.endif +USE_GMAKE= yes +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CC="${CC}" CXX="${CXX}" -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" -IGNORE= "does not build on this architecture, use devel/icu2 instead" +MAN1+= gencnval.1 +MAN1+= genrb.1 +MAN1+= icu-config.1 +MAN1+= makeconv.1 +MAN1+= pkgdata.1 +MAN1+= uconv.1 +MAN8+= decmn.8 +MAN8+= genccode.8 +MAN8+= gencmn.8 +MAN8+= gennames.8 +MAN8+= gennorm.8 +MAN8+= genprops.8 +MAN8+= gensprep.8 +MAN8+= genuca.8 + +ICUMAJOR= ${PORTVERSION:S/.//:R} +PLIST_SUB+= ICUMAJOR=${ICUMAJOR} +PLIST_SUB+= ICUVER=${PORTVERSION} + +pre-fetch: +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) + # + # You may use the following build options by defining + # them on the command line with -D + # + # NO_THREADS do not build a thread enabled library + # .endif -.include +pre-patch: +# VPATH does not work due to IBM's mistake: + ${LN} -s ${FILESDIR}/*.ucm ${WRKSRC}/source/data/mappings/ + @for l in ${FILESDIR}/*.ucm ; do \ + echo UCM_SOURCE_LOCAL+=`basename $$l` >> \ + ${WRKSRC}/source/data/mappings/ucmlocal.mk ; \ + done + +post-build test: + ${GMAKE} -C ${ICUWRKSRC}/test +.for t in intltest iotest cintltst + cd ${ICUWRKSRC}/test/$t && ${SETENV} \ + LD_LIBRARY_PATH=${ICUWRKSRC}/lib:${ICUWRKSRC}/tools/ctestfw ./$t +.endfor + +.include diff --git a/devel/icu/distinfo b/devel/icu/distinfo index b097074adaaf..f6608cb965d4 100644 --- a/devel/icu/distinfo +++ b/devel/icu/distinfo @@ -1,2 +1,2 @@ -MD5 (icu-1.7.tgz) = 8f58c2087ffd9431ab6ad27fce2ba092 -SIZE (icu-1.7.tgz) = 6089550 +MD5 (icu-3.2-d02.tgz) = 4043b99a9c7f2fa794c16627968d654d +SIZE (icu-3.2-d02.tgz) = 9589086 diff --git a/devel/icu/files/koi8-u.ucm b/devel/icu/files/koi8-u.ucm new file mode 100644 index 000000000000..b81307a6c5eb --- /dev/null +++ b/devel/icu/files/koi8-u.ucm @@ -0,0 +1,272 @@ +# +# $Id: koi8-u.ucm,v 2.0 2004/05/16 20:55:26 dankogai Exp $ +# +# Written $Id: koi8-u.ucm,v 2.0 2004/05/16 20:55:26 dankogai Exp $ +# ./compile -n koi8-u -o Encode/koi8-u.ucm Encode/koi8-u.enc + + "koi8-u" + "AXXXX" + 1 + 1 + "SBCS" + \x1A + "ASCII" + +CHARMAP + \x00 |0 # + \x01 |0 # + \x02 |0 # + \x03 |0 # + \x04 |0 # + \x05 |0 # + \x06 |0 # + \x07 |0 # + \x08 |0 # + \x09 |0 # + \x0A |0 # + \x0B |0 # + \x0C |0 # + \x0D |0 # + \x0E |0 # + \x0F |0 # + \x10 |0 # + \x11 |0 # + \x12 |0 # + \x13 |0 # + \x14 |0 # + \x15 |0 # + \x16 |0 # + \x17 |0 # + \x18 |0 # + \x19 |0 # + \x1A |0 # + \x1B |0 # + \x1C |0 # + \x1D |0 # + \x1E |0 # + \x1F |0 # + \x20 |0 # SPACE + \x21 |0 # EXCLAMATION MARK + \x22 |0 # QUOTATION MARK + \x23 |0 # NUMBER SIGN + \x24 |0 # DOLLAR SIGN + \x25 |0 # PERCENT SIGN + \x26 |0 # AMPERSAND + \x27 |0 # APOSTROPHE + \x28 |0 # LEFT PARENTHESIS + \x29 |0 # RIGHT PARENTHESIS + \x2A |0 # ASTERISK + \x2B |0 # PLUS SIGN + \x2C |0 # COMMA + \x2D |0 # HYPHEN-MINUS + \x2E |0 # FULL STOP + \x2F |0 # SOLIDUS + \x30 |0 # DIGIT ZERO + \x31 |0 # DIGIT ONE + \x32 |0 # DIGIT TWO + \x33 |0 # DIGIT THREE + \x34 |0 # DIGIT FOUR + \x35 |0 # DIGIT FIVE + \x36 |0 # DIGIT SIX + \x37 |0 # DIGIT SEVEN + \x38 |0 # DIGIT EIGHT + \x39 |0 # DIGIT NINE + \x3A |0 # COLON + \x3B |0 # SEMICOLON + \x3C |0 # LESS-THAN SIGN + \x3D |0 # EQUALS SIGN + \x3E |0 # GREATER-THAN SIGN + \x3F |0 # QUESTION MARK + \x40 |0 # COMMERCIAL AT + \x41 |0 # LATIN CAPITAL LETTER A + \x42 |0 # LATIN CAPITAL LETTER B + \x43 |0 # LATIN CAPITAL LETTER C + \x44 |0 # LATIN CAPITAL LETTER D + \x45 |0 # LATIN CAPITAL LETTER E + \x46 |0 # LATIN CAPITAL LETTER F + \x47 |0 # LATIN CAPITAL LETTER G + \x48 |0 # LATIN CAPITAL LETTER H + \x49 |0 # LATIN CAPITAL LETTER I + \x4A |0 # LATIN CAPITAL LETTER J + \x4B |0 # LATIN CAPITAL LETTER K + \x4C |0 # LATIN CAPITAL LETTER L + \x4D |0 # LATIN CAPITAL LETTER M + \x4E |0 # LATIN CAPITAL LETTER N + \x4F |0 # LATIN CAPITAL LETTER O + \x50 |0 # LATIN CAPITAL LETTER P + \x51 |0 # LATIN CAPITAL LETTER Q + \x52 |0 # LATIN CAPITAL LETTER R + \x53 |0 # LATIN CAPITAL LETTER S + \x54 |0 # LATIN CAPITAL LETTER T + \x55 |0 # LATIN CAPITAL LETTER U + \x56 |0 # LATIN CAPITAL LETTER V + \x57 |0 # LATIN CAPITAL LETTER W + \x58 |0 # LATIN CAPITAL LETTER X + \x59 |0 # LATIN CAPITAL LETTER Y + \x5A |0 # LATIN CAPITAL LETTER Z + \x5B |0 # LEFT SQUARE BRACKET + \x5C |0 # REVERSE SOLIDUS + \x5D |0 # RIGHT SQUARE BRACKET + \x5E |0 # CIRCUMFLEX ACCENT + \x5F |0 # LOW LINE + \x60 |0 # GRAVE ACCENT + \x61 |0 # LATIN SMALL LETTER A + \x62 |0 # LATIN SMALL LETTER B + \x63 |0 # LATIN SMALL LETTER C + \x64 |0 # LATIN SMALL LETTER D + \x65 |0 # LATIN SMALL LETTER E + \x66 |0 # LATIN SMALL LETTER F + \x67 |0 # LATIN SMALL LETTER G + \x68 |0 # LATIN SMALL LETTER H + \x69 |0 # LATIN SMALL LETTER I + \x6A |0 # LATIN SMALL LETTER J + \x6B |0 # LATIN SMALL LETTER K + \x6C |0 # LATIN SMALL LETTER L + \x6D |0 # LATIN SMALL LETTER M + \x6E |0 # LATIN SMALL LETTER N + \x6F |0 # LATIN SMALL LETTER O + \x70 |0 # LATIN SMALL LETTER P + \x71 |0 # LATIN SMALL LETTER Q + \x72 |0 # LATIN SMALL LETTER R + \x73 |0 # LATIN SMALL LETTER S + \x74 |0 # LATIN SMALL LETTER T + \x75 |0 # LATIN SMALL LETTER U + \x76 |0 # LATIN SMALL LETTER V + \x77 |0 # LATIN SMALL LETTER W + \x78 |0 # LATIN SMALL LETTER X + \x79 |0 # LATIN SMALL LETTER Y + \x7A |0 # LATIN SMALL LETTER Z + \x7B |0 # LEFT CURLY BRACKET + \x7C |0 # VERTICAL LINE + \x7D |0 # RIGHT CURLY BRACKET + \x7E |0 # TILDE + \x7F |0 # + \x80 |0 # BOX DRAWINGS LIGHT HORIZONTAL + \x81 |0 # BOX DRAWINGS LIGHT VERTICAL + \x82 |0 # BOX DRAWINGS LIGHT DOWN AND RIGHT + \x83 |0 # BOX DRAWINGS LIGHT DOWN AND LEFT + \x84 |0 # BOX DRAWINGS LIGHT UP AND RIGHT + \x85 |0 # BOX DRAWINGS LIGHT UP AND LEFT + \x86 |0 # BOX DRAWINGS LIGHT VERTICAL AND RIGHT + \x87 |0 # BOX DRAWINGS LIGHT VERTICAL AND LEFT + \x88 |0 # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL + \x89 |0 # BOX DRAWINGS LIGHT UP AND HORIZONTAL + \x8A |0 # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL + \x8B |0 # UPPER HALF BLOCK + \x8C |0 # LOWER HALF BLOCK + \x8D |0 # FULL BLOCK + \x8E |0 # LEFT HALF BLOCK + \x8F |0 # RIGHT HALF BLOCK + \x90 |0 # LIGHT SHADE + \x91 |0 # MEDIUM SHADE + \x92 |0 # DARK SHADE + \x93 |0 # TOP HALF INTEGRAL + \x94 |0 # BLACK SQUARE + \x95 |0 # BULLET + \x96 |0 # SQUARE ROOT + \x97 |0 # ALMOST EQUAL TO + \x98 |0 # LESS-THAN OR EQUAL TO + \x99 |0 # GREATER-THAN OR EQUAL TO + \x9A |0 # NO-BREAK SPACE + \x9B |0 # BOTTOM HALF INTEGRAL + \x9C |0 # DEGREE SIGN + \x9D |0 # SUPERSCRIPT TWO + \x9E |0 # MIDDLE DOT + \x9F |0 # DIVISION SIGN + \xA0 |0 # BOX DRAWINGS DOUBLE HORIZONTAL + \xA1 |0 # BOX DRAWINGS DOUBLE VERTICAL + \xA2 |0 # BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE + \xA3 |0 # CYRILLIC SMALL LETTER IO + \xA4 |0 # CYRILLIC SMALL LETTER UKRAINIAN IE + \xA5 |0 # BOX DRAWINGS DOUBLE DOWN AND RIGHT + \xA6 |0 # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I + \xA7 |0 # CYRILLIC SMALL LETTER YI + \xA8 |0 # BOX DRAWINGS DOUBLE DOWN AND LEFT + \xA9 |0 # BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE + \xAA |0 # BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE + \xAB |0 # BOX DRAWINGS DOUBLE UP AND RIGHT + \xAC |0 # BOX DRAWINGS UP SINGLE AND LEFT DOUBLE + \xAD |0 # CYRILLIC SMALL LETTER GHE WITH UPTURN + \xAE |0 # BOX DRAWINGS DOUBLE UP AND LEFT + \xAF |0 # BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE + \xB0 |0 # BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE + \xB1 |0 # BOX DRAWINGS DOUBLE VERTICAL AND RIGHT + \xB2 |0 # BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE + \xB3 |0 # CYRILLIC CAPITAL LETTER IO + \xB4 |0 # CYRILLIC CAPITAL LETTER UKRAINIAN IE + \xB5 |0 # BOX DRAWINGS DOUBLE VERTICAL AND LEFT + \xB6 |0 # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I + \xB7 |0 # CYRILLIC CAPITAL LETTER YI + \xB8 |0 # BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL + \xB9 |0 # BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE + \xBA |0 # BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE + \xBB |0 # BOX DRAWINGS DOUBLE UP AND HORIZONTAL + \xBC |0 # BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE + \xBD |0 # CYRILLIC CAPITAL LETTER GHE WITH UPTURN + \xBE |0 # BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL + \xBF |0 # COPYRIGHT SIGN + \xC0 |0 # CYRILLIC SMALL LETTER YU + \xC1 |0 # CYRILLIC SMALL LETTER A + \xC2 |0 # CYRILLIC SMALL LETTER BE + \xC3 |0 # CYRILLIC SMALL LETTER TSE + \xC4 |0 # CYRILLIC SMALL LETTER DE + \xC5 |0 # CYRILLIC SMALL LETTER IE + \xC6 |0 # CYRILLIC SMALL LETTER EF + \xC7 |0 # CYRILLIC SMALL LETTER GHE + \xC8 |0 # CYRILLIC SMALL LETTER HA + \xC9 |0 # CYRILLIC SMALL LETTER I + \xCA |0 # CYRILLIC SMALL LETTER SHORT I + \xCB |0 # CYRILLIC SMALL LETTER KA + \xCC |0 # CYRILLIC SMALL LETTER EL + \xCD |0 # CYRILLIC SMALL LETTER EM + \xCE |0 # CYRILLIC SMALL LETTER EN + \xCF |0 # CYRILLIC SMALL LETTER O + \xD0 |0 # CYRILLIC SMALL LETTER PE + \xD1 |0 # CYRILLIC SMALL LETTER YA + \xD2 |0 # CYRILLIC SMALL LETTER ER + \xD3 |0 # CYRILLIC SMALL LETTER ES + \xD4 |0 # CYRILLIC SMALL LETTER TE + \xD5 |0 # CYRILLIC SMALL LETTER U + \xD6 |0 # CYRILLIC SMALL LETTER ZHE + \xD7 |0 # CYRILLIC SMALL LETTER VE + \xD8 |0 # CYRILLIC SMALL LETTER SOFT SIGN + \xD9 |0 # CYRILLIC SMALL LETTER YERU + \xDA |0 # CYRILLIC SMALL LETTER ZE + \xDB |0 # CYRILLIC SMALL LETTER SHA + \xDC |0 # CYRILLIC SMALL LETTER E + \xDD |0 # CYRILLIC SMALL LETTER SHCHA + \xDE |0 # CYRILLIC SMALL LETTER CHE + \xDF |0 # CYRILLIC SMALL LETTER HARD SIGN + \xE0 |0 # CYRILLIC CAPITAL LETTER YU + \xE1 |0 # CYRILLIC CAPITAL LETTER A + \xE2 |0 # CYRILLIC CAPITAL LETTER BE + \xE3 |0 # CYRILLIC CAPITAL LETTER TSE + \xE4 |0 # CYRILLIC CAPITAL LETTER DE + \xE5 |0 # CYRILLIC CAPITAL LETTER IE + \xE6 |0 # CYRILLIC CAPITAL LETTER EF + \xE7 |0 # CYRILLIC CAPITAL LETTER GHE + \xE8 |0 # CYRILLIC CAPITAL LETTER HA + \xE9 |0 # CYRILLIC CAPITAL LETTER I + \xEA |0 # CYRILLIC CAPITAL LETTER SHORT I + \xEB |0 # CYRILLIC CAPITAL LETTER KA + \xEC |0 # CYRILLIC CAPITAL LETTER EL + \xED |0 # CYRILLIC CAPITAL LETTER EM + \xEE |0 # CYRILLIC CAPITAL LETTER EN + \xEF |0 # CYRILLIC CAPITAL LETTER O + \xF0 |0 # CYRILLIC CAPITAL LETTER PE + \xF1 |0 # CYRILLIC CAPITAL LETTER YA + \xF2 |0 # CYRILLIC CAPITAL LETTER ER + \xF3 |0 # CYRILLIC CAPITAL LETTER ES + \xF4 |0 # CYRILLIC CAPITAL LETTER TE + \xF5 |0 # CYRILLIC CAPITAL LETTER U + \xF6 |0 # CYRILLIC CAPITAL LETTER ZHE + \xF7 |0 # CYRILLIC CAPITAL LETTER VE + \xF8 |0 # CYRILLIC CAPITAL LETTER SOFT SIGN + \xF9 |0 # CYRILLIC CAPITAL LETTER YERU + \xFA |0 # CYRILLIC CAPITAL LETTER ZE + \xFB |0 # CYRILLIC CAPITAL LETTER SHA + \xFC |0 # CYRILLIC CAPITAL LETTER E + \xFD |0 # CYRILLIC CAPITAL LETTER SHCHA + \xFE |0 # CYRILLIC CAPITAL LETTER CHE + \xFF |0 # CYRILLIC CAPITAL LETTER HARD SIGN +END CHARMAP diff --git a/devel/icu/files/patch-aa b/devel/icu/files/patch-aa new file mode 100644 index 000000000000..74bf6f6f09e1 --- /dev/null +++ b/devel/icu/files/patch-aa @@ -0,0 +1,16 @@ +--- source/Makefile.in Fri Jul 9 11:43:36 2004 ++++ source/Makefile.in Wed Nov 17 11:14:49 2004 +@@ -175,11 +175,13 @@ + $(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) $@ + $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@ ++ @chmod u+w $@ + @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 >> $@ + cat $(top_srcdir)/config/icu-config-bottom >> $@ + echo "# Rebuilt on "`date` >> $@ ++ @chmod u-w $@ + + config.status: $(srcdir)/configure $(srcdir)/common/unicode/uversion.h + @echo diff --git a/devel/icu/files/patch-ab b/devel/icu/files/patch-ab new file mode 100644 index 000000000000..c9ea034c4b38 --- /dev/null +++ b/devel/icu/files/patch-ab @@ -0,0 +1,255 @@ +--- source/configure Mon Nov 1 18:22:40 2004 ++++ source/configure Wed Nov 17 11:15:41 2004 +@@ -1929,248 +1929,7 @@ + if test $threads = true; then +- +- echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 +-echo "configure:1933: checking for pthread_attr_init in -lpthread" >&5 +-ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpthread $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" ++ echo "going to use ... ${PTHREAD_LIBS}" 1>&6 ++ echo "configure:1879: going to use ${PTHREAD_LIBS}" >&5 ++ LIBS="${PTHREAD_LIBS} $LIBS" ++ ICU_USE_THREADS=1 + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&6 +-fi +- +- if test $ac_cv_lib_pthread_pthread_attr_init = yes; then +- ICU_USE_THREADS=1 +- else +- +- +-echo $ac_n "checking for library containing pthread_mutex_destroy""... $ac_c" 1>&6 +-echo "configure:1985: checking for library containing pthread_mutex_destroy" >&5 +-if eval "test \"`echo '$''{'ac_cv_search_pthread_mutex_destroy'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_func_search_save_LIBS="$LIBS" +-ac_cv_search_pthread_mutex_destroy="no" +-for i in pthread pthreads c_r ; do +-LIBS="-l$i $ac_func_search_save_LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- ac_cv_search_pthread_mutex_destroy="-l$i" +-break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test "$ac_cv_search_pthread_mutex_destroy" = "no"; then +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- ac_cv_search_pthread_mutex_destroy="none required" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-fi +-LIBS="$ac_func_search_save_LIBS" +-fi +- +-echo "$ac_t""$ac_cv_search_pthread_mutex_destroy" 1>&6 +-if test "$ac_cv_search_pthread_mutex_destroy" != "no"; then +- test "$ac_cv_search_pthread_mutex_destroy" = "none required" || LIBS="$ac_cv_search_pthread_mutex_destroy $LIBS" +- +-else : +- +-fi +- +- if test "$ac_cv_search_pthread_mutex_destroy" != no; then +- ICU_USE_THREADS=1 +- else +- echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 +-echo "configure:2052: checking for pthread_mutex_init in -lpthread" >&5 +-ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpthread $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&6 +-fi +- +- if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then +- ICU_USE_THREADS=1 +- fi +- fi +- +- echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 +-echo "configure:2104: checking for pthread_mutex_lock" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char pthread_mutex_lock(); +- +-int main() { +- +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_pthread_mutex_lock) || defined (__stub___pthread_mutex_lock) +-choke me +-#else +-pthread_mutex_lock(); +-#endif +- +-; return 0; } +-EOF +-if { (eval echo configure:2132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_pthread_mutex_lock=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_pthread_mutex_lock=no" +-fi +-rm -f conftest* +-fi +- +-if eval "test \"`echo '$ac_cv_func_'pthread_mutex_lock`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- : +-else +- echo "$ac_t""no" 1>&6 +-fi +- +- +- if test $ac_cv_func_pthread_mutex_lock = yes; then +- ICU_USE_THREADS=1 +- fi +- case "${host}" in +- *-pc-cygwin*|*-pc-mingw*) +- if test "$ac_cv_prog_gcc" = no; then +- ICU_USE_THREADS=1 +- fi ;; +- *-*-hpux*) +- case "${icu_cv_host_frag}" in +- mh-hpux-acc) +- OLD_CXXFLAGS="${CXXFLAGS}" +- CXXFLAGS="${CXXFLAGS} -mt" +- if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then +- CXXFLAGS="${OLD_CXXFLAGS}" +- fi +- ;; +- esac +- ;; +- esac +- fi +-fi +- +- +- + diff --git a/devel/icu/files/patch-cc-flags b/devel/icu/files/patch-cc-flags new file mode 100644 index 000000000000..3e8f4112c276 --- /dev/null +++ b/devel/icu/files/patch-cc-flags @@ -0,0 +1,27 @@ +--- source/runConfigureICU Fri Jan 16 17:26:40 2004 ++++ source/runConfigureICU Mon Nov 15 11:05:50 2004 +@@ -289,7 +289,7 @@ + *BSD) +- THE_OS="BSD" ++ THE_OS="$platform" +- THE_COMP="the GNU C++" +- CC=gcc; export CC +- CXX=g++; export CXX ++ CC=${CC:=cc}; export CC ++ CXX=${CXX:=c++}; export CXX ++ THE_COMP="`$CC -v | fgrep -i ver`" # works with icc and gcc at least + ;; + QNX) +@@ -358,12 +358,4 @@ + 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 diff --git a/devel/icu/files/patch-convrtrs b/devel/icu/files/patch-convrtrs new file mode 100644 index 000000000000..645e5c44bba4 --- /dev/null +++ b/devel/icu/files/patch-convrtrs @@ -0,0 +1,10 @@ +--- source/data/mappings/convrtrs.txt Wed Sep 15 18:10:20 2004 ++++ source/data/mappings/convrtrs.txt Thu Sep 16 12:23:59 2004 +@@ -646,6 +646,7 @@ + ibm-868_P100-1995 { UTR22* } ibm-868 { IBM* } IBM868 { IANA* JAVA } CP868 { IANA MIME* JAVA* } 868 { JAVA } csIBM868 { IANA } cp-ar { IANA } # PC Urdu + ibm-869_P100-1995 { UTR22* } ibm-869 { IBM* } IBM869 { IANA* WINDOWS JAVA } cp869 { IANA MIME* JAVA* } 869 { IANA JAVA } cp-gr { IANA JAVA } csIBM869 { IANA JAVA } windows-869 { WINDOWS* } # PC Greek (w/o euro update) + ibm-878_P100-1996 { UTR22* } ibm-878 { IBM* } KOI8-R { IANA* MIME* JAVA* } koi8 { JAVA } csKOI8R { IANA JAVA } cp878 # Russian internet ++koi8-u { MIME* JAVA* } KOI8-RU { MIME JAVA } # Ukrainian KOI RFC2319 + ibm-901_P100-1999 { UTR22* } ibm-901 { IBM* } # PC Baltic (w/ euro update), update of ibm-921 + ibm-902_P100-1999 { UTR22* } ibm-902 { IBM* } # PC Estonian (w/ euro update), update of ibm-922 + ibm-922_P100-1999 { UTR22* } ibm-922 { IBM* JAVA } cp922 { MIME* JAVA* } 922 { JAVA } # PC Estonian (w/o euro update) diff --git a/devel/icu/files/patch-uk b/devel/icu/files/patch-uk new file mode 100644 index 000000000000..3e71cfcb37a7 --- /dev/null +++ b/devel/icu/files/patch-uk @@ -0,0 +1,17 @@ +--- source/data/rbnf/uk.txt Wed Jul 14 14:33:14 2004 ++++ source/data/rbnf/uk.txt Wed Nov 17 11:19:48 2004 +@@ -12,4 +12,6 @@ + + SpelloutRules { ++ "-x: \u043C\u0456\u043D\u0443\u0441 >>;\n" ++ "x.x: << \u043A\u043E\u043C\u0430 >>;\n" + "\u043D\u0443\u043B\u044C; \u043E\u0434\u0438\u043D; \u0434\u0432\u0430; \u0442\u0440\u0438; " + "\u0447\u043E\u0442\u0438\u0440\u0438; \u043F\u02bc\u044F\u0442\u044C; \u0448\u0456\u0441\u0442\u044C; " +@@ -48,5 +50,6 @@ + "2,000,000: << \u043C\u0456\u043B\u044C\u0439\u043E\u043D\u0438[ >>];\n" + "5,000,000: << \u043C\u0456\u043B\u044C\u0439\u043E\u043D\u0456\u0432[ >>];\n" +- "1,000,000,000: << \u043C\u0456\u043B\u044C\u044F\u0440\u0434[ >>];" ++ "1,000,000,000: << \u043C\u0456\u043B\u044C\u044F\u0440\u0434[ >>];\n" ++ "1,000,000,000,000: << \u0442\u0440\u0456\u043B\u043B\u0456\u043E\u043D[ >>];" + } + diff --git a/devel/icu/pkg-descr b/devel/icu/pkg-descr index 189b4277638c..3d4012191430 100644 --- a/devel/icu/pkg-descr +++ b/devel/icu/pkg-descr @@ -1,20 +1,9 @@ -The International Components for Unicode (ICU) is a C and C++ library that -provides robust and full-featured Unicode support on a wide variety of -platforms. The library provides: +The International Components for Unicode (ICU) is a C and C++ library +providing Unicode support (p.ex. character set conversions, locales, +normalization, transliteration, etc.). - Calendar support - Character set conversions - Collation (language-sensitive) - Date & time formatting - Locales (140+ supported) - Message catalogs (resources) - Message formatting - Normalization - Number & currency - formatting - Time zones - Transliteration - Word, line & sentence - breaks +More information on ICU can be found on the homepage +WWW: http://oss.software.ibm.com/icu/ -WWW: http://oss.software.ibm.com/developerworks/opensource/icu/project/index.html +- Bjoern A. Zeeb +bzeeb+freebsdports@zabbadoz.net diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist index fed697c2fcae..51c6b5defb3c 100644 --- a/devel/icu/pkg-plist +++ b/devel/icu/pkg-plist @@ -1,13 +1,42 @@ -etc/icu/convrtrs.txt -include/unicode/bidi.h +bin/derb +bin/genbrk +bin/gencnval +bin/genrb +bin/icu-config +bin/makeconv +bin/pkgdata +bin/uconv +sbin/decmn +sbin/genccode +sbin/gencmn +sbin/gennames +sbin/gennorm +sbin/genpname +sbin/genprops +sbin/gensprep +sbin/genuca +sbin/icuswap +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/LETypes.h +include/layout/LayoutEngine.h +include/layout/ParagraphLayout.h +include/layout/RunArrays.h +@dirrm include/layout include/unicode/brkiter.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/convert.h -include/unicode/cpdtrans.h +include/unicode/curramt.h +include/unicode/currunit.h include/unicode/datefmt.h include/unicode/dbbi.h include/unicode/dcfmtsym.h @@ -18,99 +47,131 @@ include/unicode/fieldpos.h include/unicode/fmtable.h include/unicode/format.h include/unicode/gregocal.h -include/unicode/hangjamo.h -include/unicode/hextouni.h -include/unicode/jamohang.h include/unicode/locid.h +include/unicode/loengine.h +include/unicode/measfmt.h +include/unicode/measunit.h +include/unicode/measure.h include/unicode/msgfmt.h include/unicode/normlzr.h -include/unicode/nultrans.h include/unicode/numfmt.h include/unicode/parseerr.h include/unicode/parsepos.h include/unicode/platform.h -include/unicode/pmacos.h -include/unicode/pos2.h -include/unicode/pos400.h include/unicode/putil.h include/unicode/pwin32.h include/unicode/rbbi.h -include/unicode/rbt.h +include/unicode/rbnf.h +include/unicode/regex.h include/unicode/rep.h include/unicode/resbund.h include/unicode/schriter.h -include/unicode/scsu.h +include/unicode/search.h include/unicode/simpletz.h include/unicode/smpdtfmt.h include/unicode/sortkey.h +include/unicode/strenum.h +include/unicode/stsearch.h +include/unicode/symtable.h include/unicode/tblcoll.h include/unicode/timezone.h include/unicode/translit.h include/unicode/ubidi.h include/unicode/ubrk.h include/unicode/ucal.h +include/unicode/ucat.h include/unicode/uchar.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/ucol.h +include/unicode/ucoleitr.h +include/unicode/uconfig.h +include/unicode/ucurr.h include/unicode/udat.h include/unicode/udata.h +include/unicode/udeprctd.h +include/unicode/udraft.h +include/unicode/uenum.h +include/unicode/uidna.h +include/unicode/uiter.h include/unicode/uloc.h +include/unicode/ulocdata.h include/unicode/umachine.h include/unicode/umisc.h include/unicode/umsg.h -include/unicode/unicode.h include/unicode/unifilt.h -include/unicode/unifltlg.h +include/unicode/unifunct.h +include/unicode/unimatch.h +include/unicode/unirepl.h include/unicode/uniset.h include/unicode/unistr.h -include/unicode/unitohex.h include/unicode/unorm.h include/unicode/unum.h +include/unicode/uobject.h +include/unicode/uobslete.h +include/unicode/uregex.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/usprep.h include/unicode/ustdio.h +include/unicode/ustream.h include/unicode/ustring.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 -lib/icu/1.7/Makefile.inc -lib/icu/1.7/icudata.so -lib/icu/1.7/libicudt17l.so -lib/libicui18n.a -lib/libicutoolutil.a -lib/libicuuc.a -lib/libustdio.a +include/unicode/uversion.h +@dirrm include/unicode +lib/icu/%%ICUVER%%/Makefile.inc lib/icu/current lib/icu/Makefile.inc -man/man5/cnvalias.dat.5 -man/man5/convrtrs.txt.5 -man/man8/makeconv.8 -man/man8/gencnval.8 -man/man8/genrb.8 -sbin/genccode -sbin/gencmn -sbin/gencnval -sbin/gennames -sbin/genprops -sbin/genrb -sbin/gentest -sbin/gentz -sbin/makeconv -sbin/pkgdata -share/icu/1.7/README -share/icu/1.7/config/mh-bsd-gcc -share/icu/mkinstalldirs -@dirrm etc/icu -@dirrm lib/icu/1.7 -@dirrm lib/icu -@dirrm share/icu/1.7/config -@dirrm share/icu/1.7 +lib/libsicudata.a +lib/libicudata.so.%%ICUMAJOR%%.0 +lib/libicudata.so +lib/libicudata.so.%%ICUMAJOR%% +lib/libsicuuc.a +lib/libicuuc.so.%%ICUMAJOR%%.0 +lib/libicuuc.so +lib/libicuuc.so.%%ICUMAJOR%% +lib/libsicui18n.a +lib/libicui18n.so.%%ICUMAJOR%%.0 +lib/libicui18n.so +lib/libicui18n.so.%%ICUMAJOR%% +lib/libsicule.a +lib/libicule.so.%%ICUMAJOR%%.0 +lib/libicule.so +lib/libicule.so.%%ICUMAJOR%% +lib/libsiculx.a +lib/libiculx.so.%%ICUMAJOR%%.0 +lib/libiculx.so +lib/libiculx.so.%%ICUMAJOR%% +lib/libsicuio.a +lib/libicuio.so.%%ICUMAJOR%%.0 +lib/libicuio.so +lib/libicuio.so.%%ICUMAJOR%% +lib/libsicutu.a +lib/libicutu.so.%%ICUMAJOR%%.0 +lib/libicutu.so.%%ICUMAJOR%% +lib/libicutu.so +share/icu/%%ICUVER%%/config/mh-bsd-gcc +share/icu/%%ICUVER%%/mkinstalldirs +share/icu/%%ICUVER%%/license.html +@dirrm share/icu/%%ICUVER%%/config +@dirrm share/icu/%%ICUVER%% @dirrm share/icu -@dirrm include/unicode +@dirrm lib/icu/%%ICUVER%% +@dirrm lib/icu diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile index ca96539232f1..54e3c1e0b44e 100644 --- a/devel/icu4/Makefile +++ b/devel/icu4/Makefile @@ -6,27 +6,82 @@ # PORTNAME= icu -PORTVERSION= 1.7 -PORTREVISION= 1 +PORTVERSION= 3.2 CATEGORIES= devel -MASTER_SITES= http://oss.software.ibm.com/developerworks/opensource/icu/project/download/${PORTVERSION}/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ftp://www-126.ibm.com/pub/icu/${PORTVERSION}/ +EXTRACT_SUFX= -d02.tgz MAINTAINER= ports@FreeBSD.org -COMMENT= International Components for Unicode (from IBM)(old version) +COMMENT= International Components for Unicode (from IBM) -WRKSRC= ${WRKDIR}/${PORTNAME}/source -GNU_CONFIGURE= yes -USE_GMAKE= yes +INSTALLS_SHLIB= yes +NO_FILTER_SHLIBS= yes -CONFIGURE_ARGS+=--disable-shared --enable-static -CONFIGURE_ENV= CXXFLAGS="-O3" -CONFIGURE_ENV+= CFLAGS="-O3" +WRKSRC= ${WRKDIR}/icu +ICUWRKSRC= ${WRKSRC}/source +CONFIGURE_WRKSRC= ${ICUWRKSRC} +BUILD_WRKSRC= ${ICUWRKSRC} +INSTALL_WRKSRC= ${ICUWRKSRC} -.include +GNU_CONFIGURE= yes +CONFIGURE_SCRIPT= runConfigureICU +CONFIGURE_ARGS+= ${OPSYS} +CONFIGURE_ARGS+= --enable-shared +CONFIGURE_ARGS+= --enable-static +CONFIGURE_ARGS+= --enable-samples=no --enable-tests=yes +.if defined(NO_THREADS) +CONFIGURE_ARGS+= --enable-threads=no +.else +CONFIGURE_ENV+= THREADSCPPFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCXXFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" +.endif +USE_GMAKE= yes +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CC="${CC}" CXX="${CXX}" -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" -IGNORE= "does not build on this architecture, use devel/icu2 instead" +MAN1+= gencnval.1 +MAN1+= genrb.1 +MAN1+= icu-config.1 +MAN1+= makeconv.1 +MAN1+= pkgdata.1 +MAN1+= uconv.1 +MAN8+= decmn.8 +MAN8+= genccode.8 +MAN8+= gencmn.8 +MAN8+= gennames.8 +MAN8+= gennorm.8 +MAN8+= genprops.8 +MAN8+= gensprep.8 +MAN8+= genuca.8 + +ICUMAJOR= ${PORTVERSION:S/.//:R} +PLIST_SUB+= ICUMAJOR=${ICUMAJOR} +PLIST_SUB+= ICUVER=${PORTVERSION} + +pre-fetch: +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) + # + # You may use the following build options by defining + # them on the command line with -D + # + # NO_THREADS do not build a thread enabled library + # .endif -.include +pre-patch: +# VPATH does not work due to IBM's mistake: + ${LN} -s ${FILESDIR}/*.ucm ${WRKSRC}/source/data/mappings/ + @for l in ${FILESDIR}/*.ucm ; do \ + echo UCM_SOURCE_LOCAL+=`basename $$l` >> \ + ${WRKSRC}/source/data/mappings/ucmlocal.mk ; \ + done + +post-build test: + ${GMAKE} -C ${ICUWRKSRC}/test +.for t in intltest iotest cintltst + cd ${ICUWRKSRC}/test/$t && ${SETENV} \ + LD_LIBRARY_PATH=${ICUWRKSRC}/lib:${ICUWRKSRC}/tools/ctestfw ./$t +.endfor + +.include diff --git a/devel/icu4/distinfo b/devel/icu4/distinfo index b097074adaaf..f6608cb965d4 100644 --- a/devel/icu4/distinfo +++ b/devel/icu4/distinfo @@ -1,2 +1,2 @@ -MD5 (icu-1.7.tgz) = 8f58c2087ffd9431ab6ad27fce2ba092 -SIZE (icu-1.7.tgz) = 6089550 +MD5 (icu-3.2-d02.tgz) = 4043b99a9c7f2fa794c16627968d654d +SIZE (icu-3.2-d02.tgz) = 9589086 diff --git a/devel/icu4/files/koi8-u.ucm b/devel/icu4/files/koi8-u.ucm new file mode 100644 index 000000000000..b81307a6c5eb --- /dev/null +++ b/devel/icu4/files/koi8-u.ucm @@ -0,0 +1,272 @@ +# +# $Id: koi8-u.ucm,v 2.0 2004/05/16 20:55:26 dankogai Exp $ +# +# Written $Id: koi8-u.ucm,v 2.0 2004/05/16 20:55:26 dankogai Exp $ +# ./compile -n koi8-u -o Encode/koi8-u.ucm Encode/koi8-u.enc + + "koi8-u" + "AXXXX" + 1 + 1 + "SBCS" + \x1A + "ASCII" + +CHARMAP + \x00 |0 # + \x01 |0 # + \x02 |0 # + \x03 |0 # + \x04 |0 # + \x05 |0 # + \x06 |0 # + \x07 |0 # + \x08 |0 # + \x09 |0 # + \x0A |0 # + \x0B |0 # + \x0C |0 # + \x0D |0 # + \x0E |0 # + \x0F |0 # + \x10 |0 # + \x11 |0 # + \x12 |0 # + \x13 |0 # + \x14 |0 # + \x15 |0 # + \x16 |0 # + \x17 |0 # + \x18 |0 # + \x19 |0 # + \x1A |0 # + \x1B |0 # + \x1C |0 # + \x1D |0 # + \x1E |0 # + \x1F |0 # + \x20 |0 # SPACE + \x21 |0 # EXCLAMATION MARK + \x22 |0 # QUOTATION MARK + \x23 |0 # NUMBER SIGN + \x24 |0 # DOLLAR SIGN + \x25 |0 # PERCENT SIGN + \x26 |0 # AMPERSAND + \x27 |0 # APOSTROPHE + \x28 |0 # LEFT PARENTHESIS + \x29 |0 # RIGHT PARENTHESIS + \x2A |0 # ASTERISK + \x2B |0 # PLUS SIGN + \x2C |0 # COMMA + \x2D |0 # HYPHEN-MINUS + \x2E |0 # FULL STOP + \x2F |0 # SOLIDUS + \x30 |0 # DIGIT ZERO + \x31 |0 # DIGIT ONE + \x32 |0 # DIGIT TWO + \x33 |0 # DIGIT THREE + \x34 |0 # DIGIT FOUR + \x35 |0 # DIGIT FIVE + \x36 |0 # DIGIT SIX + \x37 |0 # DIGIT SEVEN + \x38 |0 # DIGIT EIGHT + \x39 |0 # DIGIT NINE + \x3A |0 # COLON + \x3B |0 # SEMICOLON + \x3C |0 # LESS-THAN SIGN + \x3D |0 # EQUALS SIGN + \x3E |0 # GREATER-THAN SIGN + \x3F |0 # QUESTION MARK + \x40 |0 # COMMERCIAL AT + \x41 |0 # LATIN CAPITAL LETTER A + \x42 |0 # LATIN CAPITAL LETTER B + \x43 |0 # LATIN CAPITAL LETTER C + \x44 |0 # LATIN CAPITAL LETTER D + \x45 |0 # LATIN CAPITAL LETTER E + \x46 |0 # LATIN CAPITAL LETTER F + \x47 |0 # LATIN CAPITAL LETTER G + \x48 |0 # LATIN CAPITAL LETTER H + \x49 |0 # LATIN CAPITAL LETTER I + \x4A |0 # LATIN CAPITAL LETTER J + \x4B |0 # LATIN CAPITAL LETTER K + \x4C |0 # LATIN CAPITAL LETTER L + \x4D |0 # LATIN CAPITAL LETTER M + \x4E |0 # LATIN CAPITAL LETTER N + \x4F |0 # LATIN CAPITAL LETTER O + \x50 |0 # LATIN CAPITAL LETTER P + \x51 |0 # LATIN CAPITAL LETTER Q + \x52 |0 # LATIN CAPITAL LETTER R + \x53 |0 # LATIN CAPITAL LETTER S + \x54 |0 # LATIN CAPITAL LETTER T + \x55 |0 # LATIN CAPITAL LETTER U + \x56 |0 # LATIN CAPITAL LETTER V + \x57 |0 # LATIN CAPITAL LETTER W + \x58 |0 # LATIN CAPITAL LETTER X + \x59 |0 # LATIN CAPITAL LETTER Y + \x5A |0 # LATIN CAPITAL LETTER Z + \x5B |0 # LEFT SQUARE BRACKET + \x5C |0 # REVERSE SOLIDUS + \x5D |0 # RIGHT SQUARE BRACKET + \x5E |0 # CIRCUMFLEX ACCENT + \x5F |0 # LOW LINE + \x60 |0 # GRAVE ACCENT + \x61 |0 # LATIN SMALL LETTER A + \x62 |0 # LATIN SMALL LETTER B + \x63 |0 # LATIN SMALL LETTER C + \x64 |0 # LATIN SMALL LETTER D + \x65 |0 # LATIN SMALL LETTER E + \x66 |0 # LATIN SMALL LETTER F + \x67 |0 # LATIN SMALL LETTER G + \x68 |0 # LATIN SMALL LETTER H + \x69 |0 # LATIN SMALL LETTER I + \x6A |0 # LATIN SMALL LETTER J + \x6B |0 # LATIN SMALL LETTER K + \x6C |0 # LATIN SMALL LETTER L + \x6D |0 # LATIN SMALL LETTER M + \x6E |0 # LATIN SMALL LETTER N + \x6F |0 # LATIN SMALL LETTER O + \x70 |0 # LATIN SMALL LETTER P + \x71 |0 # LATIN SMALL LETTER Q + \x72 |0 # LATIN SMALL LETTER R + \x73 |0 # LATIN SMALL LETTER S + \x74 |0 # LATIN SMALL LETTER T + \x75 |0 # LATIN SMALL LETTER U + \x76 |0 # LATIN SMALL LETTER V + \x77 |0 # LATIN SMALL LETTER W + \x78 |0 # LATIN SMALL LETTER X + \x79 |0 # LATIN SMALL LETTER Y + \x7A |0 # LATIN SMALL LETTER Z + \x7B |0 # LEFT CURLY BRACKET + \x7C |0 # VERTICAL LINE + \x7D |0 # RIGHT CURLY BRACKET + \x7E |0 # TILDE + \x7F |0 # + \x80 |0 # BOX DRAWINGS LIGHT HORIZONTAL + \x81 |0 # BOX DRAWINGS LIGHT VERTICAL + \x82 |0 # BOX DRAWINGS LIGHT DOWN AND RIGHT + \x83 |0 # BOX DRAWINGS LIGHT DOWN AND LEFT + \x84 |0 # BOX DRAWINGS LIGHT UP AND RIGHT + \x85 |0 # BOX DRAWINGS LIGHT UP AND LEFT + \x86 |0 # BOX DRAWINGS LIGHT VERTICAL AND RIGHT + \x87 |0 # BOX DRAWINGS LIGHT VERTICAL AND LEFT + \x88 |0 # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL + \x89 |0 # BOX DRAWINGS LIGHT UP AND HORIZONTAL + \x8A |0 # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL + \x8B |0 # UPPER HALF BLOCK + \x8C |0 # LOWER HALF BLOCK + \x8D |0 # FULL BLOCK + \x8E |0 # LEFT HALF BLOCK + \x8F |0 # RIGHT HALF BLOCK + \x90 |0 # LIGHT SHADE + \x91 |0 # MEDIUM SHADE + \x92 |0 # DARK SHADE + \x93 |0 # TOP HALF INTEGRAL + \x94 |0 # BLACK SQUARE + \x95 |0 # BULLET + \x96 |0 # SQUARE ROOT + \x97 |0 # ALMOST EQUAL TO + \x98 |0 # LESS-THAN OR EQUAL TO + \x99 |0 # GREATER-THAN OR EQUAL TO + \x9A |0 # NO-BREAK SPACE + \x9B |0 # BOTTOM HALF INTEGRAL + \x9C |0 # DEGREE SIGN + \x9D |0 # SUPERSCRIPT TWO + \x9E |0 # MIDDLE DOT + \x9F |0 # DIVISION SIGN + \xA0 |0 # BOX DRAWINGS DOUBLE HORIZONTAL + \xA1 |0 # BOX DRAWINGS DOUBLE VERTICAL + \xA2 |0 # BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE + \xA3 |0 # CYRILLIC SMALL LETTER IO + \xA4 |0 # CYRILLIC SMALL LETTER UKRAINIAN IE + \xA5 |0 # BOX DRAWINGS DOUBLE DOWN AND RIGHT + \xA6 |0 # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I + \xA7 |0 # CYRILLIC SMALL LETTER YI + \xA8 |0 # BOX DRAWINGS DOUBLE DOWN AND LEFT + \xA9 |0 # BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE + \xAA |0 # BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE + \xAB |0 # BOX DRAWINGS DOUBLE UP AND RIGHT + \xAC |0 # BOX DRAWINGS UP SINGLE AND LEFT DOUBLE + \xAD |0 # CYRILLIC SMALL LETTER GHE WITH UPTURN + \xAE |0 # BOX DRAWINGS DOUBLE UP AND LEFT + \xAF |0 # BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE + \xB0 |0 # BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE + \xB1 |0 # BOX DRAWINGS DOUBLE VERTICAL AND RIGHT + \xB2 |0 # BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE + \xB3 |0 # CYRILLIC CAPITAL LETTER IO + \xB4 |0 # CYRILLIC CAPITAL LETTER UKRAINIAN IE + \xB5 |0 # BOX DRAWINGS DOUBLE VERTICAL AND LEFT + \xB6 |0 # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I + \xB7 |0 # CYRILLIC CAPITAL LETTER YI + \xB8 |0 # BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL + \xB9 |0 # BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE + \xBA |0 # BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE + \xBB |0 # BOX DRAWINGS DOUBLE UP AND HORIZONTAL + \xBC |0 # BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE + \xBD |0 # CYRILLIC CAPITAL LETTER GHE WITH UPTURN + \xBE |0 # BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL + \xBF |0 # COPYRIGHT SIGN + \xC0 |0 # CYRILLIC SMALL LETTER YU + \xC1 |0 # CYRILLIC SMALL LETTER A + \xC2 |0 # CYRILLIC SMALL LETTER BE + \xC3 |0 # CYRILLIC SMALL LETTER TSE + \xC4 |0 # CYRILLIC SMALL LETTER DE + \xC5 |0 # CYRILLIC SMALL LETTER IE + \xC6 |0 # CYRILLIC SMALL LETTER EF + \xC7 |0 # CYRILLIC SMALL LETTER GHE + \xC8 |0 # CYRILLIC SMALL LETTER HA + \xC9 |0 # CYRILLIC SMALL LETTER I + \xCA |0 # CYRILLIC SMALL LETTER SHORT I + \xCB |0 # CYRILLIC SMALL LETTER KA + \xCC |0 # CYRILLIC SMALL LETTER EL + \xCD |0 # CYRILLIC SMALL LETTER EM + \xCE |0 # CYRILLIC SMALL LETTER EN + \xCF |0 # CYRILLIC SMALL LETTER O + \xD0 |0 # CYRILLIC SMALL LETTER PE + \xD1 |0 # CYRILLIC SMALL LETTER YA + \xD2 |0 # CYRILLIC SMALL LETTER ER + \xD3 |0 # CYRILLIC SMALL LETTER ES + \xD4 |0 # CYRILLIC SMALL LETTER TE + \xD5 |0 # CYRILLIC SMALL LETTER U + \xD6 |0 # CYRILLIC SMALL LETTER ZHE + \xD7 |0 # CYRILLIC SMALL LETTER VE + \xD8 |0 # CYRILLIC SMALL LETTER SOFT SIGN + \xD9 |0 # CYRILLIC SMALL LETTER YERU + \xDA |0 # CYRILLIC SMALL LETTER ZE + \xDB |0 # CYRILLIC SMALL LETTER SHA + \xDC |0 # CYRILLIC SMALL LETTER E + \xDD |0 # CYRILLIC SMALL LETTER SHCHA + \xDE |0 # CYRILLIC SMALL LETTER CHE + \xDF |0 # CYRILLIC SMALL LETTER HARD SIGN + \xE0 |0 # CYRILLIC CAPITAL LETTER YU + \xE1 |0 # CYRILLIC CAPITAL LETTER A + \xE2 |0 # CYRILLIC CAPITAL LETTER BE + \xE3 |0 # CYRILLIC CAPITAL LETTER TSE + \xE4 |0 # CYRILLIC CAPITAL LETTER DE + \xE5 |0 # CYRILLIC CAPITAL LETTER IE + \xE6 |0 # CYRILLIC CAPITAL LETTER EF + \xE7 |0 # CYRILLIC CAPITAL LETTER GHE + \xE8 |0 # CYRILLIC CAPITAL LETTER HA + \xE9 |0 # CYRILLIC CAPITAL LETTER I + \xEA |0 # CYRILLIC CAPITAL LETTER SHORT I + \xEB |0 # CYRILLIC CAPITAL LETTER KA + \xEC |0 # CYRILLIC CAPITAL LETTER EL + \xED |0 # CYRILLIC CAPITAL LETTER EM + \xEE |0 # CYRILLIC CAPITAL LETTER EN + \xEF |0 # CYRILLIC CAPITAL LETTER O + \xF0 |0 # CYRILLIC CAPITAL LETTER PE + \xF1 |0 # CYRILLIC CAPITAL LETTER YA + \xF2 |0 # CYRILLIC CAPITAL LETTER ER + \xF3 |0 # CYRILLIC CAPITAL LETTER ES + \xF4 |0 # CYRILLIC CAPITAL LETTER TE + \xF5 |0 # CYRILLIC CAPITAL LETTER U + \xF6 |0 # CYRILLIC CAPITAL LETTER ZHE + \xF7 |0 # CYRILLIC CAPITAL LETTER VE + \xF8 |0 # CYRILLIC CAPITAL LETTER SOFT SIGN + \xF9 |0 # CYRILLIC CAPITAL LETTER YERU + \xFA |0 # CYRILLIC CAPITAL LETTER ZE + \xFB |0 # CYRILLIC CAPITAL LETTER SHA + \xFC |0 # CYRILLIC CAPITAL LETTER E + \xFD |0 # CYRILLIC CAPITAL LETTER SHCHA + \xFE |0 # CYRILLIC CAPITAL LETTER CHE + \xFF |0 # CYRILLIC CAPITAL LETTER HARD SIGN +END CHARMAP diff --git a/devel/icu4/files/patch-aa b/devel/icu4/files/patch-aa new file mode 100644 index 000000000000..74bf6f6f09e1 --- /dev/null +++ b/devel/icu4/files/patch-aa @@ -0,0 +1,16 @@ +--- source/Makefile.in Fri Jul 9 11:43:36 2004 ++++ source/Makefile.in Wed Nov 17 11:14:49 2004 +@@ -175,11 +175,13 @@ + $(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) $@ + $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@ ++ @chmod u+w $@ + @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 >> $@ + cat $(top_srcdir)/config/icu-config-bottom >> $@ + echo "# Rebuilt on "`date` >> $@ ++ @chmod u-w $@ + + config.status: $(srcdir)/configure $(srcdir)/common/unicode/uversion.h + @echo diff --git a/devel/icu4/files/patch-ab b/devel/icu4/files/patch-ab new file mode 100644 index 000000000000..c9ea034c4b38 --- /dev/null +++ b/devel/icu4/files/patch-ab @@ -0,0 +1,255 @@ +--- source/configure Mon Nov 1 18:22:40 2004 ++++ source/configure Wed Nov 17 11:15:41 2004 +@@ -1929,248 +1929,7 @@ + if test $threads = true; then +- +- echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 +-echo "configure:1933: checking for pthread_attr_init in -lpthread" >&5 +-ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpthread $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" ++ echo "going to use ... ${PTHREAD_LIBS}" 1>&6 ++ echo "configure:1879: going to use ${PTHREAD_LIBS}" >&5 ++ LIBS="${PTHREAD_LIBS} $LIBS" ++ ICU_USE_THREADS=1 + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&6 +-fi +- +- if test $ac_cv_lib_pthread_pthread_attr_init = yes; then +- ICU_USE_THREADS=1 +- else +- +- +-echo $ac_n "checking for library containing pthread_mutex_destroy""... $ac_c" 1>&6 +-echo "configure:1985: checking for library containing pthread_mutex_destroy" >&5 +-if eval "test \"`echo '$''{'ac_cv_search_pthread_mutex_destroy'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_func_search_save_LIBS="$LIBS" +-ac_cv_search_pthread_mutex_destroy="no" +-for i in pthread pthreads c_r ; do +-LIBS="-l$i $ac_func_search_save_LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- ac_cv_search_pthread_mutex_destroy="-l$i" +-break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test "$ac_cv_search_pthread_mutex_destroy" = "no"; then +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- ac_cv_search_pthread_mutex_destroy="none required" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-fi +-LIBS="$ac_func_search_save_LIBS" +-fi +- +-echo "$ac_t""$ac_cv_search_pthread_mutex_destroy" 1>&6 +-if test "$ac_cv_search_pthread_mutex_destroy" != "no"; then +- test "$ac_cv_search_pthread_mutex_destroy" = "none required" || LIBS="$ac_cv_search_pthread_mutex_destroy $LIBS" +- +-else : +- +-fi +- +- if test "$ac_cv_search_pthread_mutex_destroy" != no; then +- ICU_USE_THREADS=1 +- else +- echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 +-echo "configure:2052: checking for pthread_mutex_init in -lpthread" >&5 +-ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpthread $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&6 +-fi +- +- if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then +- ICU_USE_THREADS=1 +- fi +- fi +- +- echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 +-echo "configure:2104: checking for pthread_mutex_lock" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char pthread_mutex_lock(); +- +-int main() { +- +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_pthread_mutex_lock) || defined (__stub___pthread_mutex_lock) +-choke me +-#else +-pthread_mutex_lock(); +-#endif +- +-; return 0; } +-EOF +-if { (eval echo configure:2132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_pthread_mutex_lock=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_pthread_mutex_lock=no" +-fi +-rm -f conftest* +-fi +- +-if eval "test \"`echo '$ac_cv_func_'pthread_mutex_lock`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- : +-else +- echo "$ac_t""no" 1>&6 +-fi +- +- +- if test $ac_cv_func_pthread_mutex_lock = yes; then +- ICU_USE_THREADS=1 +- fi +- case "${host}" in +- *-pc-cygwin*|*-pc-mingw*) +- if test "$ac_cv_prog_gcc" = no; then +- ICU_USE_THREADS=1 +- fi ;; +- *-*-hpux*) +- case "${icu_cv_host_frag}" in +- mh-hpux-acc) +- OLD_CXXFLAGS="${CXXFLAGS}" +- CXXFLAGS="${CXXFLAGS} -mt" +- if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then +- CXXFLAGS="${OLD_CXXFLAGS}" +- fi +- ;; +- esac +- ;; +- esac +- fi +-fi +- +- +- + diff --git a/devel/icu4/files/patch-cc-flags b/devel/icu4/files/patch-cc-flags new file mode 100644 index 000000000000..3e8f4112c276 --- /dev/null +++ b/devel/icu4/files/patch-cc-flags @@ -0,0 +1,27 @@ +--- source/runConfigureICU Fri Jan 16 17:26:40 2004 ++++ source/runConfigureICU Mon Nov 15 11:05:50 2004 +@@ -289,7 +289,7 @@ + *BSD) +- THE_OS="BSD" ++ THE_OS="$platform" +- THE_COMP="the GNU C++" +- CC=gcc; export CC +- CXX=g++; export CXX ++ CC=${CC:=cc}; export CC ++ CXX=${CXX:=c++}; export CXX ++ THE_COMP="`$CC -v | fgrep -i ver`" # works with icc and gcc at least + ;; + QNX) +@@ -358,12 +358,4 @@ + 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 diff --git a/devel/icu4/files/patch-convrtrs b/devel/icu4/files/patch-convrtrs new file mode 100644 index 000000000000..645e5c44bba4 --- /dev/null +++ b/devel/icu4/files/patch-convrtrs @@ -0,0 +1,10 @@ +--- source/data/mappings/convrtrs.txt Wed Sep 15 18:10:20 2004 ++++ source/data/mappings/convrtrs.txt Thu Sep 16 12:23:59 2004 +@@ -646,6 +646,7 @@ + ibm-868_P100-1995 { UTR22* } ibm-868 { IBM* } IBM868 { IANA* JAVA } CP868 { IANA MIME* JAVA* } 868 { JAVA } csIBM868 { IANA } cp-ar { IANA } # PC Urdu + ibm-869_P100-1995 { UTR22* } ibm-869 { IBM* } IBM869 { IANA* WINDOWS JAVA } cp869 { IANA MIME* JAVA* } 869 { IANA JAVA } cp-gr { IANA JAVA } csIBM869 { IANA JAVA } windows-869 { WINDOWS* } # PC Greek (w/o euro update) + ibm-878_P100-1996 { UTR22* } ibm-878 { IBM* } KOI8-R { IANA* MIME* JAVA* } koi8 { JAVA } csKOI8R { IANA JAVA } cp878 # Russian internet ++koi8-u { MIME* JAVA* } KOI8-RU { MIME JAVA } # Ukrainian KOI RFC2319 + ibm-901_P100-1999 { UTR22* } ibm-901 { IBM* } # PC Baltic (w/ euro update), update of ibm-921 + ibm-902_P100-1999 { UTR22* } ibm-902 { IBM* } # PC Estonian (w/ euro update), update of ibm-922 + ibm-922_P100-1999 { UTR22* } ibm-922 { IBM* JAVA } cp922 { MIME* JAVA* } 922 { JAVA } # PC Estonian (w/o euro update) diff --git a/devel/icu4/files/patch-uk b/devel/icu4/files/patch-uk new file mode 100644 index 000000000000..3e71cfcb37a7 --- /dev/null +++ b/devel/icu4/files/patch-uk @@ -0,0 +1,17 @@ +--- source/data/rbnf/uk.txt Wed Jul 14 14:33:14 2004 ++++ source/data/rbnf/uk.txt Wed Nov 17 11:19:48 2004 +@@ -12,4 +12,6 @@ + + SpelloutRules { ++ "-x: \u043C\u0456\u043D\u0443\u0441 >>;\n" ++ "x.x: << \u043A\u043E\u043C\u0430 >>;\n" + "\u043D\u0443\u043B\u044C; \u043E\u0434\u0438\u043D; \u0434\u0432\u0430; \u0442\u0440\u0438; " + "\u0447\u043E\u0442\u0438\u0440\u0438; \u043F\u02bc\u044F\u0442\u044C; \u0448\u0456\u0441\u0442\u044C; " +@@ -48,5 +50,6 @@ + "2,000,000: << \u043C\u0456\u043B\u044C\u0439\u043E\u043D\u0438[ >>];\n" + "5,000,000: << \u043C\u0456\u043B\u044C\u0439\u043E\u043D\u0456\u0432[ >>];\n" +- "1,000,000,000: << \u043C\u0456\u043B\u044C\u044F\u0440\u0434[ >>];" ++ "1,000,000,000: << \u043C\u0456\u043B\u044C\u044F\u0440\u0434[ >>];\n" ++ "1,000,000,000,000: << \u0442\u0440\u0456\u043B\u043B\u0456\u043E\u043D[ >>];" + } + diff --git a/devel/icu4/pkg-descr b/devel/icu4/pkg-descr index 189b4277638c..3d4012191430 100644 --- a/devel/icu4/pkg-descr +++ b/devel/icu4/pkg-descr @@ -1,20 +1,9 @@ -The International Components for Unicode (ICU) is a C and C++ library that -provides robust and full-featured Unicode support on a wide variety of -platforms. The library provides: +The International Components for Unicode (ICU) is a C and C++ library +providing Unicode support (p.ex. character set conversions, locales, +normalization, transliteration, etc.). - Calendar support - Character set conversions - Collation (language-sensitive) - Date & time formatting - Locales (140+ supported) - Message catalogs (resources) - Message formatting - Normalization - Number & currency - formatting - Time zones - Transliteration - Word, line & sentence - breaks +More information on ICU can be found on the homepage +WWW: http://oss.software.ibm.com/icu/ -WWW: http://oss.software.ibm.com/developerworks/opensource/icu/project/index.html +- Bjoern A. Zeeb +bzeeb+freebsdports@zabbadoz.net diff --git a/devel/icu4/pkg-plist b/devel/icu4/pkg-plist index fed697c2fcae..51c6b5defb3c 100644 --- a/devel/icu4/pkg-plist +++ b/devel/icu4/pkg-plist @@ -1,13 +1,42 @@ -etc/icu/convrtrs.txt -include/unicode/bidi.h +bin/derb +bin/genbrk +bin/gencnval +bin/genrb +bin/icu-config +bin/makeconv +bin/pkgdata +bin/uconv +sbin/decmn +sbin/genccode +sbin/gencmn +sbin/gennames +sbin/gennorm +sbin/genpname +sbin/genprops +sbin/gensprep +sbin/genuca +sbin/icuswap +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/LETypes.h +include/layout/LayoutEngine.h +include/layout/ParagraphLayout.h +include/layout/RunArrays.h +@dirrm include/layout include/unicode/brkiter.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/convert.h -include/unicode/cpdtrans.h +include/unicode/curramt.h +include/unicode/currunit.h include/unicode/datefmt.h include/unicode/dbbi.h include/unicode/dcfmtsym.h @@ -18,99 +47,131 @@ include/unicode/fieldpos.h include/unicode/fmtable.h include/unicode/format.h include/unicode/gregocal.h -include/unicode/hangjamo.h -include/unicode/hextouni.h -include/unicode/jamohang.h include/unicode/locid.h +include/unicode/loengine.h +include/unicode/measfmt.h +include/unicode/measunit.h +include/unicode/measure.h include/unicode/msgfmt.h include/unicode/normlzr.h -include/unicode/nultrans.h include/unicode/numfmt.h include/unicode/parseerr.h include/unicode/parsepos.h include/unicode/platform.h -include/unicode/pmacos.h -include/unicode/pos2.h -include/unicode/pos400.h include/unicode/putil.h include/unicode/pwin32.h include/unicode/rbbi.h -include/unicode/rbt.h +include/unicode/rbnf.h +include/unicode/regex.h include/unicode/rep.h include/unicode/resbund.h include/unicode/schriter.h -include/unicode/scsu.h +include/unicode/search.h include/unicode/simpletz.h include/unicode/smpdtfmt.h include/unicode/sortkey.h +include/unicode/strenum.h +include/unicode/stsearch.h +include/unicode/symtable.h include/unicode/tblcoll.h include/unicode/timezone.h include/unicode/translit.h include/unicode/ubidi.h include/unicode/ubrk.h include/unicode/ucal.h +include/unicode/ucat.h include/unicode/uchar.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/ucol.h +include/unicode/ucoleitr.h +include/unicode/uconfig.h +include/unicode/ucurr.h include/unicode/udat.h include/unicode/udata.h +include/unicode/udeprctd.h +include/unicode/udraft.h +include/unicode/uenum.h +include/unicode/uidna.h +include/unicode/uiter.h include/unicode/uloc.h +include/unicode/ulocdata.h include/unicode/umachine.h include/unicode/umisc.h include/unicode/umsg.h -include/unicode/unicode.h include/unicode/unifilt.h -include/unicode/unifltlg.h +include/unicode/unifunct.h +include/unicode/unimatch.h +include/unicode/unirepl.h include/unicode/uniset.h include/unicode/unistr.h -include/unicode/unitohex.h include/unicode/unorm.h include/unicode/unum.h +include/unicode/uobject.h +include/unicode/uobslete.h +include/unicode/uregex.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/usprep.h include/unicode/ustdio.h +include/unicode/ustream.h include/unicode/ustring.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 -lib/icu/1.7/Makefile.inc -lib/icu/1.7/icudata.so -lib/icu/1.7/libicudt17l.so -lib/libicui18n.a -lib/libicutoolutil.a -lib/libicuuc.a -lib/libustdio.a +include/unicode/uversion.h +@dirrm include/unicode +lib/icu/%%ICUVER%%/Makefile.inc lib/icu/current lib/icu/Makefile.inc -man/man5/cnvalias.dat.5 -man/man5/convrtrs.txt.5 -man/man8/makeconv.8 -man/man8/gencnval.8 -man/man8/genrb.8 -sbin/genccode -sbin/gencmn -sbin/gencnval -sbin/gennames -sbin/genprops -sbin/genrb -sbin/gentest -sbin/gentz -sbin/makeconv -sbin/pkgdata -share/icu/1.7/README -share/icu/1.7/config/mh-bsd-gcc -share/icu/mkinstalldirs -@dirrm etc/icu -@dirrm lib/icu/1.7 -@dirrm lib/icu -@dirrm share/icu/1.7/config -@dirrm share/icu/1.7 +lib/libsicudata.a +lib/libicudata.so.%%ICUMAJOR%%.0 +lib/libicudata.so +lib/libicudata.so.%%ICUMAJOR%% +lib/libsicuuc.a +lib/libicuuc.so.%%ICUMAJOR%%.0 +lib/libicuuc.so +lib/libicuuc.so.%%ICUMAJOR%% +lib/libsicui18n.a +lib/libicui18n.so.%%ICUMAJOR%%.0 +lib/libicui18n.so +lib/libicui18n.so.%%ICUMAJOR%% +lib/libsicule.a +lib/libicule.so.%%ICUMAJOR%%.0 +lib/libicule.so +lib/libicule.so.%%ICUMAJOR%% +lib/libsiculx.a +lib/libiculx.so.%%ICUMAJOR%%.0 +lib/libiculx.so +lib/libiculx.so.%%ICUMAJOR%% +lib/libsicuio.a +lib/libicuio.so.%%ICUMAJOR%%.0 +lib/libicuio.so +lib/libicuio.so.%%ICUMAJOR%% +lib/libsicutu.a +lib/libicutu.so.%%ICUMAJOR%%.0 +lib/libicutu.so.%%ICUMAJOR%% +lib/libicutu.so +share/icu/%%ICUVER%%/config/mh-bsd-gcc +share/icu/%%ICUVER%%/mkinstalldirs +share/icu/%%ICUVER%%/license.html +@dirrm share/icu/%%ICUVER%%/config +@dirrm share/icu/%%ICUVER%% @dirrm share/icu -@dirrm include/unicode +@dirrm lib/icu/%%ICUVER%% +@dirrm lib/icu