Update to version 2.4.

Based on a PR pkg/20825 by Hiramatsu Yoshifumi, modified by me.

- follow PKG_SYSCONFDIR

List of major changes for this release:

  * Regular Expressions Phase 1
    ICU 2.4 introduces a Regular Expression C++ API that is modeled after
    the JDK 1.4 API. ICU 2.4's Regular Expression API supports Unicode
    level 1 regular expressions (see Unicode Regular Expression
    Guidelines) but not all pattern metacharacters and features are
    supported yet. Regular expressions leverage all of the UnicodeSet
    support, including all Unicode 3.2 property names and property value
    names. Future ICU releases will complete the pattern support, add
    support for higher Unicode regex levels, and improve performance. For
    more details see the API References and the User Guide.
  * Modularized ICU library building
    ICU 2.4 provides build-time switches to prune parts of the library
    code, for smaller custom distributions. For details see the readme
    file.
  * Character set alias management support
    Additional APIs map alias+standard to a unique charset name (e.g.,
    "Shift-JIS"+"IANA"->"ibm-943_P14A-2000") and enumerate all charset
    names in the alias table, not just the installed ones. See
    convrtrs.txt and ucnv.h.
    These APIs allow programmers to avoid data corruption problems when
    different platforms use the same names for different character
    conversion mappings.
  * EBCDIC-z/OS converter option
    The EBCDIC converter now handles swapped LF/NL mappings
    algorithmically instead of with modified .ucm/.cnv conversion table
    files. This makes this behavior available for all supported EBCDIC
    conversions without adding to the data package size. See "swaplfnl" in
    convrtrs.txt.
  * Additional converter
    A new converter implementation has been added for the encoding of IMAP
    mailbox names. See RFC 2060/5.1.3. Mailbox International Naming
    Convention and "IMAP-mailbox-name" in convrtrs.txt.
  * Customizable break iteration
    ICU 2.4 allows registration of a BreakIterator with a locale ID. This
    allows applications to provide more sophisticated word/sentence break
    engines and use them seamlessly with the ICU APIs. In future releases,
    this registration mechanism will be extended to all relevant ICU
    services. If you are interested in ICU customization, please try out
    this feature.
  * Collation performance
    ICU 2.4 collation was improved in several areas, with an emphasis on
    performance:
       * Latin-1: Improved performance of u_strcoll().
       * Russian/Cyrillic: Improved performance by tailoring collation for
         cyrillic-script languages, removing UCA contractions that are not
         used for modern Russian (this uses the [suppressContractions]
         tailoring option).
       * Korean: Improved performance by resolving collation elements for
         modern Hangul syllables at build time (this uses the [optimize]
         tailoring option).
       * Japanese: The default strength for Japanese was reduced from
         quaternary to tertiary as in all other locales.
  * UnicodeSet performance
    UnicodeSet performance is significantly improved, especially for
    add(codePoint) and contains(codePoint).
  * Unicode property aliases ICU 2.4 introduces APIs for mapping between
    all appropriate Unicode property aliases and property value aliases
    and ICU property enumeration constants. See u_getPropertyName() etc.
    in uchar.h.
  * Unicode string functions
       * There are new C functions for searching for last occurrences of
         characters and partial strings. See u_strrstr(), u_strrchr32()
         etc.
       * New C/C++/Java functions for efficient checking if a string
         contains more than a certain number of code points. See
         hasMoreChar32Than().
       * Copying UnicodeStrings via the standard assignment operator and
         copy constructor does not preserve readonly aliasing any more
         because this can sometimes have unexpected and dangerous effects.
         A new fastCopyFrom() member function provides the old copy
         semantics. See Jitterbug 1794 for more details.
  * UTF macros simplified
    The low-level C macros for handling code points in 8-bit and 16-bit
    Unicode strings have been replaced by a simpler, more consistent set
    with more concise names. For details see utf_old.h and utf.h.
    Similarly, ICU 2.4 defines the UChar32 consistently (now always as
    int32_t) and adds a U_SENTINEL non-code point value for new APIs.
  * Performance tests
    ICU 2.4 has a new performance test framework and additional
    performance tests using this framework. This is not currently
    documented, but it is available as part of the source distribution at
    source/test/perf/.

