Update to version 1.7. Changes are (from the web page)

Collation performance is improved.
The collation implementation will continue to change for ICU 1.8 according to the collation design document.
Improved performance of parsing and formatting of dates and numbers
Improvements in the ISO-2022 implementation
      Bug fixes, more stable, and support for standard country variants:
      ISO-2022-JP (incl. -1, -2)
      ISO-2022-CN (incl. -EXT)
      ISO-2022-KR
Support for GB 18030
Basic support for UTF-32 (no ucnv_getNextUChar(), incomplete offset handling)
Support for the HZ encoding
Converter fallback semantics modified and .ucm mapping files updated with precise roundtrip/fallback indicators
ICU library names include the version number for better coexistence of different installed ICU versions on a single machine
      The code libraries contain the two major/minor version digits
      On Windows, they also contain a 'd' for the debug versions
      The icu data file contains the ICU version and a letter for the data configuration (ASCII/EBCDIC, big-endian/little-endian)
      ICU client code links with .lib files/object symlinks without the version number for easier future updates
Debian packaging
The API documentation is improved.

24 files changed, 103 insertions, 491 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 5c5661a046a..f5081ed556e 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2000/12/21 10:21:32 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/21 18:14:18 skrll Exp $
 #
 
-DISTNAME=	icu-1.6
+DISTNAME=	icu-1.7
 CATEGORIES=	textproc
