update to 2.6.1

Lots of changes/fixes, eg. Unicode 4.0 support.
See
http://oss.software.ibm.com/cvs/icu/~checkout~/icu/readme.html?rev=1.141.2.1#News
for details.

ok'ed by wiz@

3 files changed, 24 insertions, 16 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 906ebc5aa33..1dc0dc773ea 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2003/12/02 23:11:30 recht Exp $
+# $NetBSD: Makefile,v 1.24 2003/12/03 16:52:48 recht Exp $
 #
 
-DISTNAME=	icu-2.6
+DISTNAME=	icu-2.6.1
 WRKSRC=		${WRKDIR}/${PKGBASE}/source
 CATEGORIES=	textproc
+EXTRACT_SUFX=	.tgz
+
 #
 # The IBM site has long delays that can cause ftp to timeout.  Use the
 # backup FTP repositories in preference to the IBM one.
@@ -23,7 +25,6 @@ TEST_TARGET=		check
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-static
-CONFIGURE_ARGS+=	--disable-threads
 
 # ICU's configure script will automatically append "/icu" to the sysconfdir.
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
@@ -32,13 +33,19 @@ PKG_SYSCONFSUBDIR=	icu
 SUPPORT_FILES+=		${PREFIX}/share/examples/icu/convrtrs.txt \
 			${PKG_SYSCONFDIR}/convrtrs.txt
 
+.include "../../mk/pthread.buildlink2.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(CC_VERSION:Mgcc-3*)
 CXXFLAGS:=		${CXXFLAGS:C/-O[0-9]*/-O/g}
-CFLAGS:=		${CFLAGS:C/-O[0-9]*/-O/g}
-CXXFLAGS:=		${CXXFLAGS:C/-Os/-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
diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST
index 66cda2b8b8e..75d3136c643 100644
--- a/textproc/icu/PLIST
+++ b/textproc/icu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/23 07:49:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/03 16:52:48 recht Exp $
 bin/derb
 bin/genbrk
 bin/gencnval
@@ -124,31 +124,31 @@ lib/icu/current
 lib/libicudata.a
 lib/libicudata.so
 lib/libicudata.so.26
-lib/libicudata.so.26.0
+lib/libicudata.so.26.1
 lib/libicui18n.a
 lib/libicui18n.so
 lib/libicui18n.so.26
-lib/libicui18n.so.26.0
+lib/libicui18n.so.26.1
 lib/libicuio.a
 lib/libicuio.so
 lib/libicuio.so.26
-lib/libicuio.so.26.0
+lib/libicuio.so.26.1
 lib/libicule.a
 lib/libicule.so
 lib/libicule.so.26
-lib/libicule.so.26.0
+lib/libicule.so.26.1
 lib/libiculx.a
 lib/libiculx.so
 lib/libiculx.so.26
-lib/libiculx.so.26.0
+lib/libiculx.so.26.1
 lib/libicutoolutil.a
 lib/libicutoolutil.so
 lib/libicutoolutil.so.26
-lib/libicutoolutil.so.26.0
+lib/libicutoolutil.so.26.1
 lib/libicuuc.a
 lib/libicuuc.so
 lib/libicuuc.so.26
-lib/libicuuc.so.26.0
+lib/libicuuc.so.26.1
 man/man1/gencnval.1
 man/man1/genrb.1
 man/man1/icu-config.1
@@ -178,6 +178,7 @@ sbin/genuca
 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
 @dirrm share/icu/${PKGVERSION}/config
 @dirrm share/icu/${PKGVERSION}
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index b12408e2521..84d3f78aba6 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2003/06/23 07:49:39 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/12/03 16:52:48 recht Exp $
 
-SHA1 (icu-2.6.tgz) = f6b26725c4910f5db77739b0808523f3b147257c
-Size (icu-2.6.tgz) = 8204740 bytes
+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