11 files changed, 226 insertions, 156 deletions

diff --git a/textproc/icu/DESCR b/textproc/icu/DESCR
index 93a00b39080..80297e78ddc 100644
--- a/textproc/icu/DESCR
+++ b/textproc/icu/DESCR
@@ -1,16 +1,16 @@
-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 that
+provides robust and full-featured Unicode support on a wide variety of
+platforms. The library provides:
 
-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
+- 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
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 80da99d9b2e..25675b7911e 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.11 2003/02/17 15:28:02 dillo Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/21 23:44:05 salo Exp $
 #
 
-DISTNAME=	icu-1.7
+DISTNAME=	icu-2.4
 CATEGORIES=	textproc
-MASTER_SITES=	http://oss.software.ibm.com/icu/download/1.7/
+MASTER_SITES=	http://oss.software.ibm.com/icu/download/${PKGVERSION}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://oss.software.ibm.com/icu
 COMMENT=	Robust and full-featured unicode support
 
-WRKSRC=		${WRKDIR}/icu/source
+WRKSRC=		${WRKDIR}/${PKGBASE}/source
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 TEST_TARGET=	check
 
 .include "../../mk/endian.mk"
@@ -28,9 +29,14 @@ LITTLE_ENDIAN=	'@comment '
 PLIST_SUBST+=	BIG_ENDIAN=${BIG_ENDIAN}
 PLIST_SUBST+=	LITTLE_ENDIAN=${LITTLE_ENDIAN}
 
-CONFIGURE_ARGS+= --disable-threads
+PKG_SYSCONFSUBDIR=	icu
 
-pre-configure:
-	${CHMOD} u+rx ${WRKSRC}/configure
+CONF_FILES+=	${PREFIX}/share/examples/icu/convrtrs.txt \
+		${PKG_SYSCONFDIR}/convrtrs.txt
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--disable-threads
+CONFIGURE_ARGS+=	--enable-layout
+CONFIGURE_ARGS+=	--enable-static
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index f536993d76b..92f14af09e4 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,8 +1,27 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/28 22:49:15 seb Exp $
-etc/icu/convrtrs.txt
+@comment $NetBSD: PLIST,v 1.3 2003/03/21 23:44:06 salo Exp $
+bin/derb
+bin/genbrk
+bin/gencnval
+bin/genrb
+bin/icu-config
+bin/makeconv
+bin/pkgdata
+bin/uconv
+include/layout/ArabicLayoutEngine.h
+include/layout/GXLayoutEngine.h
+include/layout/IndicLayoutEngine.h
+include/layout/LEFontInstance.h
+include/layout/LEGlyphFilter.h
+include/layout/LEScripts.h
+include/layout/LESwaps.h
+include/layout/LETypes.h
+include/layout/LayoutEngine.h
+include/layout/OpenTypeLayoutEngine.h
+include/layout/ThaiLayoutEngine.h
 include/unicode/bidi.h
 include/unicode/brkiter.h
 include/unicode/calendar.h
+include/unicode/caniter.h
 include/unicode/chariter.h
 include/unicode/choicfmt.h
 include/unicode/coleitr.h
@@ -19,10 +38,9 @@ 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/msgfmt.h
 include/unicode/normlzr.h
 include/unicode/nultrans.h
@@ -31,19 +49,22 @@ 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/rbnf.h
 include/unicode/rbt.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/tblcoll.h
 include/unicode/timezone.h
 include/unicode/translit.h
@@ -52,12 +73,18 @@ include/unicode/ubrk.h
 include/unicode/ucal.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/uenum.h
+include/unicode/uiter.h
 include/unicode/uloc.h
 include/unicode/umachine.h
 include/unicode/umisc.h
