update to 2.8

Lot's of changes and fixes.
For example:
# Number Formatting
  ICU4C adds support for formatting and parsing of 64-bit integers.
# Text Analysis (Break Iterators)
  Full conformance with Unicode Consortium UAX 29 and UAX 14 definitions for
  text boundary positions. Significantly improved performance for reverse
  direction iteration and isBoundary tests of arbitrary string positions.
# StringPrep
  ICU 2.8 adds APIs and a tool for generic support of StringPrep profiles such
  as those used in NFS 4.

For a complete list see:
http://oss.software.ibm.com/icu/download/2.8/index.html

8 files changed, 70 insertions, 101 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index fc09f12cc40..f2f3eb9cd59 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.29 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/04 16:58:16 recht Exp $
 #
 
-DISTNAME=	icu-2.6.1
+DISTNAME=	icu-2.8
 CATEGORIES=	textproc
 #
 # The IBM site has long delays that can cause ftp to timeout.  Use the
 # backup FTP repositories in preference to the IBM one.
 #
-MASTER_SITES=	${MASTER_SITE_BACKUP} \
-		ftp://www-126.ibm.com/pub/icu/${PKGVERSION}/
+#MASTER_SITES=	${MASTER_SITE_BACKUP} \
+#		ftp://www-126.ibm.com/pub/icu/${PKGVERSION}/
+MASTER_SITES=	ftp://www-126.ibm.com/pub/icu/${PKGVERSION}/
+
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -17,8 +19,9 @@ COMMENT=	Robust and full-featured Unicode services
 
 WRKSRC=			${WRKDIR}/${PKGBASE}/source
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
+USE_LANGUAGES=		c c++
 TEST_TARGET=		check
 
 GNU_CONFIGURE=		YES
@@ -28,24 +31,19 @@ CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 PKG_SYSCONFSUBDIR=	icu
 
-SUPPORT_FILES+=		${PREFIX}/share/examples/icu/convrtrs.txt \
-			${PKG_SYSCONFDIR}/convrtrs.txt
+CONVRTRS_EG=		${CONVRTRS_EG_DIR}/convrtrs.txt
+CONVRTRS_EG_DIR=	${PREFIX}/share/examples/icu
+
+SUPPORT_FILES+=		${CONVRTRS_EG} ${PKG_SYSCONFDIR}/convrtrs.txt
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-3*)
-CXXFLAGS:=		${CXXFLAGS:C/-O[0-9]*/-O/g}
-CFLAGS:=		${CFLAGS:C/-Os/-O/g}
-CXXFLAGS:=		${CXXFLAGS:C/-Os/-O/g}
-CFLAGS:=		${CFLAGS:C/-O[0-9]*/-O/g}
-CONFIGURE_ENV+=		CXXFLAGS="${CXXFLAGS}"
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}"
-.endif
+post-install:
+	${INSTALL_DATA_DIR} ${CONVRTRS_EG_DIR}
+	${INSTALL_DATA} ${WRKSRC}/data/mappings/convrtrs.txt ${CONVRTRS_EG}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index 75d3136c643..5c62293fa38 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/03 16:52:48 recht Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/04 16:58:16 recht Exp $
 bin/derb
 bin/genbrk
 bin/gencnval
@@ -7,10 +7,6 @@ bin/icu-config
 bin/makeconv
 bin/pkgdata
 bin/uconv
-include/layout/ArabicLayoutEngine.h
-include/layout/GXLayoutEngine.h
-include/layout/HanLayoutEngine.h
-include/layout/IndicLayoutEngine.h
 include/layout/LEFontInstance.h
 include/layout/LEGlyphFilter.h
 include/layout/LELanguages.h
@@ -18,10 +14,8 @@ include/layout/LEScripts.h
 include/layout/LESwaps.h
 include/layout/LETypes.h
 include/layout/LayoutEngine.h
-include/layout/OpenTypeLayoutEngine.h
 include/layout/ParagraphLayout.h
 include/layout/RunArrays.h
-include/layout/ThaiLayoutEngine.h
 include/unicode/brkiter.h
 include/unicode/calendar.h
 include/unicode/caniter.h
@@ -63,6 +57,7 @@ include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
 include/unicode/strenum.h
 include/unicode/stsearch.h
+include/unicode/symtable.h
 include/unicode/tblcoll.h
 include/unicode/timezone.h
 include/unicode/translit.h
@@ -86,6 +81,7 @@ include/unicode/uenum.h
 include/unicode/uidna.h
 include/unicode/uiter.h
 include/unicode/uloc.h
+include/unicode/ulocdata.h
 include/unicode/umachine.h
 include/unicode/umisc.h
 include/unicode/umsg.h
@@ -107,6 +103,7 @@ include/unicode/usearch.h
 include/unicode/uset.h
 include/unicode/usetiter.h
 include/unicode/ushape.h
