Update from 3.2 to 3.4. Enable full testing -- the previously hanging

test has been modified by the vendor.

9 files changed, 31 insertions, 622 deletions

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 <bsd.port.pre.mk>
 
-.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 <bsd.port.post.mk>
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
-
-<code_set_name> "koi8-u"
-<char_name_mask>              "AXXXX"
-<mb_cur_min> 1
-<mb_cur_max> 1
-<uconv_class>                 "SBCS"
-<subchar>                     \x1A
-<icu:charsetFamily>           "ASCII"
-
-CHARMAP
-<U0000> \x00 |0 # <control>
-<U0001> \x01 |0 # <control>
-<U0002> \x02 |0 # <control>
-<U0003> \x03 |0 # <control>
-<U0004> \x04 |0 # <control>
-<U0005> \x05 |0 # <control>
-<U0006> \x06 |0 # <control>
-<U0007> \x07 |0 # <control>
-<U0008> \x08 |0 # <control>
-<U0009> \x09 |0 # <control>
-<U000A> \x0A |0 # <control>
-<U000B> \x0B |0 # <control>
-<U000C> \x0C |0 # <control>
-<U000D> \x0D |0 # <control>
-<U000E> \x0E |0 # <control>
-<U000F> \x0F |0 # <control>
-<U0010> \x10 |0 # <control>
-<U0011> \x11 |0 # <control>
-<U0012> \x12 |0 # <control>
-<U0013> \x13 |0 # <control>
-<U0014> \x14 |0 # <control>
-<U0015> \x15 |0 # <control>
-<U0016> \x16 |0 # <control>
-<U0017> \x17 |0 # <control>
-<U0018> \x18 |0 # <control>
-<U0019> \x19 |0 # <control>
-<U001A> \x1A |0 # <control>
-<U001B> \x1B |0 # <control>
-<U001C> \x1C |0 # <control>
-<U001D> \x1D |0 # <control>
-<U001E> \x1E |0 # <control>
-<U001F> \x1F |0 # <control>
-<U0020> \x20 |0 # SPACE
-<U0021> \x21 |0 # EXCLAMATION MARK
-<U0022> \x22 |0 # QUOTATION MARK
-<U0023> \x23 |0 # NUMBER SIGN
-<U0024> \x24 |0 # DOLLAR SIGN
-<U0025> \x25 |0 # PERCENT SIGN
-<U0026> \x26 |0 # AMPERSAND
-<U0027> \x27 |0 # APOSTROPHE
-<U0028> \x28 |0 # LEFT PARENTHESIS
-<U0029> \x29 |0 # RIGHT PARENTHESIS
-<U002A> \x2A |0 # ASTERISK
-<U002B> \x2B |0 # PLUS SIGN
-<U002C> \x2C |0 # COMMA
-<U002D> \x2D |0 # HYPHEN-MINUS
-<U002E> \x2E |0 # FULL STOP
-<U002F> \x2F |0 # SOLIDUS
-<U0030> \x30 |0 # DIGIT ZERO
-<U0031> \x31 |0 # DIGIT ONE
-<U0032> \x32 |0 # DIGIT TWO
-<U0033> \x33 |0 # DIGIT THREE
-<U0034> \x34 |0 # DIGIT FOUR
-<U0035> \x35 |0 # DIGIT FIVE
-<U0036> \x36 |0 # DIGIT SIX
-<U0037> \x37 |0 # DIGIT SEVEN
-<U0038> \x38 |0 # DIGIT EIGHT
-<U0039> \x39 |0 # DIGIT NINE
-<U003A> \x3A |0 # COLON
-<U003B> \x3B |0 # SEMICOLON
-<U003C> \x3C |0 # LESS-THAN SIGN
-<U003D> \x3D |0 # EQUALS SIGN
-<U003E> \x3E |0 # GREATER-THAN SIGN
-<U003F> \x3F |0 # QUESTION MARK
-<U0040> \x40 |0 # COMMERCIAL AT
-<U0041> \x41 |0 # LATIN CAPITAL LETTER A
-<U0042> \x42 |0 # LATIN CAPITAL LETTER B
-<U0043> \x43 |0 # LATIN CAPITAL LETTER C
-<U0044> \x44 |0 # LATIN CAPITAL LETTER D
-<U0045> \x45 |0 # LATIN CAPITAL LETTER E
-<U0046> \x46 |0 # LATIN CAPITAL LETTER F
-<U0047> \x47 |0 # LATIN CAPITAL LETTER G
-<U0048> \x48 |0 # LATIN CAPITAL LETTER H
-<U0049> \x49 |0 # LATIN CAPITAL LETTER I
-<U004A> \x4A |0 # LATIN CAPITAL LETTER J
-<U004B> \x4B |0 # LATIN CAPITAL LETTER K
-<U004C> \x4C |0 # LATIN CAPITAL LETTER L
-<U004D> \x4D |0 # LATIN CAPITAL LETTER M
-<U004E> \x4E |0 # LATIN CAPITAL LETTER N
-<U004F> \x4F |0 # LATIN CAPITAL LETTER O
-<U0050> \x50 |0 # LATIN CAPITAL LETTER P
-<U0051> \x51 |0 # LATIN CAPITAL LETTER Q
-<U0052> \x52 |0 # LATIN CAPITAL LETTER R
-<U0053> \x53 |0 # LATIN CAPITAL LETTER S
-<U0054> \x54 |0 # LATIN CAPITAL LETTER T
-<U0055> \x55 |0 # LATIN CAPITAL LETTER U
-<U0056> \x56 |0 # LATIN CAPITAL LETTER V
-<U0057> \x57 |0 # LATIN CAPITAL LETTER W
-<U0058> \x58 |0 # LATIN CAPITAL LETTER X
-<U0059> \x59 |0 # LATIN CAPITAL LETTER Y
-<U005A> \x5A |0 # LATIN CAPITAL LETTER Z
-<U005B> \x5B |0 # LEFT SQUARE BRACKET
-<U005C> \x5C |0 # REVERSE SOLIDUS
-<U005D> \x5D |0 # RIGHT SQUARE BRACKET
-<U005E> \x5E |0 # CIRCUMFLEX ACCENT
-<U005F> \x5F |0 # LOW LINE
-<U0060> \x60 |0 # GRAVE ACCENT
-<U0061> \x61 |0 # LATIN SMALL LETTER A
-<U0062> \x62 |0 # LATIN SMALL LETTER B
-<U0063> \x63 |0 # LATIN SMALL LETTER C
-<U0064> \x64 |0 # LATIN SMALL LETTER D
-<U0065> \x65 |0 # LATIN SMALL LETTER E
-<U0066> \x66 |0 # LATIN SMALL LETTER F
-<U0067> \x67 |0 # LATIN SMALL LETTER G
-<U0068> \x68 |0 # LATIN SMALL LETTER H
-<U0069> \x69 |0 # LATIN SMALL LETTER I
-<U006A> \x6A |0 # LATIN SMALL LETTER J
-<U006B> \x6B |0 # LATIN SMALL LETTER K
-<U006C> \x6C |0 # LATIN SMALL LETTER L
-<U006D> \x6D |0 # LATIN SMALL LETTER M
-<U006E> \x6E |0 # LATIN SMALL LETTER N
-<U006F> \x6F |0 # LATIN SMALL LETTER O
-<U0070> \x70 |0 # LATIN SMALL LETTER P
-<U0071> \x71 |0 # LATIN SMALL LETTER Q
-<U0072> \x72 |0 # LATIN SMALL LETTER R
-<U0073> \x73 |0 # LATIN SMALL LETTER S
-<U0074> \x74 |0 # LATIN SMALL LETTER T
-<U0075> \x75 |0 # LATIN SMALL LETTER U
-<U0076> \x76 |0 # LATIN SMALL LETTER V
-<U0077> \x77 |0 # LATIN SMALL LETTER W
-<U0078> \x78 |0 # LATIN SMALL LETTER X
-<U0079> \x79 |0 # LATIN SMALL LETTER Y
-<U007A> \x7A |0 # LATIN SMALL LETTER Z
-<U007B> \x7B |0 # LEFT CURLY BRACKET
-<U007C> \x7C |0 # VERTICAL LINE
-<U007D> \x7D |0 # RIGHT CURLY BRACKET
-<U007E> \x7E |0 # TILDE
-<U007F> \x7F |0 # <control>
-<U2500> \x80 |0 # BOX DRAWINGS LIGHT HORIZONTAL
-<U2502> \x81 |0 # BOX DRAWINGS LIGHT VERTICAL
-<U250C> \x82 |0 # BOX DRAWINGS LIGHT DOWN AND RIGHT
-<U2510> \x83 |0 # BOX DRAWINGS LIGHT DOWN AND LEFT
-<U2514> \x84 |0 # BOX DRAWINGS LIGHT UP AND RIGHT
-<U2518> \x85 |0 # BOX DRAWINGS LIGHT UP AND LEFT
-<U251C> \x86 |0 # BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-<U2524> \x87 |0 # BOX DRAWINGS LIGHT VERTICAL AND LEFT
-<U252C> \x88 |0 # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-<U2534> \x89 |0 # BOX DRAWINGS LIGHT UP AND HORIZONTAL
-<U253C> \x8A |0 # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-<U2580> \x8B |0 # UPPER HALF BLOCK
-<U2584> \x8C |0 # LOWER HALF BLOCK
-<U2588> \x8D |0 # FULL BLOCK
-<U258C> \x8E |0 # LEFT HALF BLOCK
-<U2590> \x8F |0 # RIGHT HALF BLOCK
-<U2591> \x90 |0 # LIGHT SHADE
-<U2592> \x91 |0 # MEDIUM SHADE
-<U2593> \x92 |0 # DARK SHADE
-<U2320> \x93 |0 # TOP HALF INTEGRAL
-<U25A0> \x94 |0 # BLACK SQUARE
-<U2022> \x95 |0 # BULLET
-<U221A> \x96 |0 # SQUARE ROOT
-<U2248> \x97 |0 # ALMOST EQUAL TO
-<U2264> \x98 |0 # LESS-THAN OR EQUAL TO
-<U2265> \x99 |0 # GREATER-THAN OR EQUAL TO
-<U00A0> \x9A |0 # NO-BREAK SPACE
-<U2321> \x9B |0 # BOTTOM HALF INTEGRAL
-<U00B0> \x9C |0 # DEGREE SIGN
-<U00B2> \x9D |0 # SUPERSCRIPT TWO
-<U00B7> \x9E |0 # MIDDLE DOT
-<U00F7> \x9F |0 # DIVISION SIGN
-<U2550> \xA0 |0 # BOX DRAWINGS DOUBLE HORIZONTAL
-<U2551> \xA1 |0 # BOX DRAWINGS DOUBLE VERTICAL
-<U2552> \xA2 |0 # BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-<U0451> \xA3 |0 # CYRILLIC SMALL LETTER IO
-<U0454> \xA4 |0 # CYRILLIC SMALL LETTER UKRAINIAN IE
-<U2554> \xA5 |0 # BOX DRAWINGS DOUBLE DOWN AND RIGHT
-<U0456> \xA6 |0 # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-<U0457> \xA7 |0 # CYRILLIC SMALL LETTER YI
-<U2557> \xA8 |0 # BOX DRAWINGS DOUBLE DOWN AND LEFT
-<U2558> \xA9 |0 # BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-<U2559> \xAA |0 # BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-<U255A> \xAB |0 # BOX DRAWINGS DOUBLE UP AND RIGHT
-<U255B> \xAC |0 # BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-<U0491> \xAD |0 # CYRILLIC SMALL LETTER GHE WITH UPTURN
-<U255D> \xAE |0 # BOX DRAWINGS DOUBLE UP AND LEFT
-<U255E> \xAF |0 # BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-<U255F> \xB0 |0 # BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-<U2560> \xB1 |0 # BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-<U2561> \xB2 |0 # BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-<U0401> \xB3 |0 # CYRILLIC CAPITAL LETTER IO
-<U0404> \xB4 |0 # CYRILLIC CAPITAL LETTER UKRAINIAN IE
-<U2563> \xB5 |0 # BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-<U0406> \xB6 |0 # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-<U0407> \xB7 |0 # CYRILLIC CAPITAL LETTER YI
-<U2566> \xB8 |0 # BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-<U2567> \xB9 |0 # BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-<U2568> \xBA |0 # BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-<U2569> \xBB |0 # BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-<U256A> \xBC |0 # BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-<U0490> \xBD |0 # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-<U256C> \xBE |0 # BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-<U00A9> \xBF |0 # COPYRIGHT SIGN
-<U044E> \xC0 |0 # CYRILLIC SMALL LETTER YU
-<U0430> \xC1 |0 # CYRILLIC SMALL LETTER A
-<U0431> \xC2 |0 # CYRILLIC SMALL LETTER BE
-<U0446> \xC3 |0 # CYRILLIC SMALL LETTER TSE
-<U0434> \xC4 |0 # CYRILLIC SMALL LETTER DE
-<U0435> \xC5 |0 # CYRILLIC SMALL LETTER IE
-<U0444> \xC6 |0 # CYRILLIC SMALL LETTER EF
-<U0433> \xC7 |0 # CYRILLIC SMALL LETTER GHE
-<U0445> \xC8 |0 # CYRILLIC SMALL LETTER HA
-<U0438> \xC9 |0 # CYRILLIC SMALL LETTER I
-<U0439> \xCA |0 # CYRILLIC SMALL LETTER SHORT I
-<U043A> \xCB |0 # CYRILLIC SMALL LETTER KA
-<U043B> \xCC |0 # CYRILLIC SMALL LETTER EL
-<U043C> \xCD |0 # CYRILLIC SMALL LETTER EM
-<U043D> \xCE |0 # CYRILLIC SMALL LETTER EN
-<U043E> \xCF |0 # CYRILLIC SMALL LETTER O
-<U043F> \xD0 |0 # CYRILLIC SMALL LETTER PE
-<U044F> \xD1 |0 # CYRILLIC SMALL LETTER YA
-<U0440> \xD2 |0 # CYRILLIC SMALL LETTER ER
-<U0441> \xD3 |0 # CYRILLIC SMALL LETTER ES
-<U0442> \xD4 |0 # CYRILLIC SMALL LETTER TE
-<U0443> \xD5 |0 # CYRILLIC SMALL LETTER U
-<U0436> \xD6 |0 # CYRILLIC SMALL LETTER ZHE
-<U0432> \xD7 |0 # CYRILLIC SMALL LETTER VE
-<U044C> \xD8 |0 # CYRILLIC SMALL LETTER SOFT SIGN
-<U044B> \xD9 |0 # CYRILLIC SMALL LETTER YERU
-<U0437> \xDA |0 # CYRILLIC SMALL LETTER ZE
-<U0448> \xDB |0 # CYRILLIC SMALL LETTER SHA
-<U044D> \xDC |0 # CYRILLIC SMALL LETTER E
-<U0449> \xDD |0 # CYRILLIC SMALL LETTER SHCHA
-<U0447> \xDE |0 # CYRILLIC SMALL LETTER CHE
-<U044A> \xDF |0 # CYRILLIC SMALL LETTER HARD SIGN
-<U042E> \xE0 |0 # CYRILLIC CAPITAL LETTER YU
-<U0410> \xE1 |0 # CYRILLIC CAPITAL LETTER A
-<U0411> \xE2 |0 # CYRILLIC CAPITAL LETTER BE
-<U0426> \xE3 |0 # CYRILLIC CAPITAL LETTER TSE
-<U0414> \xE4 |0 # CYRILLIC CAPITAL LETTER DE
-<U0415> \xE5 |0 # CYRILLIC CAPITAL LETTER IE
-<U0424> \xE6 |0 # CYRILLIC CAPITAL LETTER EF
-<U0413> \xE7 |0 # CYRILLIC CAPITAL LETTER GHE
-<U0425> \xE8 |0 # CYRILLIC CAPITAL LETTER HA
-<U0418> \xE9 |0 # CYRILLIC CAPITAL LETTER I
-<U0419> \xEA |0 # CYRILLIC CAPITAL LETTER SHORT I
-<U041A> \xEB |0 # CYRILLIC CAPITAL LETTER KA
-<U041B> \xEC |0 # CYRILLIC CAPITAL LETTER EL
-<U041C> \xED |0 # CYRILLIC CAPITAL LETTER EM
-<U041D> \xEE |0 # CYRILLIC CAPITAL LETTER EN
-<U041E> \xEF |0 # CYRILLIC CAPITAL LETTER O
-<U041F> \xF0 |0 # CYRILLIC CAPITAL LETTER PE
-<U042F> \xF1 |0 # CYRILLIC CAPITAL LETTER YA
-<U0420> \xF2 |0 # CYRILLIC CAPITAL LETTER ER
-<U0421> \xF3 |0 # CYRILLIC CAPITAL LETTER ES
-<U0422> \xF4 |0 # CYRILLIC CAPITAL LETTER TE
-<U0423> \xF5 |0 # CYRILLIC CAPITAL LETTER U
-<U0416> \xF6 |0 # CYRILLIC CAPITAL LETTER ZHE
-<U0412> \xF7 |0 # CYRILLIC CAPITAL LETTER VE
-<U042C> \xF8 |0 # CYRILLIC CAPITAL LETTER SOFT SIGN
-<U042B> \xF9 |0 # CYRILLIC CAPITAL LETTER YERU
-<U0417> \xFA |0 # CYRILLIC CAPITAL LETTER ZE
-<U0428> \xFB |0 # CYRILLIC CAPITAL LETTER SHA
-<U042D> \xFC |0 # CYRILLIC CAPITAL LETTER E
-<U0429> \xFD |0 # CYRILLIC CAPITAL LETTER SHCHA
-<U0427> \xFE |0 # CYRILLIC CAPITAL LETTER CHE
-<U042A> \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 <<EOF
--#line 1941 "configure"
--#include "confdefs.h"
--/* 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_attr_init();
--
--int main() {
--pthread_attr_init()
--; return 0; }
--EOF
--if { (eval echo configure:1952: \"$ac_link\") 1>&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 <<EOF
--#define $ac_tr_lib 1
--EOF
--
--  LIBS="-lpthread $LIBS"
--
--else
--  echo "$ac_t""no" 1>&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 <<EOF
--#line 1994 "configure"
--#include "confdefs.h"
--/* 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_destroy();
--
--int main() {
--pthread_mutex_destroy()
--; return 0; }
--EOF
--if { (eval echo configure:2005: \"$ac_link\") 1>&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 <<EOF
--#line 2017 "configure"
--#include "confdefs.h"
--/* 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_destroy();
--
--int main() {
--pthread_mutex_destroy()
--; return 0; }
--EOF
--if { (eval echo configure:2028: \"$ac_link\") 1>&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 <<EOF
--#line 2060 "configure"
--#include "confdefs.h"
--/* 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_init();
--
--int main() {
--pthread_mutex_init()
--; return 0; }
--EOF
--if { (eval echo configure:2071: \"$ac_link\") 1>&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 <<EOF
--#define $ac_tr_lib 1
--EOF
--
--  LIBS="-lpthread $LIBS"
--
--else
--  echo "$ac_t""no" 1>&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 <<EOF
--#line 2109 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char pthread_mutex_lock(); below.  */
--#include <assert.h>
--/* 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