@@ -65,62 +92,98 @@ 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/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/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/utrans.h
 include/unicode/utypes.h
-lib/icu/1.7/Makefile.inc
-lib/icu/1.7/libicudata.so
-${LITTLE_ENDIAN}lib/icu/1.7/libicudt17l.so
-${BIG_ENDIAN}lib/icu/1.7/libicudt17b.so
+include/unicode/uversion.h
+lib/icu/${PKGVERSION}/Makefile.inc
 lib/icu/Makefile.inc
 lib/icu/current
+lib/libicuctestfw.a
+lib/libicuctestfw.so
+lib/libicuctestfw.so.24
+lib/libicuctestfw.so.24.0
+lib/libicudata.a
+lib/libicudata.so
+lib/libicudata.so.24
+lib/libicudata.so.24.0
+lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.17
-lib/libicui18n.so.17.0
+lib/libicui18n.so.24
+lib/libicui18n.so.24.0
+lib/libicule.a
+lib/libicule.so
+lib/libicule.so.24
+lib/libicule.so.24.0
+lib/libicutoolutil.a
 lib/libicutoolutil.so
-lib/libicutoolutil.so.17
-lib/libicutoolutil.so.17.0
+lib/libicutoolutil.so.24
+lib/libicutoolutil.so.24.0
+lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.17
-lib/libicuuc.so.17.0
+lib/libicuuc.so.24
+lib/libicuuc.so.24.0
+lib/libustdio.a
 lib/libustdio.so
-lib/libustdio.so.17
-lib/libustdio.so.17.0
+lib/libustdio.so.24
+lib/libustdio.so.24.0
+man/man1/gencnval.1
+man/man1/genrb.1
+man/man1/icu-config.1
+man/man1/makeconv.1
+man/man1/pkgdata.1
+man/man1/uconv.1
 man/man5/cnvalias.dat.5
 man/man5/convrtrs.txt.5
-man/man8/gencnval.8
-man/man8/genrb.8
-man/man8/makeconv.8
+man/man8/decmn.8
+man/man8/genccode.8
+man/man8/gencmn.8
+man/man8/gennames.8
+man/man8/gennorm.8
+man/man8/genprops.8
+man/man8/genuca.8
+sbin/decmn
 sbin/genccode
 sbin/gencmn
-sbin/gencnval
 sbin/gennames
+sbin/gennorm
+sbin/genpname
 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 share/icu/1.7/config
-@dirrm share/icu/1.7
+sbin/genuca
+share/examples/icu/convrtrs.txt
+share/icu/${PKGVERSION}/README
+share/icu/${PKGVERSION}/config/mh-bsd-gcc
+share/icu/${PKGVERSION}/mkinstalldirs
+@dirrm share/icu/${PKGVERSION}/config
+@dirrm share/icu/${PKGVERSION}
 @dirrm share/icu
-@dirrm lib/icu/1.7
+@dirrm share/examples/icu
+@dirrm lib/icu/${PKGVERSION}
 @dirrm lib/icu
 @dirrm include/unicode
-@dirrm etc/icu
+@dirrm include/layout
diff --git a/textproc/icu/buildlink2.mk b/textproc/icu/buildlink2.mk
index 6edff04f927..962f47cee2a 100644
--- a/textproc/icu/buildlink2.mk
+++ b/textproc/icu/buildlink2.mk
@@ -1,23 +1,34 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/30 09:45:18 seb Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/03/21 23:44:06 salo Exp $
 #
 # This Makefile fragment is included by packages that use icu.
 #
-# This file was created automatically using createbuildlink 2.2.
-# And then hand edited.
+# This file was created automatically using createbuildlink 2.4.
 #
 
 .if !defined(ICU_BUILDLINK2_MK)
 ICU_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		icu
-BUILDLINK_DEPENDS.icu?=		icu>=1.7
-BUILDLINK_PKGSRCDIR.icu?=	../../textproc/icu
+BUILDLINK_PACKAGES+=			icu
+BUILDLINK_DEPENDS.icu?=		icu>=2.4
+BUILDLINK_PKGSRCDIR.icu?=		../../textproc/icu
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.icu=icu
 BUILDLINK_PREFIX.icu_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.icu+=	include/layout/ArabicLayoutEngine.h