+include/unicode/usprep.h
 include/unicode/ustdio.h
 include/unicode/ustream.h
 include/unicode/ustring.h
@@ -115,68 +112,67 @@ include/unicode/utf16.h
 include/unicode/utf32.h
 include/unicode/utf8.h
 include/unicode/utf_old.h
+include/unicode/utrace.h
 include/unicode/utrans.h
 include/unicode/utypes.h
 include/unicode/uversion.h
 lib/icu/${PKGVERSION}/Makefile.inc
 lib/icu/Makefile.inc
 lib/icu/current
-lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.26
-lib/libicudata.so.26.1
-lib/libicui18n.a
+lib/libicudata.so.28
+lib/libicudata.so.28.0
 lib/libicui18n.so
-lib/libicui18n.so.26
-lib/libicui18n.so.26.1
-lib/libicuio.a
+lib/libicui18n.so.28
+lib/libicui18n.so.28.0
 lib/libicuio.so
-lib/libicuio.so.26
-lib/libicuio.so.26.1
-lib/libicule.a
+lib/libicuio.so.28
+lib/libicuio.so.28.0
 lib/libicule.so
-lib/libicule.so.26
-lib/libicule.so.26.1
-lib/libiculx.a
+lib/libicule.so.28
+lib/libicule.so.28.0
 lib/libiculx.so
-lib/libiculx.so.26
-lib/libiculx.so.26.1
-lib/libicutoolutil.a
+lib/libiculx.so.28
+lib/libiculx.so.28.0
 lib/libicutoolutil.so
-lib/libicutoolutil.so.26
-lib/libicutoolutil.so.26.1
-lib/libicuuc.a
+lib/libicutoolutil.so.28
+lib/libicutoolutil.so.28.0
 lib/libicuuc.so
-lib/libicuuc.so.26
-lib/libicuuc.so.26.1
+lib/libicuuc.so.28
+lib/libicuuc.so.28.0
+lib/libsicudata.a
+lib/libsicui18n.a
+lib/libsicuio.a
+lib/libsicule.a
+lib/libsiculx.a
+lib/libsicutoolutil.a
+lib/libsicuuc.a
 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/decmn.8
 man/man8/genccode.8
 man/man8/gencmn.8
-man/man8/genidna.8
 man/man8/gennames.8
 man/man8/gennorm.8
 man/man8/genprops.8
+man/man8/gensprep.8
 man/man8/genuca.8
 sbin/decmn
 sbin/genccode
 sbin/gencmn
-sbin/genidna
 sbin/gennames
 sbin/gennorm
 sbin/genpname
 sbin/genprops
-sbin/gentz
+sbin/gensprep
 sbin/genuca
+sbin/icuswap
 share/examples/icu/convrtrs.txt
-share/icu/${PKGVERSION}/README
 share/icu/${PKGVERSION}/config/mh-bsd-gcc
 share/icu/${PKGVERSION}/license.html
 share/icu/${PKGVERSION}/mkinstalldirs
diff --git a/textproc/icu/buildlink2.mk b/textproc/icu/buildlink2.mk
index d759a2c7c57..53db0566a36 100644
--- a/textproc/icu/buildlink2.mk
+++ b/textproc/icu/buildlink2.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/06/23 07:49:39 jlam Exp $
-#
-# This Makefile fragment is included by packages that use icu.
+# $NetBSD: buildlink2.mk,v 1.5 2004/04/04 16:58:16 recht Exp $
 
 .if !defined(ICU_BUILDLINK2_MK)
 ICU_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		icu
-BUILDLINK_DEPENDS.icu?=		icu>=2.6
+BUILDLINK_DEPENDS.icu?=	icu>=2.8
 BUILDLINK_PKGSRCDIR.icu?=	../../textproc/icu
 
