From a15ea9bf13327ac7307e6e958980256e57853872 Mon Sep 17 00:00:00 2001 From: Mikhail Teterin Date: Thu, 20 Oct 2005 13:27:18 +0000 Subject: Update from 3.2 to 3.4. Enable full testing -- the previously hanging test has been modified by the vendor. --- devel/icu/Makefile | 78 ++++-------- devel/icu/distinfo | 4 +- devel/icu/files/koi8-u.ucm | 272 ---------------------------------------- devel/icu/files/patch-aa | 4 +- devel/icu/files/patch-ab | 255 ------------------------------------- devel/icu/files/patch-cc-flags | 4 +- devel/icu/files/patch-convrtrs | 10 -- devel/icu/files/patch-uk | 17 --- devel/icu/pkg-plist | 9 +- devel/icu4/Makefile | 78 ++++-------- devel/icu4/distinfo | 4 +- devel/icu4/files/koi8-u.ucm | 272 ---------------------------------------- devel/icu4/files/patch-aa | 4 +- devel/icu4/files/patch-ab | 255 ------------------------------------- devel/icu4/files/patch-cc-flags | 4 +- devel/icu4/files/patch-convrtrs | 10 -- devel/icu4/files/patch-uk | 17 --- devel/icu4/pkg-plist | 9 +- 18 files changed, 62 insertions(+), 1244 deletions(-) delete mode 100644 devel/icu/files/koi8-u.ucm delete mode 100644 devel/icu/files/patch-ab delete mode 100644 devel/icu/files/patch-convrtrs delete mode 100644 devel/icu/files/patch-uk delete mode 100644 devel/icu4/files/koi8-u.ucm delete mode 100644 devel/icu4/files/patch-ab delete mode 100644 devel/icu4/files/patch-convrtrs delete mode 100644 devel/icu4/files/patch-uk diff --git a/devel/icu/Makefile b/devel/icu/Makefile index 95d8082af5aa..cf0faf051da5 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -6,40 +6,29 @@ # PORTNAME= icu -PORTVERSION= 3.2 -PORTREVISION= 1 +PORTVERSION= 3.4 CATEGORIES= devel MASTER_SITES= ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/ EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mi@aldan.algebra.com COMMENT= International Components for Unicode (from IBM) +OPTIONS= THREADS "Build multi-threaded version of the library" on CONFLICTS= icu2-[0-9]* INSTALLS_SHLIB= yes NO_FILTER_SHLIBS= yes -WRKSRC= ${WRKDIR}/icu -ICUWRKSRC= ${WRKSRC}/source -CONFIGURE_WRKSRC= ${ICUWRKSRC} -BUILD_WRKSRC= ${ICUWRKSRC} -INSTALL_WRKSRC= ${ICUWRKSRC} +WRKSRC= ${WRKDIR}/icu/source 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 +CONFIGURE_ARGS+= --enable-samples=no + USE_GMAKE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CC="${CC}" CXX="${CXX}" @@ -51,12 +40,8 @@ MAN1+= makeconv.1 MAN1+= pkgdata.1 MAN1+= uconv.1 MAN8+= decmn.8 -MAN8+= gencase.8 MAN8+= genccode.8 MAN8+= gencmn.8 -MAN8+= gennames.8 -MAN8+= gennorm.8 -MAN8+= genprops.8 MAN8+= gensprep.8 MAN8+= genuca.8 @@ -66,47 +51,28 @@ PLIST_SUB+= ICUVER=${PORTVERSION} .include -.if ${ARCH} == "alpha" -BROKEN= "Floating point exception during build on alpha" +.if ${ARCH} != "sparc64" +USE_REINPLACE= yes +post-patch: + ${REINPLACE_CMD} 's,-fPIC,-fpic,' ${WRKSRC}/config/mh-bsd-gcc .endif -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 - # +.if defined(WITH_THREADS) +CONFIGURE_ARGS+= --enable-threads=yes +CONFIGURE_ENV+= THREADSCPPFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCXXFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" +.else +CONFIGURE_ARGS+= --enable-threads=no .endif -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 - iotest cintltst intltest: - -${GMAKE} -C ${ICUWRKSRC}/test - cd ${ICUWRKSRC}/test/${.TARGET} && ${SETENV} \ - LD_LIBRARY_PATH=${ICUWRKSRC}/lib:${ICUWRKSRC}/tools/ctestfw \ + -${GMAKE} -C ${WRKSRC}/test + cd ${WRKSRC}/test/${.TARGET} && ${SETENV} \ + LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/tools/ctestfw \ ./${.TARGET} -test: iotest cintltst intltest - -post-build: iotest cintltst - # - # Note, due to occasional hangs in one of the intltest's - # multi-threading subtests, the intltest is not part of automatic - # test in the current version of this port. This an unresolved - # problem so far: - # http://www.jtcsv.com/cgibin/icu-bugs/incoming?id=1141 - # - # If you wish to help resolving it, try - # - # `make intltest' manually. - # +post-build test: iotest cintltst intltest .include diff --git a/devel/icu/distinfo b/devel/icu/distinfo index 503665f7df1a..31991bd5fc1b 100644 --- a/devel/icu/distinfo +++ b/devel/icu/distinfo @@ -1,2 +1,2 @@ -MD5 (icu-3.2.tgz) = 55a85d2365338ece483d275119fd990c -SIZE (icu-3.2.tgz) = 9587961 +MD5 (icu-3.4.tgz) = b19f3b9eec1c44fba86b07f287801084 +SIZE (icu-3.4.tgz) = 9267878 diff --git a/devel/icu/files/koi8-u.ucm b/devel/icu/files/koi8-u.ucm deleted file mode 100644 index b81307a6c5eb..000000000000 --- a/devel/icu/files/koi8-u.ucm +++ /dev/null @@ -1,272 +0,0 @@ -# -# $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 index 74bf6f6f09e1..a089bc1c8e90 100644 --- a/devel/icu/files/patch-aa +++ b/devel/icu/files/patch-aa @@ -1,5 +1,5 @@ ---- source/Makefile.in Fri Jul 9 11:43:36 2004 -+++ source/Makefile.in Wed Nov 17 11:14:49 2004 +--- Makefile.in Fri Jul 9 11:43:36 2004 ++++ 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) $@ diff --git a/devel/icu/files/patch-ab b/devel/icu/files/patch-ab deleted file mode 100644 index c9ea034c4b38..000000000000 --- a/devel/icu/files/patch-ab +++ /dev/null @@ -1,255 +0,0 @@ ---- 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 index 3e8f4112c276..7de91a1a6aa6 100644 --- a/devel/icu/files/patch-cc-flags +++ b/devel/icu/files/patch-cc-flags @@ -1,5 +1,5 @@ ---- source/runConfigureICU Fri Jan 16 17:26:40 2004 -+++ source/runConfigureICU Mon Nov 15 11:05:50 2004 +--- runConfigureICU Fri Jan 16 17:26:40 2004 ++++ runConfigureICU Mon Nov 15 11:05:50 2004 @@ -289,7 +289,7 @@ *BSD) - THE_OS="BSD" diff --git a/devel/icu/files/patch-convrtrs b/devel/icu/files/patch-convrtrs deleted file mode 100644 index 645e5c44bba4..000000000000 --- a/devel/icu/files/patch-convrtrs +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 3e71cfcb37a7..000000000000 --- a/devel/icu/files/patch-uk +++ /dev/null @@ -1,17 +0,0 @@ ---- 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-plist b/devel/icu/pkg-plist index be126522201a..ddea2efecc00 100644 --- a/devel/icu/pkg-plist +++ b/devel/icu/pkg-plist @@ -7,13 +7,8 @@ bin/makeconv bin/pkgdata bin/uconv sbin/decmn -sbin/gencase sbin/genccode sbin/gencmn -sbin/gennames -sbin/gennorm -sbin/genpname -sbin/genprops sbin/gensprep sbin/genuca sbin/icuswap @@ -49,13 +44,13 @@ include/unicode/fmtable.h include/unicode/format.h include/unicode/gregocal.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/numfmt.h +include/unicode/ppalmos.h include/unicode/parseerr.h include/unicode/parsepos.h include/unicode/platform.h @@ -80,6 +75,7 @@ include/unicode/translit.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/uchriter.h @@ -126,6 +122,7 @@ include/unicode/usprep.h include/unicode/ustdio.h include/unicode/ustream.h include/unicode/ustring.h +include/unicode/utext.h include/unicode/utf.h include/unicode/utf16.h include/unicode/utf32.h diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile index 95d8082af5aa..cf0faf051da5 100644 --- a/devel/icu4/Makefile +++ b/devel/icu4/Makefile @@ -6,40 +6,29 @@ # PORTNAME= icu -PORTVERSION= 3.2 -PORTREVISION= 1 +PORTVERSION= 3.4 CATEGORIES= devel MASTER_SITES= ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/ EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mi@aldan.algebra.com COMMENT= International Components for Unicode (from IBM) +OPTIONS= THREADS "Build multi-threaded version of the library" on CONFLICTS= icu2-[0-9]* INSTALLS_SHLIB= yes NO_FILTER_SHLIBS= yes -WRKSRC= ${WRKDIR}/icu -ICUWRKSRC= ${WRKSRC}/source -CONFIGURE_WRKSRC= ${ICUWRKSRC} -BUILD_WRKSRC= ${ICUWRKSRC} -INSTALL_WRKSRC= ${ICUWRKSRC} +WRKSRC= ${WRKDIR}/icu/source 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 +CONFIGURE_ARGS+= --enable-samples=no + USE_GMAKE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CC="${CC}" CXX="${CXX}" @@ -51,12 +40,8 @@ MAN1+= makeconv.1 MAN1+= pkgdata.1 MAN1+= uconv.1 MAN8+= decmn.8 -MAN8+= gencase.8 MAN8+= genccode.8 MAN8+= gencmn.8 -MAN8+= gennames.8 -MAN8+= gennorm.8 -MAN8+= genprops.8 MAN8+= gensprep.8 MAN8+= genuca.8 @@ -66,47 +51,28 @@ PLIST_SUB+= ICUVER=${PORTVERSION} .include -.if ${ARCH} == "alpha" -BROKEN= "Floating point exception during build on alpha" +.if ${ARCH} != "sparc64" +USE_REINPLACE= yes +post-patch: + ${REINPLACE_CMD} 's,-fPIC,-fpic,' ${WRKSRC}/config/mh-bsd-gcc .endif -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 - # +.if defined(WITH_THREADS) +CONFIGURE_ARGS+= --enable-threads=yes +CONFIGURE_ENV+= THREADSCPPFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCFLAGS="${PTHREAD_CFLAGS}" \ + THREADSCXXFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" +.else +CONFIGURE_ARGS+= --enable-threads=no .endif -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 - iotest cintltst intltest: - -${GMAKE} -C ${ICUWRKSRC}/test - cd ${ICUWRKSRC}/test/${.TARGET} && ${SETENV} \ - LD_LIBRARY_PATH=${ICUWRKSRC}/lib:${ICUWRKSRC}/tools/ctestfw \ + -${GMAKE} -C ${WRKSRC}/test + cd ${WRKSRC}/test/${.TARGET} && ${SETENV} \ + LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/tools/ctestfw \ ./${.TARGET} -test: iotest cintltst intltest - -post-build: iotest cintltst - # - # Note, due to occasional hangs in one of the intltest's - # multi-threading subtests, the intltest is not part of automatic - # test in the current version of this port. This an unresolved - # problem so far: - # http://www.jtcsv.com/cgibin/icu-bugs/incoming?id=1141 - # - # If you wish to help resolving it, try - # - # `make intltest' manually. - # +post-build test: iotest cintltst intltest .include diff --git a/devel/icu4/distinfo b/devel/icu4/distinfo index 503665f7df1a..31991bd5fc1b 100644 --- a/devel/icu4/distinfo +++ b/devel/icu4/distinfo @@ -1,2 +1,2 @@ -MD5 (icu-3.2.tgz) = 55a85d2365338ece483d275119fd990c -SIZE (icu-3.2.tgz) = 9587961 +MD5 (icu-3.4.tgz) = b19f3b9eec1c44fba86b07f287801084 +SIZE (icu-3.4.tgz) = 9267878 diff --git a/devel/icu4/files/koi8-u.ucm b/devel/icu4/files/koi8-u.ucm deleted file mode 100644 index b81307a6c5eb..000000000000 --- a/devel/icu4/files/koi8-u.ucm +++ /dev/null @@ -1,272 +0,0 @@ -# -# $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 index 74bf6f6f09e1..a089bc1c8e90 100644 --- a/devel/icu4/files/patch-aa +++ b/devel/icu4/files/patch-aa @@ -1,5 +1,5 @@ ---- source/Makefile.in Fri Jul 9 11:43:36 2004 -+++ source/Makefile.in Wed Nov 17 11:14:49 2004 +--- Makefile.in Fri Jul 9 11:43:36 2004 ++++ 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) $@ diff --git a/devel/icu4/files/patch-ab b/devel/icu4/files/patch-ab deleted file mode 100644 index c9ea034c4b38..000000000000 --- a/devel/icu4/files/patch-ab +++ /dev/null @@ -1,255 +0,0 @@ ---- 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 index 3e8f4112c276..7de91a1a6aa6 100644 --- a/devel/icu4/files/patch-cc-flags +++ b/devel/icu4/files/patch-cc-flags @@ -1,5 +1,5 @@ ---- source/runConfigureICU Fri Jan 16 17:26:40 2004 -+++ source/runConfigureICU Mon Nov 15 11:05:50 2004 +--- runConfigureICU Fri Jan 16 17:26:40 2004 ++++ runConfigureICU Mon Nov 15 11:05:50 2004 @@ -289,7 +289,7 @@ *BSD) - THE_OS="BSD" diff --git a/devel/icu4/files/patch-convrtrs b/devel/icu4/files/patch-convrtrs deleted file mode 100644 index 645e5c44bba4..000000000000 --- a/devel/icu4/files/patch-convrtrs +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 3e71cfcb37a7..000000000000 --- a/devel/icu4/files/patch-uk +++ /dev/null @@ -1,17 +0,0 @@ ---- 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-plist b/devel/icu4/pkg-plist index be126522201a..ddea2efecc00 100644 --- a/devel/icu4/pkg-plist +++ b/devel/icu4/pkg-plist @@ -7,13 +7,8 @@ bin/makeconv bin/pkgdata bin/uconv sbin/decmn -sbin/gencase sbin/genccode sbin/gencmn -sbin/gennames -sbin/gennorm -sbin/genpname -sbin/genprops sbin/gensprep sbin/genuca sbin/icuswap @@ -49,13 +44,13 @@ include/unicode/fmtable.h include/unicode/format.h include/unicode/gregocal.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/numfmt.h +include/unicode/ppalmos.h include/unicode/parseerr.h include/unicode/parsepos.h include/unicode/platform.h @@ -80,6 +75,7 @@ include/unicode/translit.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/uchriter.h @@ -126,6 +122,7 @@ include/unicode/usprep.h include/unicode/ustdio.h include/unicode/ustream.h include/unicode/ustring.h +include/unicode/utext.h include/unicode/utf.h include/unicode/utf16.h include/unicode/utf32.h -- cgit v1.2.3