+BUILDLINK_FILES.icu+=	include/layout/GXLayoutEngine.h
+BUILDLINK_FILES.icu+=	include/layout/IndicLayoutEngine.h
+BUILDLINK_FILES.icu+=	include/layout/LEFontInstance.h
+BUILDLINK_FILES.icu+=	include/layout/LEGlyphFilter.h
+BUILDLINK_FILES.icu+=	include/layout/LEScripts.h
+BUILDLINK_FILES.icu+=	include/layout/LESwaps.h
+BUILDLINK_FILES.icu+=	include/layout/LETypes.h
+BUILDLINK_FILES.icu+=	include/layout/LayoutEngine.h
+BUILDLINK_FILES.icu+=	include/layout/OpenTypeLayoutEngine.h
+BUILDLINK_FILES.icu+=	include/layout/ThaiLayoutEngine.h
 BUILDLINK_FILES.icu+=	include/unicode/bidi.h
 BUILDLINK_FILES.icu+=	include/unicode/brkiter.h
 BUILDLINK_FILES.icu+=	include/unicode/calendar.h
+BUILDLINK_FILES.icu+=	include/unicode/caniter.h
 BUILDLINK_FILES.icu+=	include/unicode/chariter.h
 BUILDLINK_FILES.icu+=	include/unicode/choicfmt.h
 BUILDLINK_FILES.icu+=	include/unicode/coleitr.h
@@ -34,10 +45,9 @@ BUILDLINK_FILES.icu+=	include/unicode/fieldpos.h
 BUILDLINK_FILES.icu+=	include/unicode/fmtable.h
 BUILDLINK_FILES.icu+=	include/unicode/format.h
 BUILDLINK_FILES.icu+=	include/unicode/gregocal.h
-BUILDLINK_FILES.icu+=	include/unicode/hangjamo.h
 BUILDLINK_FILES.icu+=	include/unicode/hextouni.h
-BUILDLINK_FILES.icu+=	include/unicode/jamohang.h
 BUILDLINK_FILES.icu+=	include/unicode/locid.h
+BUILDLINK_FILES.icu+=	include/unicode/loengine.h
 BUILDLINK_FILES.icu+=	include/unicode/msgfmt.h
 BUILDLINK_FILES.icu+=	include/unicode/normlzr.h
 BUILDLINK_FILES.icu+=	include/unicode/nultrans.h
@@ -46,19 +56,22 @@ BUILDLINK_FILES.icu+=	include/unicode/parseerr.h
 BUILDLINK_FILES.icu+=	include/unicode/parsepos.h
 BUILDLINK_FILES.icu+=	include/unicode/platform.h
 BUILDLINK_FILES.icu+=	include/unicode/pmacos.h
-BUILDLINK_FILES.icu+=	include/unicode/pos2.h
 BUILDLINK_FILES.icu+=	include/unicode/pos400.h
 BUILDLINK_FILES.icu+=	include/unicode/putil.h
 BUILDLINK_FILES.icu+=	include/unicode/pwin32.h
 BUILDLINK_FILES.icu+=	include/unicode/rbbi.h
+BUILDLINK_FILES.icu+=	include/unicode/rbnf.h
 BUILDLINK_FILES.icu+=	include/unicode/rbt.h
+BUILDLINK_FILES.icu+=	include/unicode/regex.h
 BUILDLINK_FILES.icu+=	include/unicode/rep.h
 BUILDLINK_FILES.icu+=	include/unicode/resbund.h
 BUILDLINK_FILES.icu+=	include/unicode/schriter.h
-BUILDLINK_FILES.icu+=	include/unicode/scsu.h
+BUILDLINK_FILES.icu+=	include/unicode/search.h
 BUILDLINK_FILES.icu+=	include/unicode/simpletz.h
 BUILDLINK_FILES.icu+=	include/unicode/smpdtfmt.h
 BUILDLINK_FILES.icu+=	include/unicode/sortkey.h