-EVAL_PREFIX+=			BUILDLINK_PREFIX.icu=icu
+EVAL_PREFIX+=	BUILDLINK_PREFIX.icu=icu
 BUILDLINK_PREFIX.icu_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_FILES.icu+=	include/layout/*
-BUILDLINK_FILES.icu+=	include/unicode/*
+BUILDLINK_FILES.icu+=	include/layout/*.h
+BUILDLINK_FILES.icu+=	include/unicode/*.h
+BUILDLINK_FILES.icu+=	lib/icu/${PKGVERSION}/Makefile.inc
+BUILDLINK_FILES.icu+=	lib/icu/Makefile.inc
+BUILDLINK_FILES.icu+=	lib/icu/current
 BUILDLINK_FILES.icu+=	lib/libicudata.*
 BUILDLINK_FILES.icu+=	lib/libicui18n.*
 BUILDLINK_FILES.icu+=	lib/libicuio.*
@@ -21,7 +21,13 @@ BUILDLINK_FILES.icu+=	lib/libicule.*
 BUILDLINK_FILES.icu+=	lib/libiculx.*
 BUILDLINK_FILES.icu+=	lib/libicutoolutil.*
 BUILDLINK_FILES.icu+=	lib/libicuuc.*
-
+BUILDLINK_FILES.icu+=	lib/libsicudata.*
+BUILDLINK_FILES.icu+=	lib/libsicui18n.*
+BUILDLINK_FILES.icu+=	lib/libsicuio.*
+BUILDLINK_FILES.icu+=	lib/libsicule.*
+BUILDLINK_FILES.icu+=	lib/libsiculx.*
+BUILDLINK_FILES.icu+=	lib/libsicutoolutil.*
+BUILDLINK_FILES.icu+=	lib/libsicuuc.*
 BUILDLINK_TARGETS+=	icu-buildlink
 
 icu-buildlink: _BUILDLINK_USE
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 26ed0c997af..37065c1e03b 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/04 16:58:16 recht Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICU_BUILDLINK3_MK:=	${ICU_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nicu}
 BUILDLINK_PACKAGES+=	icu
 
 .if !empty(ICU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.icu+=		icu>=2.6
+BUILDLINK_DEPENDS.icu+=	icu>=2.8
 BUILDLINK_PKGSRCDIR.icu?=	../../textproc/icu
 .endif	# ICU_BUILDLINK3_MK
 
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 84d3f78aba6..55d1543cab3 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.6 2003/12/03 16:52:48 recht Exp $
+$NetBSD: distinfo,v 1.7 2004/04/04 16:58:16 recht Exp $
 
-SHA1 (icu-2.6.1.tgz) = 4b7e8c44963cd36f1a73c8967f41e461cda95c48
-Size (icu-2.6.1.tgz) = 8328194 bytes
-SHA1 (patch-aa) = 1aa9cd7e0be296f782557a02c5dc9921aede6ca8
-SHA1 (patch-ab) = 5d13368bfae12aee2d474d7e71dc37a1bb2ffbcc
-SHA1 (patch-ac) = 7639e568de1ef2ff8e0ebf2cb6da53c86831c253
+SHA1 (icu-2.8.tgz) = 45a9a452274e412b66c7e5c52e245272c0469fb1
+Size (icu-2.8.tgz) = 9194758 bytes
+SHA1 (patch-aa) = 232747183178f54be24145039b6ab5519fcff7a6
 SHA1 (patch-ae) = c7e9d86a0799bfac79495f93b4f71608dfefef00
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 34b8d0949c4..c67b02598ca 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/06/23 07:49:40 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2004/04/04 16:58:16 recht Exp $
 
---- Makefile.in.orig	Thu Jun 19 18:42:30 2003
-+++ Makefile.in	Thu Jun 19 18:46:06 2003
-@@ -180,7 +180,7 @@
+--- Makefile.in.orig	2003-12-02 20:07:34.000000000 +0100
++++ Makefile.in	2004-02-06 03:04:44.000000000 +0100
+@@ -176,7 +176,7 @@
  
  $(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/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
deleted file mode 100644
index d40b119f300..00000000000
--- a/textproc/icu/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/06/23 07:49:41 jlam Exp $
-
---- icudefs.mk.in.orig	Mon Jun  2 23:44:40 2003
-+++ icudefs.mk.in	Thu Jun 19 18:53:06 2003
-@@ -64,6 +64,7 @@
- # ICU specific directories
- 
- pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
-+pkgexampledir = $(datadir)/examples/$(PACKAGE)$(ICULIBSUFFIX)
- pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
- pkgsysconfdir = $(sysconfdir)/$(PACKAGE)$(ICULIBSUFFIX)
- 
diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac
deleted file mode 100644
index b633f9f3cf7..00000000000
--- a/textproc/icu/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/06/23 07:49:41 jlam Exp $
-
---- data/Makefile.in.orig	Thu Jun 19 18:48:54 2003
-+++ data/Makefile.in	Thu Jun 19 18:54:43 2003
-@@ -111,9 +111,9 @@
- 	$(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(BUILDDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(BUILDDIR)/icudata.lst -I $(DESTDIR)$(ICUPKGDATA_DIR)
- endif
- 
--install-convrtrstxt: $(DESTDIR)$(pkgsysconfdir)/convrtrs.txt
--$(DESTDIR)$(pkgsysconfdir)/convrtrs.txt: $(UCMSRCDIR)/convrtrs.txt
--	$(MKINSTALLDIRS) $(DESTDIR)$(pkgsysconfdir)
-+install-convrtrstxt: $(DESTDIR)$(pkgexampledir)/convrtrs.txt
-+$(DESTDIR)$(pkgexampledir)/convrtrs.txt: $(UCMSRCDIR)/convrtrs.txt
-+	$(MKINSTALLDIRS) $(DESTDIR)$(pkgexampledir)
- 	$(INSTALL_DATA) $< $@
- 
- ####