From 9f58dfea4ed460f21df937165dd86de425cee84c Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 3 Jan 2006 00:04:42 +0000 Subject: Update to 3.4: New Features: Major changes in ICU 3.4 include the following: Updates to conform to Unicode 4.1, including new characters properties and values, text segmentation, plus collation updated for Unicode Technical Standard #10 (UCA) and regex updated for Unicode Technical Standard #18. * Updates to conform to the Common Locale Data Repository (CLDR), Version 1.3 for the latest locale data. This includes: * New data to support localization of timezones, United Nations M.49 regions (including continents and regions), mappings from language to script and territory. * Consolidation of inherited data and improved resource aliasing for smaller data footprint * Additional locales, and many other fixes and additions of locale data. * POSIX migration support: direct API support for all POSIX character classes, implemented according to Unicode recommendations --- textproc/icu/Makefile | 14 ++------------ textproc/icu/PLIST | 45 +++++++++++++++++-------------------------- textproc/icu/buildlink3.mk | 4 ++-- textproc/icu/distinfo | 18 ++++++++--------- textproc/icu/patches/patch-aa | 8 ++++---- textproc/icu/patches/patch-ab | 8 ++++---- textproc/icu/patches/patch-ad | 6 +++--- textproc/icu/patches/patch-ae | 16 +++++++-------- textproc/icu/patches/patch-af | 6 +++--- 9 files changed, 53 insertions(+), 72 deletions(-) diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 24040004614..349bdbbda5b 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2005/12/30 23:49:08 joerg Exp $ +# $NetBSD: Makefile,v 1.47 2006/01/03 00:04:42 wiz Exp $ # -DISTNAME= icu-3.2 -PKGREVISION= 2 +DISTNAME= icu-3.4 CATEGORIES= textproc MASTER_SITES= ftp://ftp.software.ibm.com/software/globalization/icu/${PKGVERSION}/ EXTRACT_SUFX= .tgz @@ -24,11 +23,6 @@ CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} PKG_SYSCONFSUBDIR= icu -CONVRTRS_EG= ${CONVRTRS_EG_DIR}/convrtrs.txt -CONVRTRS_EG_DIR= ${PREFIX}/share/examples/icu - -CONF_FILES+= ${CONVRTRS_EG} ${PKG_SYSCONFDIR}/convrtrs.txt - .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" @@ -57,8 +51,4 @@ PLIST_SUBST+= MH_NAME=mh-darwin PLIST_SUBST+= MH_NAME=mh-unknown .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 8bcd035506c..6c5fa138dda 100644 --- a/textproc/icu/PLIST +++ b/textproc/icu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2005/03/30 21:54:31 recht Exp $ +@comment $NetBSD: PLIST,v 1.11 2006/01/03 00:04:42 wiz Exp $ bin/derb bin/genbrk bin/gencnval @@ -38,7 +38,6 @@ include/unicode/fmtable.h include/unicode/format.h include/unicode/gregocal.h include/unicode/locid.h -include/unicode/loengine.h include/unicode/measfmt.h include/unicode/measunit.h include/unicode/measure.h @@ -48,6 +47,7 @@ include/unicode/numfmt.h include/unicode/parseerr.h include/unicode/parsepos.h include/unicode/platform.h +include/unicode/ppalmos.h include/unicode/putil.h include/unicode/pwin32.h include/unicode/rbbi.h @@ -69,6 +69,7 @@ include/unicode/translit.h include/unicode/ubidi.h include/unicode/ubrk.h include/unicode/ucal.h +include/unicode/ucasemap.h include/unicode/ucat.h include/unicode/uchar.h include/unicode/uchriter.h @@ -115,6 +116,7 @@ include/unicode/usprep.h include/unicode/ustdio.h include/unicode/ustream.h include/unicode/ustring.h +include/unicode/utext.h include/unicode/utf.h include/unicode/utf16.h include/unicode/utf32.h @@ -129,26 +131,26 @@ lib/icu/${PKGVERSION}/Makefile.inc lib/icu/Makefile.inc lib/icu/current lib/libicudata.so -lib/libicudata.so.32 -lib/libicudata.so.32.0 +lib/libicudata.so.34 +lib/libicudata.so.34.0 lib/libicui18n.so -lib/libicui18n.so.32 -lib/libicui18n.so.32.0 +lib/libicui18n.so.34 +lib/libicui18n.so.34.0 lib/libicuio.so -lib/libicuio.so.32 -lib/libicuio.so.32.0 +lib/libicuio.so.34 +lib/libicuio.so.34.0 lib/libicule.so -lib/libicule.so.32 -lib/libicule.so.32.0 +lib/libicule.so.34 +lib/libicule.so.34.0 lib/libiculx.so -lib/libiculx.so.32 -lib/libiculx.so.32.0 +lib/libiculx.so.34 +lib/libiculx.so.34.0 lib/libicutu.so -lib/libicutu.so.32 -lib/libicutu.so.32.0 +lib/libicutu.so.34 +lib/libicutu.so.34.0 lib/libicuuc.so -lib/libicuuc.so.32 -lib/libicuuc.so.32.0 +lib/libicuuc.so.34 +lib/libicuuc.so.34.0 lib/libsicudata.a lib/libsicui18n.a lib/libsicuio.a @@ -164,33 +166,22 @@ man/man1/makeconv.1 man/man1/pkgdata.1 man/man1/uconv.1 man/man8/decmn.8 -man/man8/gencase.8 man/man8/genccode.8 man/man8/gencmn.8 -man/man8/gennames.8 -man/man8/gennorm.8 -man/man8/genprops.8 man/man8/gensprep.8 man/man8/genuca.8 sbin/decmn -sbin/gencase sbin/genccode sbin/gencmn -sbin/gennames -sbin/gennorm -sbin/genpname -sbin/genprops sbin/gensprep sbin/genuca sbin/icuswap -share/examples/icu/convrtrs.txt share/icu/${PKGVERSION}/config/${MH_NAME} share/icu/${PKGVERSION}/license.html share/icu/${PKGVERSION}/mkinstalldirs @dirrm share/icu/${PKGVERSION}/config @dirrm share/icu/${PKGVERSION} @dirrm share/icu -@dirrm share/examples/icu @dirrm lib/icu/${PKGVERSION} @dirrm lib/icu @dirrm include/unicode diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk index 520a97a8e70..d5ead8f4909 100644 --- a/textproc/icu/buildlink3.mk +++ b/textproc/icu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2005/03/27 10:27:20 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2006/01/03 00:04:42 wiz 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>=3.2 +BUILDLINK_DEPENDS.icu+= icu>=3.4 BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu .endif # ICU_BUILDLINK3_MK diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 55974cb4545..87f29aacc86 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.11 2005/12/30 23:49:08 joerg Exp $ +$NetBSD: distinfo,v 1.12 2006/01/03 00:04:42 wiz Exp $ -SHA1 (icu-3.2.tgz) = 23fa1feb893a562408e6f13fcf968a6177d8aa6e -RMD160 (icu-3.2.tgz) = 69720d12c5076de4f7ff865a6709d405ce3f1bb5 -Size (icu-3.2.tgz) = 9587961 bytes -SHA1 (patch-aa) = 108ac871bfbf72c97ef2241e2d7294f3084f9c8b -SHA1 (patch-ab) = 86ca3d2cd4ba2e71132b41f3a1d26fb2778448cf -SHA1 (patch-ad) = 4080b584553446485084b34f177131edecce9ba9 -SHA1 (patch-ae) = 39ea97c492859e09386dde595004927a2d4537c8 -SHA1 (patch-af) = cbf5c84b69c6a02d33d61f63c55838cda4ed5c17 +SHA1 (icu-3.4.tgz) = 7485e594002bef61c28822c3c2bfe722f35fdf4b +RMD160 (icu-3.4.tgz) = 7cb6f353aa4ddc862b3ecd640a7040a4074f163c +Size (icu-3.4.tgz) = 9267878 bytes +SHA1 (patch-aa) = 2d743ee3ab1ecd4aeeb01cc490eabedcd0c2ab97 +SHA1 (patch-ab) = 7f322ac242a600400930b3da14c2ec9acb7db5f6 +SHA1 (patch-ad) = f740ae214597aabd47284b37a7e672d02462818f +SHA1 (patch-ae) = 8a45c69700948346182155badfd40de4e6a5a0b9 +SHA1 (patch-af) = 3938acc179400d4e28ac965631d28a9fd42464f4 diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa index 2b4dae2b5c2..41d5e7a820f 100644 --- a/textproc/icu/patches/patch-aa +++ b/textproc/icu/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2005/03/27 10:27:21 recht Exp $ +$NetBSD: patch-aa,v 1.10 2006/01/03 00:04:42 wiz Exp $ ---- Makefile.in.orig Sun Feb 27 14:19:42 2005 -+++ Makefile.in Sun Feb 27 14:19:58 2005 -@@ -174,7 +174,7 @@ +--- Makefile.in.orig 2004-11-18 22:22:10.000000000 +0100 ++++ Makefile.in +@@ -174,7 +174,7 @@ $(top_builddir)/config/Makefile.inc: $(s $(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 index bfd8ac92c5d..c517ccb64c2 100644 --- a/textproc/icu/patches/patch-ab +++ b/textproc/icu/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.7 2005/03/27 10:27:21 recht Exp $ +$NetBSD: patch-ab,v 1.8 2006/01/03 00:04:42 wiz Exp $ ---- config/mh-darwin.orig Wed Mar 23 21:28:45 2005 -+++ config/mh-darwin Wed Mar 23 21:28:48 2005 -@@ -25,7 +25,7 @@ +--- config/mh-darwin.orig 2004-05-18 23:54:24.000000000 +0200 ++++ config/mh-darwin +@@ -25,7 +25,7 @@ SHLIB.c= $(CC) -dynamiclib -dynamic $(CF SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) ## Compiler switches to embed a library name and version information diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad index d5c02974b25..ea85a05cdde 100644 --- a/textproc/icu/patches/patch-ad +++ b/textproc/icu/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2005/12/30 23:49:08 joerg Exp $ +$NetBSD: patch-ad,v 1.7 2006/01/03 00:04:42 wiz Exp $ ---- configure.orig 2005-12-30 22:47:03.000000000 +0000 +--- configure.orig 2005-07-25 23:10:50.000000000 +0200 +++ configure -@@ -1552,7 +1552,8 @@ powerpc*-*-linux*) +@@ -1535,7 +1535,8 @@ powerpc*-*-linux*) else icu_cv_host_frag=mh-cygwin-msvc fi ;; diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae index c465112a32a..091a0e8bb04 100644 --- a/textproc/icu/patches/patch-ae +++ b/textproc/icu/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.6 2005/03/27 10:27:21 recht Exp $ +$NetBSD: patch-ae,v 1.7 2006/01/03 00:04:42 wiz Exp $ ---- common/unicode/umachine.h.orig Tue Jun 22 23:03:34 2004 -+++ common/unicode/umachine.h Sun Feb 27 14:15:50 2005 -@@ -41,7 +41,7 @@ - /* which are contained in the platform-specific file platform.h */ - /*==========================================================================*/ +--- common/unicode/umachine.h.orig 2005-06-25 01:24:54.000000000 +0200 ++++ common/unicode/umachine.h +@@ -43,7 +43,7 @@ --#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) -+#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(__NetBSDPE__) + #if defined(U_PALMOS) + # include "unicode/ppalmos.h" +-#elif defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) ++#elif (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(__NetBSDPE__) # include "unicode/pwin32.h" #else # include "unicode/platform.h" diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af index 3da2a5efa9f..2cca96436f6 100644 --- a/textproc/icu/patches/patch-af +++ b/textproc/icu/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.6 2005/12/30 23:49:08 joerg Exp $ +$NetBSD: patch-af,v 1.7 2006/01/03 00:04:42 wiz Exp $ ---- runConfigureICU.orig 2005-12-30 22:46:43.000000000 +0000 +--- runConfigureICU.orig 2005-05-18 19:29:00.000000000 +0200 +++ runConfigureICU -@@ -284,7 +284,7 @@ case $platform in +@@ -253,7 +253,7 @@ case $platform in RELEASE_CFLAGS='-O2' RELEASE_CXXFLAGS='-O2' ;; -- cgit v1.2.3