+BUILDLINK_FILES.icu+=	include/unicode/strenum.h
+BUILDLINK_FILES.icu+=	include/unicode/stsearch.h
 BUILDLINK_FILES.icu+=	include/unicode/tblcoll.h
 BUILDLINK_FILES.icu+=	include/unicode/timezone.h
 BUILDLINK_FILES.icu+=	include/unicode/translit.h
@@ -67,12 +80,18 @@ BUILDLINK_FILES.icu+=	include/unicode/ubrk.h
 BUILDLINK_FILES.icu+=	include/unicode/ucal.h
 BUILDLINK_FILES.icu+=	include/unicode/uchar.h
 BUILDLINK_FILES.icu+=	include/unicode/uchriter.h
+BUILDLINK_FILES.icu+=	include/unicode/uclean.h
 BUILDLINK_FILES.icu+=	include/unicode/ucnv.h
 BUILDLINK_FILES.icu+=	include/unicode/ucnv_cb.h
 BUILDLINK_FILES.icu+=	include/unicode/ucnv_err.h
 BUILDLINK_FILES.icu+=	include/unicode/ucol.h
+BUILDLINK_FILES.icu+=	include/unicode/ucoleitr.h
+BUILDLINK_FILES.icu+=	include/unicode/uconfig.h
+BUILDLINK_FILES.icu+=	include/unicode/ucurr.h
 BUILDLINK_FILES.icu+=	include/unicode/udat.h
 BUILDLINK_FILES.icu+=	include/unicode/udata.h
+BUILDLINK_FILES.icu+=	include/unicode/uenum.h
+BUILDLINK_FILES.icu+=	include/unicode/uiter.h
 BUILDLINK_FILES.icu+=	include/unicode/uloc.h
 BUILDLINK_FILES.icu+=	include/unicode/umachine.h
 BUILDLINK_FILES.icu+=	include/unicode/umisc.h
@@ -80,28 +99,38 @@ BUILDLINK_FILES.icu+=	include/unicode/umsg.h
 BUILDLINK_FILES.icu+=	include/unicode/unicode.h
 BUILDLINK_FILES.icu+=	include/unicode/unifilt.h
 BUILDLINK_FILES.icu+=	include/unicode/unifltlg.h
+BUILDLINK_FILES.icu+=	include/unicode/unifunct.h
+BUILDLINK_FILES.icu+=	include/unicode/unimatch.h
+BUILDLINK_FILES.icu+=	include/unicode/unirepl.h
 BUILDLINK_FILES.icu+=	include/unicode/uniset.h
 BUILDLINK_FILES.icu+=	include/unicode/unistr.h
 BUILDLINK_FILES.icu+=	include/unicode/unitohex.h
 BUILDLINK_FILES.icu+=	include/unicode/unorm.h
 BUILDLINK_FILES.icu+=	include/unicode/unum.h
+BUILDLINK_FILES.icu+=	include/unicode/uobject.h
+BUILDLINK_FILES.icu+=	include/unicode/urename.h
 BUILDLINK_FILES.icu+=	include/unicode/urep.h
 BUILDLINK_FILES.icu+=	include/unicode/ures.h
+BUILDLINK_FILES.icu+=	include/unicode/uscript.h
+BUILDLINK_FILES.icu+=	include/unicode/usearch.h
+BUILDLINK_FILES.icu+=	include/unicode/uset.h
+BUILDLINK_FILES.icu+=	include/unicode/usetiter.h
 BUILDLINK_FILES.icu+=	include/unicode/ushape.h
 BUILDLINK_FILES.icu+=	include/unicode/ustdio.h