-MASTER_SITES=	http://oss.software.ibm.com/icu/download/1.6/
+MASTER_SITES=	http://oss.software.ibm.com/icu/download/1.7/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	skrll@netbsd.org
@@ -19,16 +19,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
-post-extract:
-	${CP} ${FILESDIR}/mh-netbsd ${WRKSRC}/config
-
 pre-configure:
 	${CHMOD} u+rx ${WRKSRC}/configure
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/icu
-	${INSTALL_DATA} ${WRKDIR}/icu/docs/* ${PREFIX}/share/doc/html/icu
-
 test: build
 	cd ${WRKSRC} && ${MAKE_PROGRAM} check
 
diff --git a/textproc/icu/files/md5 b/textproc/icu/files/md5
index 0a40182ce99..f4ecea300a9 100644
--- a/textproc/icu/files/md5
+++ b/textproc/icu/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/12/20 18:28:01 skrll Exp $
+$NetBSD: md5,v 1.2 2000/12/21 18:14:18 skrll Exp $
 
-MD5 (icu-1.6.tgz) = 38f699d58c9491cb34d119d38695c04c
+MD5 (icu-1.7.tgz) = 8f58c2087ffd9431ab6ad27fce2ba092
diff --git a/textproc/icu/files/patch-sum b/textproc/icu/files/patch-sum
index ea23d617faa..39e517f9a81 100644
--- a/textproc/icu/files/patch-sum
+++ b/textproc/icu/files/patch-sum
@@ -1,22 +1,7 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/12/20 18:28:01 skrll Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/21 18:14:18 skrll Exp $
 
-MD5 (patch-aa) = f69c8c9ea4dd80dc9d11ff69a6a1d9c8
-MD5 (patch-ab) = d249648dce9bb8a0769f2226456c4281
-MD5 (patch-ac) = 9aaae729a86a161837accbc40e779ae1
-MD5 (patch-ad) = 686ca2a3f71c348d0082ad4fbe5ad118
-MD5 (patch-ae) = e86903ffb3b3b6afec199b9c01750219
-MD5 (patch-af) = 6f02676d521992518db8ff9b3bd6e8ed
-MD5 (patch-ag) = a9364837987c1bf1d84910c932f3a336
-MD5 (patch-ah) = 97d033c683f902153a7580cd3f4a6362
-MD5 (patch-ai) = a9a3b666a431f1caba760743389430e0
-MD5 (patch-aj) = cc9e43b42a4906a9900ee90723b4e910
-MD5 (patch-ak) = 5a5f53e6e29f6152ccc8731c3f109742
-MD5 (patch-al) = a042cf8a45ba10c04dd55b6e793a9330
-MD5 (patch-am) = a90419b0020cea4c8dc1d342923ddbed
-MD5 (patch-an) = 37bba50c33ed59b6702cf5f3ae2fb40f
-MD5 (patch-ao) = 617de721fded7b3cc1f00b760348f19a
-MD5 (patch-ap) = 111b690bfb9d6193c23098a3b672cfc3
-MD5 (patch-aq) = c03a10131f965e9212430b28d3c38bb6
-MD5 (patch-ar) = 0a78b457d119e52f1c84ac3b7d35e9b3
-MD5 (patch-as) = fbcc0aad1e95c04f8ab01c27aa42e6ec
-MD5 (patch-at) = f3cb15ce4fc1a352567d7d2f48cf4df9
+MD5 (patch-aa) = 144fa181401e241047caf8f4254c1087
+MD5 (patch-ab) = 811ff8c3eb5ef7a68fb3232442de1951
+MD5 (patch-ac) = b4286342af780046b878b1e312b367d0
+MD5 (patch-ad) = c78a8fd70a799d1ba7f4571a679a86b2
+MD5 (patch-ae) = b802a4610b6163c495bd5a642fff6c22
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 35217cb3f84..70f49aa3ac0 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/20 18:28:02 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/21 18:14:18 skrll Exp $
 
---- common/Makefile.in.orig	Wed Dec 20 17:43:36 2000
-+++ common/Makefile.in
-@@ -109,8 +109,8 @@
- install-headers:
- 	$(mkinstalldirs) $(DESTDIR)$(includedir)/unicode
- 	@for file in $(HEADERS); do \
--	 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode"; \
--	 $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \
-+	 echo "$(INSTALL_DATA) -p $$file $(DESTDIR)$(includedir)/unicode"; \
-+	 $(INSTALL_DATA) -p $$file $(DESTDIR)$(includedir)/unicode || exit; \
- 	done
+--- common/udata.c.orig	Thu Dec 21 15:37:15 2000
++++ common/udata.c
+@@ -238,7 +238,7 @@
+ #   define MAP_IMPLEMENTATION MAP_WIN32
  
- dist-local:
+ /* ### 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
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index 1dc36e8ec81..4502585e65c 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,48 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/20 18:28:06 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2000/12/21 18:14:18 skrll Exp $
 
---- common/putil.c.orig	Fri Aug 11 21:36:52 2000
-+++ common/putil.c
-@@ -86,7 +86,7 @@
- #   include <Script.h>
- #elif defined(AIX)
- #   include <sys/ldr.h>
--#elif defined(U_SOLARIS) || defined(U_LINUX)
-+#elif defined(U_SOLARIS) || defined(U_LINUX) /* || defined(U_NETBSD) */
- #   include <dlfcn.h>
- #   include <link.h>
- #elif defined(HPUX)
-@@ -686,7 +686,7 @@
- int32_t 
- uprv_timezone()
- {
--#if defined(U_POSIX)
-+#if defined(U_POSIX) && !defined(U_NETBSD)
- #if defined(OS390)
-   return _timezone;
- #else
-@@ -694,7 +694,7 @@
- #endif
- #endif
+--- 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@
  
--#if defined(OS400) || defined(XP_MAC) || defined(U_DARWIN)
-+#if defined(OS400) || defined(XP_MAC) || defined(U_DARWIN) || defined(U_NETBSD)
-   time_t t, t1, t2;
-   struct tm tmrec;
-   UBool dst_checked;
-@@ -989,6 +989,7 @@
- #   elif defined(XP_MAC)
- #   elif defined(U_SOLARIS)
- #   elif defined(U_LINUX)
-+#   elif defined(U_NETBSD)
- #       define LIB_PATH_VAR "LD_LIBRARY_PATH"
- #       define LIB_FILENAME "libicuuc.so"
- #   elif defined(AIX)
-@@ -1578,7 +1579,7 @@
-     {
-         uprv_memset(codesetName, 0, 100);
-     }
--#if U_HAVE_NL_LANGINFO
-+#if defined(U_HAVE_NL_LANGINFO) && !defined(U_NETBSD)
- #ifdef U_LINUX
-     if (nl_langinfo(_NL_CTYPE_CODESET_NAME) != NULL)
-         uprv_strcpy(codesetName, nl_langinfo(_NL_CTYPE_CODESET_NAME));     
+ #define U_TZSET			@U_TZSET@
+-#define U_TIMEZONE		@U_TIMEZONE@
++#undef  U_TIMEZONE
+ #define U_TZNAME		@U_TZNAME@
+ 
+ /*===========================================================================*/
diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac
index 78052cec973..a85ab5ac634 100644
--- a/textproc/icu/patches/patch-ac
+++ b/textproc/icu/patches/patch-ac
@@ -1,31 +1,20 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/20 18:28:06 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2000/12/21 18:14:18 skrll Exp $
 
---- common/uresbund.c.orig	Wed Aug 16 21:44:50 2000
-+++ common/uresbund.c
-@@ -238,7 +238,7 @@
-             r->fBogus = U_USING_FALLBACK_ERROR;
-         } else { /* if we have a regular entry */
-             /* handle the alias by trying to get out the %%Alias tag.*/
--            char aliasName[100];
-+            char aliasName[256];
-             int32_t aliasLen;
-             /* We'll try to get alias string from the bundle */
-             Resource aliasres = res_getResource(&(r->fData), "%%ALIAS");
-@@ -1027,7 +1027,7 @@
-                     const char* localeID,
-                     UErrorCode* status)
- {
--    char path[100];
-+    char path[256];
-     UResourceBundle *r;
-     size_t tempSize = uprv_wcstombs(NULL, myPath, ((size_t)-1) >> 1);
-     /*char *temp = new char[tempSize + 1];*/
-@@ -1051,7 +1051,7 @@
-                   const char* localeID, 
-                   UErrorCode* status)
- {
--    char path[100];
-+    char path[256];
-     UResourceBundle *r;
-     int32_t pathlen = u_strlen(myPath);
- 
+--- 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=":" ;;
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
index 75967c88504..fb87bf3826e 100644
--- a/textproc/icu/patches/patch-ad
+++ b/textproc/icu/patches/patch-ad
@@ -1,28 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/20 18:28:05 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2000/12/21 18:14:18 skrll Exp $
 
---- configure.orig	Wed Aug 16 18:02:34 2000
-+++ configure
-@@ -1199,6 +1199,7 @@
- *-*-mips*)	icu_cv_host_frag=$srcdir/config/mh-irix ;;
- *-*-linux*) 	icu_cv_host_frag=$srcdir/config/mh-linux ;;
- *-*-freebsd*) 	icu_cv_host_frag=$srcdir/config/mh-freebsd ;;
-+*-*-netbsd*) 	icu_cv_host_frag=$srcdir/config/mh-netbsd ;;
- *-*-aix*) 	
- 	case "$CXX" in
- 	*vacpp*)icu_cv_host_frag=$srcdir/config/mh-aix-va ;;
-@@ -2959,6 +2960,7 @@
- 	*-*-solaris*) 	platform=U_SOLARIS ;;
- 	*-*-linux*) 	platform=U_LINUX ;;
- 	*-*-freebsd*) 	platform=U_LINUX ;;
-+	*-*-netbsd*) 	platform=U_NETBSD ;;
- 	*-*-aix*) 	platform=AIX ;;
- 	*-sequent-*)	platform=PTX ;;
- 	*-*-hpux*) 	platform=HPUX ;;
-@@ -2976,6 +2978,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=":" ;;
+--- test/intltest/intltest.cpp.orig	Thu Dec 21 15:38:00 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, "/../");
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
index 4e9ec7c0a64..a3fff2cab48 100644
--- a/textproc/icu/patches/patch-ae
+++ b/textproc/icu/patches/patch-ae
@@ -1,21 +1,12 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/20 18:28:05 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2000/12/21 18:14:18 skrll Exp $
 
