Update textproc/icu to 2.6. This is a major reference release with new

features and new and modified APIs from version 2.4:

* Added support for Unicode 4.0
* Added support for Unicode regular expressions
* Enhanced sorting
* Added support for international domain names
* Added service registration for pluggable ICU modules
* Added layout engine API for language-specific glyphs
* Separated currencies from locales
* Added POSIX-like API for message catalogs
* Added new charset converters

4 files changed, 21 insertions, 46 deletions

diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index db4086c420e..34b8d0949c4 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2003/04/10 15:32:01 kent Exp $
+$NetBSD: patch-aa,v 1.6 2003/06/23 07:49:40 jlam Exp $
 
---- Makefile.in.orig	2002-11-15 03:44:14.000000000 +0900
-+++ Makefile.in
-@@ -132,7 +132,7 @@ install-icu: $(INSTALLED_BUILT_FILES)
- 	$(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
- 
- ifeq ($(DOXYGEN),)
- install-doc:
-@@ -180,7 +180,7 @@ $(top_builddir)/config/Makefile.inc: $(s
+--- Makefile.in.orig	Thu Jun 19 18:42:30 2003
++++ Makefile.in	Thu Jun 19 18:46:06 2003
+@@ -180,7 +180,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) $@
 -	$(INSTALL_DATA) $(top_srcdir)/config/icu-config-top $@
-+	cp $(top_srcdir)/config/icu-config-top $@
++	cp -f $(top_srcdir)/config/icu-config-top $@
  	@echo "# Following from @platform_make_fragment@" >> $@
  	sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
  	sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index 177e5c33917..d40b119f300 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2003/03/21 23:44:07 salo Exp $
+$NetBSD: patch-ab,v 1.5 2003/06/23 07:49:41 jlam Exp $
 
---- 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 @@
+--- 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)
-+pkgsysconfdir = $(sysconfdir)
- 
- # Installation programs
+ pkgsysconfdir = $(sysconfdir)/$(PACKAGE)$(ICULIBSUFFIX)
  
diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac
index 0601cba9fbc..b633f9f3cf7 100644
--- a/textproc/icu/patches/patch-ac
+++ b/textproc/icu/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2003/03/21 23:44:07 salo Exp $
+$NetBSD: patch-ac,v 1.5 2003/06/23 07:49:41 jlam Exp $
 
---- 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)
+--- 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)$(prefix)/share/examples/icu/convrtrs.txt
-+$(DESTDIR)$(prefix)/share/examples/icu/convrtrs.txt: $(UCMSRCDIR)/convrtrs.txt
-+	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/examples/icu
++install-convrtrstxt: $(DESTDIR)$(pkgexampledir)/convrtrs.txt
++$(DESTDIR)$(pkgexampledir)/convrtrs.txt: $(UCMSRCDIR)/convrtrs.txt
++	$(MKINSTALLDIRS) $(DESTDIR)$(pkgexampledir)
  	$(INSTALL_DATA) $< $@
  
  ####
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
deleted file mode 100644
index 5e286d0c54c..00000000000
--- a/textproc/icu/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2003/03/21 23:44:07 salo Exp $
-
---- 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@