+BUILDLINK_FILES.icu+=	include/unicode/ustream.h
 BUILDLINK_FILES.icu+=	include/unicode/ustring.h
 BUILDLINK_FILES.icu+=	include/unicode/utf.h
 BUILDLINK_FILES.icu+=	include/unicode/utf16.h
 BUILDLINK_FILES.icu+=	include/unicode/utf32.h
 BUILDLINK_FILES.icu+=	include/unicode/utf8.h
+BUILDLINK_FILES.icu+=	include/unicode/utf_old.h
 BUILDLINK_FILES.icu+=	include/unicode/utrans.h
 BUILDLINK_FILES.icu+=	include/unicode/utypes.h
-BUILDLINK_FILES.icu+=	lib/icu/1.7/Makefile.inc
-BUILDLINK_FILES.icu+=	lib/icu/1.7/lib*
-BUILDLINK_FILES.icu+=	lib/icu/Makefile.inc
-BUILDLINK_FILES.icu+=	lib/icu/current/Makefile.inc
-BUILDLINK_FILES.icu+=	lib/icu/current/lib*
+BUILDLINK_FILES.icu+=	include/unicode/uversion.h
+BUILDLINK_FILES.icu+=	lib/libicuctestfw.*
+BUILDLINK_FILES.icu+=	lib/libicudata.*
 BUILDLINK_FILES.icu+=	lib/libicui18n.*
+BUILDLINK_FILES.icu+=	lib/libicule.*
 BUILDLINK_FILES.icu+=	lib/libicutoolutil.*
 BUILDLINK_FILES.icu+=	lib/libicuuc.*
 BUILDLINK_FILES.icu+=	lib/libustdio.*
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 9fa1c328d6b..b2b03c29dcd 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 15:04:57 skrll Exp $
+$NetBSD: distinfo,v 1.3 2003/03/21 23:44:06 salo Exp $
 
-SHA1 (icu-1.7.tgz) = 36b4375201e828a3cd46559a5517c7fa11de8b90
-Size (icu-1.7.tgz) = 6089550 bytes
-SHA1 (patch-aa) = b7e671a0e7991539beb92f7e1649aa1f2aff180d
-SHA1 (patch-ab) = c64cf88893be5b67d1e47552154ce0fb9c399113
-SHA1 (patch-ac) = 24822cec39a3bd42b256499cea164384f17bf7c1
-SHA1 (patch-ad) = 8a2d92de7b29592a3005aab2b1183d79e96f37d2
-SHA1 (patch-ae) = 5b53e9234486aa7ac61494c7aba2c381a9f95ddb
-SHA1 (patch-af) = 8ab896f1547f8f3fb38eb83c43b6bda333acc0c4
+SHA1 (icu-2.4.tgz) = 6a0a9cb521b874bdd86d08a04b038ca6ad1a2b89
+Size (icu-2.4.tgz) = 7652187 bytes
+SHA1 (patch-aa) = 9aa4a0d8cc298fbe282ff3cf0e0099558f964cc4
+SHA1 (patch-ab) = ab0f327275c40247f7d790b6fcb529e5dd88fc06
+SHA1 (patch-ac) = 1a8bcfb5d6684c06487cb796a3f5d4f41a0c9568
+SHA1 (patch-ad) = 2b05b04287db43fc8adce79985c6f0f069595979
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 9cd1277353e..afc06ee50df 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2000/12/23 09:39:20 skrll Exp $
+$NetBSD: patch-aa,v 1.4 2003/03/21 23:44:07 salo Exp $
 
---- common/udata.c.orig	Wed Dec  6 03:02:12 2000
-+++ common/udata.c
-@@ -238,7 +238,7 @@
- #   define MAP_IMPLEMENTATION MAP_WIN32
+--- Makefile.in.orig	2002-11-14 19:44:14.000000000 +0100
++++ Makefile.in	2003-03-21 22:58:10.000000000 +0100
+@@ -132,7 +132,7 @@
+ 	$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
+ 	$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
+ 	$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)/README
+-	$(INSTALL_PROGRAM) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
++	$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
  