---- test/cintltst/Makefile.in.orig	Thu Aug 10 02:33:28 2000
-+++ test/cintltst/Makefile.in
-@@ -43,6 +43,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = test/cintltst
-+BUILD_LPATH=$(top_builddir)/common
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -103,7 +104,7 @@
- 	$(RMV) Makefile $(DEPS)
- 
- check-local: all-local
--	ICU_DATA=@DATABUILDDIR@/ TZ=PST8PDT ./$(TARGET)
-+	$(TOOL) ICU_DATA=@DATABUILDDIR@/ TZ=PST8PDT ./$(TARGET)
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
+--- tools/pkgdata/icupkg.inc.in.orig	Thu Dec 21 15:38:50 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 fefb0b73c7f..00000000000
--- a/textproc/icu/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/12/20 18:28:05 skrll Exp $
-
---- test/cintltst/cintltst.c.orig	Wed Aug 16 23:27:48 2000
-+++ test/cintltst/cintltst.c
-@@ -158,7 +158,7 @@
- {
-     if (_testDirectory == NULL) 
-     {
--#if defined(_AIX) || defined(U_SOLARIS) || defined(U_LINUX) || defined(HPUX) || defined(POSIX) || defined(OS390)
-+#if defined(_AIX) || defined(U_SOLARIS) || defined(U_LINUX) || defined(HPUX) || defined(POSIX) || defined(OS390) || defined(U_NETBSD)
-         ctest_setTestDirectory("source|test|testdata|");
- #else
-         ctest_setTestDirectory("icu|source|test|testdata|");
diff --git a/textproc/icu/patches/patch-ag b/textproc/icu/patches/patch-ag
deleted file mode 100644
index d8086dbc4fa..00000000000
--- a/textproc/icu/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/12/20 18:28:05 skrll Exp $
-
---- test/intltest/Makefile.in.orig	Wed Aug 16 23:30:12 2000
-+++ test/intltest/Makefile.in
-@@ -55,6 +55,8 @@
- $(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n
- LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@ @LIB_M@
- 
-+BUILD_LPATH=$(top_builddir)/common
-+
- OBJECTS = allcoll.o apicoll.o callimts.o calregts.o caltest.o		\
- caltztst.o citrtest.o cppcnvt.o cputilst.o currcoll.o dacoll.o		\
- dcfmapts.o decoll.o dtfmapts.o dtfmrgts.o dtfmtrtts.o dtfmttst.o	\
-@@ -99,7 +101,7 @@
- 	$(RMV) Makefile $(DEPS)
- 
- check-local: all-local
--	 ICU_DATA=@DATABUILDDIR@/ TZ=PST8PDT ./$(TARGET) 
-+	 $(TOOL) ICU_DATA=@DATABUILDDIR@/ TZ=PST8PDT ./$(TARGET) 
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
diff --git a/textproc/icu/patches/patch-ah b/textproc/icu/patches/patch-ah
deleted file mode 100644
index f3762ab07b9..00000000000
--- a/textproc/icu/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/12/20 18:28:05 skrll Exp $
-
---- test/intltest/intltest.cpp.orig	Tue Aug 15 00:44:12 2000
-+++ test/intltest/intltest.cpp
-@@ -386,7 +386,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_NETBSD)
-         char mainDirBuffer[200];
-         strcpy(mainDirBuffer, u_getDataDirectory());
-         strcat(mainDirBuffer, "/../");
-@@ -453,7 +453,7 @@
- {
-        if (_testDirectory == NULL) 
-     {
--#if defined(_AIX) || defined(U_SOLARIS) || defined(U_LINUX) || defined(HPUX) || defined(POSIX) || defined(OS390)
-+#if defined(_AIX) || defined(U_SOLARIS) || defined(U_LINUX) || defined(HPUX) || defined(POSIX) || defined(OS390) || defined(U_NETBSD)
-       setTestDirectory("source|test|testdata|");
- #else
-       setTestDirectory("icu|source|test|testdata|");
diff --git a/textproc/icu/patches/patch-ai b/textproc/icu/patches/patch-ai
deleted file mode 100644
index 7823e24162a..00000000000
--- a/textproc/icu/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/12/20 18:28:04 skrll Exp $
-
---- test/intltest/restest.cpp.orig	Mon Aug 14 22:42:36 2000
-+++ test/intltest/restest.cpp
-@@ -308,8 +308,8 @@
-         uprv_strcat(testdatapath, "testdata");
- 
- 
--        wchar_t* wideDirectory = new wchar_t[256];
--        mbstowcs(wideDirectory, testdatapath, 256);
-+        wchar_t* wideDirectory = new wchar_t[1024];
-+        mbstowcs(wideDirectory, testdatapath, 1024);
-         //mbstowcs(wideDirectory, "c:\\icu\\icu\\source\\test\\testdata\\testdata", 256);
- 
-         ResourceBundle  test2(wideDirectory, locale, err);
diff --git a/textproc/icu/patches/patch-aj b/textproc/icu/patches/patch-aj
deleted file mode 100644
index feedcaa209d..00000000000
--- a/textproc/icu/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/12/20 18:28:04 skrll Exp $
-
---- test/intltest/tsmthred.cpp.orig	Mon Aug 14 22:42:36 2000
-+++ test/intltest/tsmthred.cpp
-@@ -12,7 +12,7 @@
- 
- #include <unicode/umachine.h>
- 
--#if !defined(WIN32) && !defined(XP_MAC) && !defined(U_DARWIN)
-+#if !defined(WIN32) && !defined(XP_MAC) && !defined(U_DARWIN) && !defined(U_NETBSD)
- #define POSIX 1
- #endif
- 
diff --git a/textproc/icu/patches/patch-ak b/textproc/icu/patches/patch-ak
deleted file mode 100644
index b68fecc3e1c..00000000000
--- a/textproc/icu/patches/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/12/20 18:28:04 skrll Exp $
-
---- tools/Makefile.in.orig	Tue Aug 15 18:20:40 2000
-+++ tools/Makefile.in
-@@ -35,6 +35,7 @@
- ## Build directory information
- top_builddir = ..
- subdir = tools
-+BUILD_LPATH=$(top_builddir)/../common
- 
- ## Type of build
- @USE_MAPPED_TRUE@  DEFAULT_MODE=common
-@@ -57,7 +58,7 @@
- TMPDATADIR=./tmp
- 
- # relative lib links from pkgdata are the same as for tmp
--PKGDATA=../pkgdata/pkgdata -T . -s @DATABUILDDIR@ -O ./icupkg.inc -d @DATABUILDDIR@ -v -m $(MODE) 
-+PKGDATA=$(TOOL) ../pkgdata/pkgdata -T . -s @DATABUILDDIR@ -O ./icupkg.inc -d @DATABUILDDIR@ -v -m $(MODE) 
- 
- ## Install program information
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/textproc/icu/patches/patch-al b/textproc/icu/patches/patch-al
deleted file mode 100644
index fe8f0dc7fef..00000000000
--- a/textproc/icu/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2000/12/20 18:28:04 skrll Exp $
-
---- tools/gencnval/Makefile.in.orig	Tue Aug  1 02:55:50 2000
-+++ tools/gencnval/Makefile.in
-@@ -45,6 +45,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = tools/gencnval
-+BUILD_LPATH=$(top_builddir)/common
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -92,7 +93,7 @@
- # we set the ICU_DATA directory here so that unames.dat ends up in 
- # icu/data rather than PREFIX/share/icu/VERSION/
- $(ICUDATADIR)/cnvalias.dat: $(CONVRTRSFILE) $(TARGET)
--	ICU_DATA=$(ICUDATADIR) ./$(TARGET) $(CONVRTRSFILE)
-+	$(TOOL) ICU_DATA=$(ICUDATADIR) ./$(TARGET) $(CONVRTRSFILE)
- 
- dist-local:
- 
diff --git a/textproc/icu/patches/patch-am b/textproc/icu/patches/patch-am
deleted file mode 100644
index 987246d2624..00000000000
--- a/textproc/icu/patches/patch-am
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2000/12/20 18:28:04 skrll Exp $
-
---- tools/gennames/Makefile.in.orig	Tue Aug  1 02:55:50 2000
-+++ tools/gennames/Makefile.in
-@@ -47,6 +47,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = tools/gennames
-+BUILD_LPATH=$(top_builddir)/common
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -92,7 +93,7 @@
- build-data: $(ICUDATADIR)/unames.dat
- 
- $(ICUDATADIR)/unames.dat: $(UNICODEFILE) $(TARGET)
--	./$(TARGET) -d $(ICUDATADIR) $(UNICODEFILE) -u $(UNICODE_VERSION)
-+	$(TOOL) ./$(TARGET) -d $(ICUDATADIR) $(UNICODEFILE) -u $(UNICODE_VERSION)
- 
- dist-local:
- 
diff --git a/textproc/icu/patches/patch-an b/textproc/icu/patches/patch-an
deleted file mode 100644
index b949140726e..00000000000
--- a/textproc/icu/patches/patch-an
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2000/12/20 18:28:04 skrll Exp $
-
---- tools/genprops/Makefile.in.orig	Tue Aug  1 02:55:50 2000
-+++ tools/genprops/Makefile.in
-@@ -46,6 +46,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = tools/genprops
-+BUILD_LPATH=$(top_builddir)/common
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -91,7 +92,7 @@
- build-data: $(ICUDATADIR)/uprops.dat
- 
- $(ICUDATADIR)/uprops.dat: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/Mirror.txt $(TARGET)
--	./$(TARGET) -s $(UNICODEDATADIR) -d $(ICUDATADIR) -u $(UNICODE_VERSION)
-+	$(TOOL) ./$(TARGET) -s $(UNICODEDATADIR) -d $(ICUDATADIR) -u $(UNICODE_VERSION)
- 
- dist-local:
- 
diff --git a/textproc/icu/patches/patch-ao b/textproc/icu/patches/patch-ao
deleted file mode 100644
index b313fbc64d2..00000000000
--- a/textproc/icu/patches/patch-ao
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2000/12/20 18:28:02 skrll Exp $
-
---- tools/genrb/Makefile.in.orig	Tue Aug 15 03:41:58 2000
-+++ tools/genrb/Makefile.in
-@@ -40,6 +40,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = tools/genrb
-+BUILD_LPATH=$(top_builddir)/common
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -121,7 +122,7 @@
- 
- @DATABUILDDIR@/../source/test/testdata/%.res : $(top_srcdir)/test/testdata/%.txt
- 	@echo "Creating testdata resource file for $<"
--	ICU_DATA=@DATABUILDDIR@ ./genrb -s $(top_srcdir)/test/testdata/ -d @DATABUILDDIR@../source/test/testdata/ $(<F)
-+	$(TOOL) ICU_DATA=@DATABUILDDIR@ ./genrb -s $(top_srcdir)/test/testdata/ -d @DATABUILDDIR@../source/test/testdata/ $(<F)
- 
- #@DATABUILDDIR@/translit/%.res : $(top_srcdir)/../data/translit/%.txt
- #	@echo "Creating translit resource file for $<"
-@@ -129,7 +130,7 @@
- 
- @DATABUILDDIR@/%.res : $(top_srcdir)/../data/%.txt
- 	@echo "Creating compiled resource file for $<"
--	@ICU_DATA=@DATABUILDDIR@ ./genrb -s $(top_srcdir)/../data/ -d @DATABUILDDIR@/ $(<F)
-+	@$(TOOL) ICU_DATA=@DATABUILDDIR@ ./genrb -s $(top_srcdir)/../data/ -d @DATABUILDDIR@/ $(<F)
- 
- 
- # the 'mv' will always fail if you are building in the source dir
diff --git a/textproc/icu/patches/patch-ap b/textproc/icu/patches/patch-ap
deleted file mode 100644
index f35e4af7f79..00000000000
--- a/textproc/icu/patches/patch-ap
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2000/12/20 18:28:02 skrll Exp $
-
---- tools/gentest/Makefile.in.orig	Tue Aug  1 02:55:52 2000
-+++ tools/gentest/Makefile.in
-@@ -47,6 +47,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = tools/gentest
-+BUILD_LPATH=$(top_builddir)/common
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -94,7 +95,7 @@
- # we set the ICU_DATA directory here so that test.dat ends up in 
- # icu/data rather than PREFIX/share/icu/VERSION/
- $(ICUDATADIR)/test.dat: $(TARGET)
--	ICU_DATA=$(ICUDATADIR) ./$(TARGET) 
-+	$(TOOL) ICU_DATA=$(ICUDATADIR) ./$(TARGET) 
- 
- dist-local:
- 
diff --git a/textproc/icu/patches/patch-aq b/textproc/icu/patches/patch-aq
deleted file mode 100644
index d31560703ed..00000000000
--- a/textproc/icu/patches/patch-aq
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2000/12/20 18:28:02 skrll Exp $
-
---- tools/gentz/Makefile.in.orig	Tue Aug  1 02:55:52 2000
-+++ tools/gentz/Makefile.in
-@@ -46,6 +46,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = tools/gentz
-+BUILD_LPATH=$(top_builddir)/common
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -93,7 +94,7 @@
- # we set the ICU_DATA directory here so that tz.dat ends up in 
- # icu/data rather than PREFIX/share/icu/VERSION/
- $(ICUDATADIR)/tz.dat: $(TZFILE) $(TZALIAS) $(TARGET)
--	ICU_DATA=$(ICUDATADIR) ./$(TARGET) $(TZFILE)
-+	$(TOOL) ICU_DATA=$(ICUDATADIR) ./$(TARGET) $(TZFILE)
- 
- dist-local:
- 
diff --git a/textproc/icu/patches/patch-ar b/textproc/icu/patches/patch-ar
deleted file mode 100644
index 45bd6371533..00000000000
--- a/textproc/icu/patches/patch-ar
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2000/12/20 18:28:02 skrll Exp $
-
---- tools/makeconv/Makefile.in.orig	Tue Aug 15 03:40:40 2000
-+++ tools/makeconv/Makefile.in
-@@ -43,6 +43,7 @@
- ## Build directory information
- top_builddir = ../..
- subdir = tools/makeconv
-+BUILD_LPATH=$(top_builddir)/common:$(top_builddir)/tools/toolutil
- 
- ## Extra files to remove for 'make clean'
- CLEANFILES = *~
-@@ -123,7 +124,7 @@
- # Rule to build a compiled cnv file
- @DATABUILDDIR@/%.cnv : $(top_srcdir)/../data/%.ucm
- 	@echo -n "$< -> "
--	@./makeconv -d @DATABUILDDIR@ $<
-+	@$(TOOL) ./makeconv -d @DATABUILDDIR@ $<
- 
- ifeq (,$(MAKECMDGOALS))
- -include $(DEPS)
diff --git a/textproc/icu/patches/patch-as b/textproc/icu/patches/patch-as
deleted file mode 100644
index b7fec860ae2..00000000000
--- a/textproc/icu/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2000/12/20 18:28:02 skrll Exp $
-
---- tools/pkgdata/cmnmode.c.orig	Mon Jul 17 06:37:48 2000
-+++ tools/pkgdata/cmnmode.c
-@@ -95,7 +95,7 @@
-     T_FileStream_writeLine(makefile, "\n\n");
-     
-     sprintf(tmp, "install: $(TARGET)\n"
--            "\t$(INSTALL-S) $(TARGET) $(INSTALLTO)%s$(TARGETNAME)\n\n",
-+            "\t$(INSTALL_DATA) $(TARGET) $(INSTALLTO)%s$(TARGETNAME)\n\n",
-             U_FILE_SEP_STRING);
- 
-     T_FileStream_writeLine(makefile, tmp);
diff --git a/textproc/icu/patches/patch-at b/textproc/icu/patches/patch-at
deleted file mode 100644
index 65d8ef3ded2..00000000000
--- a/textproc/icu/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.1.1.1 2000/12/20 18:28:06 skrll Exp $
-
---- tools/pkgdata/icupkg.inc.in.orig	Tue Aug 15 03:41:58 2000
-+++ tools/pkgdata/icupkg.inc.in
-@@ -110,3 +110,7 @@
- ifeq ($(strip $(PLATFORM)),U_LINUX)
-   TOOL=env LD_LIBRARY_PATH=$(LPATHS)
- endif
-+
-+ifeq ($(strip $(PLATFORM)),U_NETBSD)
-+  TOOL=env LD_LIBRARY_PATH=$(LPATHS)
-+endif
diff --git a/textproc/icu/pkg/PLIST b/textproc/icu/pkg/PLIST
index b7f41ab16ff..d7d1382fe5b 100644
--- a/textproc/icu/pkg/PLIST
+++ b/textproc/icu/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/20 18:28:01 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/21 18:14:21 skrll Exp $
+etc/icu/convrtrs.txt
 include/unicode/bidi.h
 include/unicode/brkiter.h
 include/unicode/calendar.h
@@ -12,6 +13,7 @@ include/unicode/datefmt.h
 include/unicode/dbbi.h
 include/unicode/dcfmtsym.h
 include/unicode/decimfmt.h
+include/unicode/docmain.h
 include/unicode/dtfmtsym.h
 include/unicode/fieldpos.h
 include/unicode/fmtable.h
@@ -28,6 +30,7 @@ include/unicode/numfmt.h
 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
@@ -65,6 +68,7 @@ include/unicode/unifltlg.h
 include/unicode/uniset.h
 include/unicode/unistr.h
 include/unicode/unitohex.h
+include/unicode/unorm.h
 include/unicode/unum.h
 include/unicode/urep.h
 include/unicode/ures.h
@@ -77,10 +81,20 @@ include/unicode/utf32.h
 include/unicode/utf8.h
 include/unicode/utrans.h
 include/unicode/utypes.h
-lib/libicu-i18n.so
-lib/libicu-toolutil.so
-lib/libicu-uc.so
-lib/libustdio.so
+lib/icu/1.7/Makefile.inc
+lib/icu/1.7/icudata.so
+lib/icu/1.7/libicudt17l.so
+lib/icu/Makefile.inc
+lib/icu/current
+lib/libicui18n.so.17.0
+lib/libicutoolutil.so.17.0
+lib/libicuuc.so.17.0
+lib/libustdio.so.17.0
+man/man5/cnvalias.dat.5
+man/man5/convrtrs.txt.5
+man/man8/gencnval.8
+man/man8/genrb.8
+man/man8/makeconv.8
 sbin/genccode
 sbin/gencmn
 sbin/gencnval
@@ -90,35 +104,14 @@ sbin/genrb
 sbin/gentest
 sbin/gentz
 sbin/makeconv
-sbin/mkinstalldirs
 sbin/pkgdata
-share/doc/html/icu/BreakIterator.html
-share/doc/html/icu/BreakIteratorGrafik.gif
-share/doc/html/icu/Collate.html
-share/doc/html/icu/boundCL.html
-share/doc/html/icu/build_env.htm
-share/doc/html/icu/candcpp.html
-share/doc/html/icu/cintltst.html
-share/doc/html/icu/codeConv.html
-share/doc/html/icu/codestds.html
-share/doc/html/icu/collateCl.html
-share/doc/html/icu/collflow.gif
-share/doc/html/icu/conversion_interface.htm
-share/doc/html/icu/errorCod.html
-share/doc/html/icu/formatCl.html
-share/doc/html/icu/intltest.html
-share/doc/html/icu/message.html
-share/doc/html/icu/mutex.html
-share/doc/html/icu/nameConv.html
-share/doc/html/icu/number.html
-share/doc/html/icu/supp_loc.html
-share/doc/html/icu/tz.htm
-share/doc/html/icu/tzClasses.html
-share/doc/html/icu/udata.html
-share/doc/html/icu/utilCL.html
-share/icu/1.6/icudata.dat
-share/icu/Makefile.inc
-@dirrm include/unicode
-@dirrm share/icu/1.6
+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
 @dirrm share/icu
-@dirrm share/doc/html/icu
+@dirrm lib/icu/1.7
+@dirrm lib/icu
+@dirrm include/unicode
+@dirrm etc/icu