- /* ### Todo: auto detect mmap(). Until then, just add your platform here. */
--#elif HAVE_MMAP || defined(U_LINUX) || defined(POSIX) || defined(U_SOLARIS) || defined(AIX) || defined(HPUX) || defined(OS390) || defined(PTX)
-+#elif HAVE_MMAP || defined(U_LINUX) || defined(POSIX) || defined(U_SOLARIS) || defined(AIX) || defined(HPUX) || defined(OS390) || defined(PTX) || defined(U_BSD)
-     typedef size_t MemoryMap;
- 
- #   define NO_MAP 0
+ ifeq ($(DOXYGEN),)
+ install-doc:
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index 903ffda6502..177e5c33917 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/12/23 09:39:20 skrll Exp $
+$NetBSD: patch-ab,v 1.4 2003/03/21 23:44:07 salo Exp $
 
---- common/unicode/platform.h.in.orig	Tue Oct 17 23:50:27 2000
-+++ common/unicode/platform.h.in
-@@ -178,7 +178,7 @@
- #define U_NL_LANGINFO_CODESET		@U_NL_LANGINFO_CODESET@
+--- icudefs.mk.in.orig	2002-12-06 08:21:18.000000000 +0100
++++ icudefs.mk.in	2003-03-21 23:36:12.000000000 +0100
+@@ -65,7 +65,7 @@
  
- #define U_TZSET			@U_TZSET@
--#define U_TIMEZONE		@U_TIMEZONE@
-+#undef  U_TIMEZONE
- #define U_TZNAME		@U_TZNAME@
+ pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
+ pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
+-pkgsysconfdir = $(sysconfdir)/$(PACKAGE)$(ICULIBSUFFIX)
++pkgsysconfdir = $(sysconfdir)
+ 
+ # Installation programs
  
- /*===========================================================================*/
diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac
index e9fa67ef9a6..0601cba9fbc 100644
--- a/textproc/icu/patches/patch-ac
+++ b/textproc/icu/patches/patch-ac
@@ -1,20 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2000/12/23 09:39:20 skrll Exp $
+$NetBSD: patch-ac,v 1.4 2003/03/21 23:44:07 salo Exp $
 
---- configure.orig	Mon Dec  4 23:30:03 2000
-+++ configure
-@@ -3718,6 +3718,7 @@
- 	*-*-solaris*) 	platform=U_SOLARIS ;;
- 	*-*-linux*) 	platform=U_LINUX ;;
- 	*-*-freebsd*) 	platform=U_LINUX ;;
-+	*-*-netbsd*) 	platform=U_BSD ;;
- 	*-*-aix*) 	platform=AIX ;;
- 	*-sequent-*)	platform=PTX ;;
- 	*-*-hpux*) 	platform=HPUX ;;
-@@ -3740,6 +3741,7 @@
- 	*-*-solaris*) 	ld_rpath_suf=":" ;;
- 	*-*-linux*) 	ld_rpath_suf=" " ;;
- 	*-*-freebsd*) 	ld_rpath_suf=" " ;;
-+	*-*-netbsd*) 	ld_rpath_suf=" " ;;
- 	*-*-aix*) 	ld_rpath_suf="" ;;
- 	*-sequent-*)	ld_rpath_suf="" ;;
- 	*-*-hpux*) 	ld_rpath_suf=":" ;;
+--- data/Makefile.in.orig	2002-12-13 05:07:48.000000000 +0100
++++ data/Makefile.in	2003-03-22 00:05:30.000000000 +0100
+@@ -101,9 +101,9 @@
+ 	$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
+ 	$(INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(BUILDDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(BUILDDIR)/icudata.lst -I $(DESTDIR)$(ICUPKGDATA_DIR)
+ 
+-install-convrtrstxt: $(DESTDIR)$(pkgsysconfdir)/convrtrs.txt
+-$(DESTDIR)$(pkgsysconfdir)/convrtrs.txt: $(UCMSRCDIR)/convrtrs.txt
+-	$(MKINSTALLDIRS) $(DESTDIR)$(pkgsysconfdir)
++install-convrtrstxt: $(DESTDIR)$(prefix)/share/examples/icu/convrtrs.txt
++$(DESTDIR)$(prefix)/share/examples/icu/convrtrs.txt: $(UCMSRCDIR)/convrtrs.txt
++	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/examples/icu
+ 	$(INSTALL_DATA) $< $@
+ 
+ ####
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
index 361953a6b1f..5e286d0c54c 100644
--- a/textproc/icu/patches/patch-ad
+++ b/textproc/icu/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2000/12/23 09:39:21 skrll Exp $
+$NetBSD: patch-ad,v 1.4 2003/03/21 23:44:07 salo Exp $
 
---- test/intltest/intltest.cpp.orig	Tue Dec 12 19:40:58 2000
-+++ test/intltest/intltest.cpp
-@@ -411,7 +411,7 @@
-             mainDirBuffer[0]='\0';
-         }
-         mainDir=mainDirBuffer;
--    #elif defined(_AIX) || defined(U_SOLARIS) || defined(U_LINUX) || defined(HPUX) || defined(POSIX) || defined(OS390)
-+    #elif defined(_AIX) || defined(U_SOLARIS) || defined(U_LINUX) || defined(HPUX) || defined(POSIX) || defined(OS390) || defined(U_BSD)
-         char mainDirBuffer[200];
-         strcpy(mainDirBuffer, u_getDataDirectory());
-         strcat(mainDirBuffer, "/../");
+--- tools/gencnval/gencnval.1.in.orig	2002-04-18 05:06:00.000000000 +0200
++++ tools/gencnval/gencnval.1.in	2003-03-22 00:30:15.000000000 +0100
+@@ -71,8 +71,8 @@
+ .B ICU_DATA
+ is set.
+ .SH FILES
+-.TP \w'\fB@thesysconfdir@/@PACKAGE@/convrtrs.txt'u+3n
+-.B @thesysconfdir@/@PACKAGE@/convrtrs.txt
++.TP \w'\fB@thesysconfdir@/convrtrs.txt'u+3n
++.B @thesysconfdir@/convrtrs.txt
+ Description of ICU's converters and their aliases.
+ .SH VERSION
+ @VERSION@
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
deleted file mode 100644
index 5cb1f6909f0..00000000000
--- a/textproc/icu/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/12/23 09:39:21 skrll Exp $
-
---- tools/pkgdata/icupkg.inc.in.orig	Tue Oct 24 20:50:19 2000
-+++ tools/pkgdata/icupkg.inc.in
-@@ -107,3 +107,7 @@
- ifeq ($(strip $(PLATFORM)),U_LINUX)
-   TOOL=env LD_LIBRARY_PATH=$(LPATHS)
- endif
-+
-+ifeq ($(strip $(PLATFORM)),U_BSD)
-+  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-+endif
diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af
deleted file mode 100644
index 3e882b08196..00000000000
--- a/textproc/icu/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/01/13 16:25:52 skrll Exp $
-
---- data/Makefile.in.orig	Wed Dec 13 03:13:56 2000
-+++ data/Makefile.in
-@@ -118,7 +118,7 @@
- 	$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUDATA_DIR)/$(VERSION)
- 	( cd build ; $(INVOKE) $(PKGDATA) -e icudata -T . -s . -p $(ICUDATA_NAME) icudata.lst -I $(DESTDIR)$(ICUDATA_DIR)/$(VERSION) )
- ifeq ($(strip $(PKGDATA_MODE)),dll)
--	(cd $(DESTDIR)$(ICUDATA_DIR)/$(VERSION); $(RM) icudata.$(SO) && ln -s $(ICUDATA_NAME).$(SO) icudata.$(SO))
-+	(cd $(DESTDIR)$(ICUDATA_DIR)/$(VERSION); $(RM) libicudata.$(SO) && ln -s lib$(ICUDATA_NAME).$(SO) libicudata.$(SO))
- endif
- 
- install-convrtrstxt: $(top_srcdir)/../data/convrtrs.txt