Subject: pkg/20825: textproc/icu update to 2.4
To: None <gnats-bugs@gnats.netbsd.org>
From: None <hiramatu@boreas.dti.ne.jp>
List: netbsd-bugs
Date: 03/21/2003 08:29:46
>Number: 20825
>Category: pkg
>Synopsis: textproc/icu update to 2.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Mar 20 15:22:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Hiramatsu Yoshifumi
>Release: NetBSD 1.6P
>Organization:
>Environment:
System: NetBSD orinoco.my.domain 1.6P NetBSD 1.6P (Orinoco) #2: Tue Mar 18 01:31:03 JST 2003 hiramatsu@orinoco.my.domain:/sys/arch/i386/compile/Orinoco i386
Architecture: i386
Machine: i386
>Description:
This patch updates textproc/icu to 2.4.
>How-To-Repeat:
>Fix:
diff -buNr icu.orig/Makefile icu/Makefile
--- icu.orig/Makefile 2003-03-20 23:01:53.000000000 +0900
+++ icu/Makefile 2003-03-20 23:29:49.000000000 +0900
@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.11 2003/02/17 15:28:02 dillo Exp $
#
-DISTNAME= icu-1.7
+DISTNAME= icu-2.4
CATEGORIES= textproc
-MASTER_SITES= http://oss.software.ibm.com/icu/download/1.7/
+MASTER_SITES= http://oss.software.ibm.com/icu/download/2.4/
EXTRACT_SUFX= .tgz
MAINTAINER= skrll@netbsd.org
@@ -28,7 +28,10 @@
PLIST_SUBST+= BIG_ENDIAN=${BIG_ENDIAN}
PLIST_SUBST+= LITTLE_ENDIAN=${LITTLE_ENDIAN}
-CONFIGURE_ARGS+= --disable-threads
+CONFIGURE_ARGS+= --enable-layout
+CONFIGURE_ARGS+= --enable-static
+
+MAKE_ENV+= CP=${CP:Q}
pre-configure:
${CHMOD} u+rx ${WRKSRC}/configure
diff -buNr icu.orig/PLIST icu/PLIST
--- icu.orig/PLIST 2003-03-20 23:01:52.000000000 +0900
+++ icu/PLIST 2003-03-20 23:29:49.000000000 +0900
@@ -1,8 +1,27 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/28 22:49:15 seb Exp $
-etc/icu/convrtrs.txt
+@comment $NetBSD$
+bin/derb
+bin/genbrk
+bin/gencnval
+bin/genrb
+bin/icu-config
+bin/makeconv
+bin/pkgdata
+bin/uconv
+include/layout/ArabicLayoutEngine.h
+include/layout/GXLayoutEngine.h
+include/layout/IndicLayoutEngine.h
+include/layout/LEFontInstance.h
+include/layout/LEGlyphFilter.h
+include/layout/LEScripts.h
+include/layout/LESwaps.h
+include/layout/LETypes.h
+include/layout/LayoutEngine.h
+include/layout/OpenTypeLayoutEngine.h
+include/layout/ThaiLayoutEngine.h
include/unicode/bidi.h
include/unicode/brkiter.h
include/unicode/calendar.h
+include/unicode/caniter.h
include/unicode/chariter.h
include/unicode/choicfmt.h
include/unicode/coleitr.h
@@ -19,10 +38,9 @@
include/unicode/fmtable.h
include/unicode/format.h
include/unicode/gregocal.h
-include/unicode/hangjamo.h
include/unicode/hextouni.h
-include/unicode/jamohang.h
include/unicode/locid.h
+include/unicode/loengine.h
include/unicode/msgfmt.h
include/unicode/normlzr.h
include/unicode/nultrans.h
@@ -31,19 +49,22 @@
include/unicode/parsepos.h
include/unicode/platform.h
include/unicode/pmacos.h
-include/unicode/pos2.h
include/unicode/pos400.h
include/unicode/putil.h
include/unicode/pwin32.h
include/unicode/rbbi.h
+include/unicode/rbnf.h
include/unicode/rbt.h
+include/unicode/regex.h
include/unicode/rep.h
include/unicode/resbund.h
include/unicode/schriter.h
-include/unicode/scsu.h
+include/unicode/search.h
include/unicode/simpletz.h
include/unicode/smpdtfmt.h
include/unicode/sortkey.h
+include/unicode/strenum.h
+include/unicode/stsearch.h
include/unicode/tblcoll.h
include/unicode/timezone.h
include/unicode/translit.h
@@ -52,12 +73,18 @@
include/unicode/ucal.h
include/unicode/uchar.h
include/unicode/uchriter.h
+include/unicode/uclean.h
include/unicode/ucnv.h
include/unicode/ucnv_cb.h
include/unicode/ucnv_err.h
include/unicode/ucol.h
+include/unicode/ucoleitr.h
+include/unicode/uconfig.h
+include/unicode/ucurr.h
include/unicode/udat.h
include/unicode/udata.h
+include/unicode/uenum.h
+include/unicode/uiter.h
include/unicode/uloc.h
include/unicode/umachine.h
include/unicode/umisc.h
@@ -65,62 +92,96 @@
include/unicode/unicode.h
include/unicode/unifilt.h
include/unicode/unifltlg.h
+include/unicode/unifunct.h
+include/unicode/unimatch.h
+include/unicode/unirepl.h
include/unicode/uniset.h
include/unicode/unistr.h
include/unicode/unitohex.h
include/unicode/unorm.h
include/unicode/unum.h
+include/unicode/uobject.h
+include/unicode/urename.h
include/unicode/urep.h
include/unicode/ures.h
+include/unicode/uscript.h
+include/unicode/usearch.h
+include/unicode/uset.h
+include/unicode/usetiter.h
include/unicode/ushape.h
include/unicode/ustdio.h
+include/unicode/ustream.h
include/unicode/ustring.h
include/unicode/utf.h
include/unicode/utf16.h
include/unicode/utf32.h
include/unicode/utf8.h
+include/unicode/utf_old.h
include/unicode/utrans.h
include/unicode/utypes.h
-lib/icu/1.7/Makefile.inc
-lib/icu/1.7/libicudata.so
-${LITTLE_ENDIAN}lib/icu/1.7/libicudt17l.so
-${BIG_ENDIAN}lib/icu/1.7/libicudt17b.so
+include/unicode/uversion.h
+lib/icu/${PKGVERSION}/Makefile.inc
lib/icu/Makefile.inc
lib/icu/current
+lib/libicuctestfw.a
+lib/libicuctestfw.so
+lib/libicuctestfw.so.24
+lib/libicuctestfw.so.24.0
+lib/libicudata.a
+lib/libicudata.so
+lib/libicudata.so.24
+lib/libicudata.so.24.0
+lib/libicui18n.a
lib/libicui18n.so
-lib/libicui18n.so.17
-lib/libicui18n.so.17.0
+lib/libicui18n.so.24
+lib/libicui18n.so.24.0
+lib/libicule.a
+lib/libicule.so
+lib/libicule.so.24
+lib/libicule.so.24.0
+lib/libicutoolutil.a
lib/libicutoolutil.so
-lib/libicutoolutil.so.17
-lib/libicutoolutil.so.17.0
+lib/libicutoolutil.so.24
+lib/libicutoolutil.so.24.0
+lib/libicuuc.a
lib/libicuuc.so
-lib/libicuuc.so.17
-lib/libicuuc.so.17.0
+lib/libicuuc.so.24
+lib/libicuuc.so.24.0
+lib/libustdio.a
lib/libustdio.so
-lib/libustdio.so.17
-lib/libustdio.so.17.0
+lib/libustdio.so.24
+lib/libustdio.so.24.0
+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/gencnval.8
-man/man8/genrb.8
-man/man8/makeconv.8
+man/man8/decmn.8
+man/man8/genccode.8
+man/man8/gencmn.8
+man/man8/gennames.8
+man/man8/gennorm.8
+man/man8/genprops.8
+man/man8/genuca.8
+sbin/decmn
sbin/genccode
sbin/gencmn
-sbin/gencnval
sbin/gennames
+sbin/gennorm
+sbin/genpname
sbin/genprops
-sbin/genrb
-sbin/gentest
sbin/gentz
-sbin/makeconv
-sbin/pkgdata
-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
+sbin/genuca
+share/icu/${PKGVERSION}/README
+share/icu/${PKGVERSION}/config/mh-bsd-gcc
+share/icu/${PKGVERSION}/mkinstalldirs
+@dirrm share/icu/${PKGVERSION}/config
+@dirrm share/icu/${PKGVERSION}
@dirrm share/icu
-@dirrm lib/icu/1.7
+@dirrm lib/icu/${PKGVERSION}
@dirrm lib/icu
@dirrm include/unicode
-@dirrm etc/icu
+@dirrm include/layout
diff -buNr icu.orig/distinfo icu/distinfo
--- icu.orig/distinfo 2003-03-20 23:01:53.000000000 +0900
+++ icu/distinfo 2003-03-20 23:29:49.000000000 +0900
@@ -1,10 +1,5 @@
$NetBSD: distinfo,v 1.2 2001/04/20 15:04:57 skrll Exp $
-SHA1 (icu-1.7.tgz) = 36b4375201e828a3cd46559a5517c7fa11de8b90
-Size (icu-1.7.tgz) = 6089550 bytes
-SHA1 (patch-aa) = b7e671a0e7991539beb92f7e1649aa1f2aff180d
-SHA1 (patch-ab) = c64cf88893be5b67d1e47552154ce0fb9c399113
-SHA1 (patch-ac) = 24822cec39a3bd42b256499cea164384f17bf7c1
-SHA1 (patch-ad) = 8a2d92de7b29592a3005aab2b1183d79e96f37d2
-SHA1 (patch-ae) = 5b53e9234486aa7ac61494c7aba2c381a9f95ddb
-SHA1 (patch-af) = 8ab896f1547f8f3fb38eb83c43b6bda333acc0c4
+SHA1 (icu-2.4.tgz) = 6a0a9cb521b874bdd86d08a04b038ca6ad1a2b89
+Size (icu-2.4.tgz) = 7652187 bytes
+SHA1 (patch-ag) = b8f0b3611b8a3dbdd6d0cdadc12ad8ee774c894f
diff -buNr icu.orig/patches/patch-aa icu/patches/patch-aa
--- icu.orig/patches/patch-aa 2003-03-20 23:01:52.000000000 +0900
+++ icu/patches/patch-aa 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/12/23 09:39:20 skrll Exp $
-
---- common/udata.c.orig Wed Dec 6 03:02:12 2000
-+++ common/udata.c
-@@ -238,7 +238,7 @@
- # define MAP_IMPLEMENTATION MAP_WIN32
-
- /* ### 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 -buNr icu.orig/patches/patch-ab icu/patches/patch-ab
--- icu.orig/patches/patch-ab 2003-03-20 23:01:52.000000000 +0900
+++ icu/patches/patch-ab 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/12/23 09:39:20 skrll Exp $
-
---- 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@
-
- #define U_TZSET @U_TZSET@
--#define U_TIMEZONE @U_TIMEZONE@
-+#undef U_TIMEZONE
- #define U_TZNAME @U_TZNAME@
-
- /*===========================================================================*/
diff -buNr icu.orig/patches/patch-ac icu/patches/patch-ac
--- icu.orig/patches/patch-ac 2003-03-20 23:01:52.000000000 +0900
+++ icu/patches/patch-ac 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/12/23 09:39:20 skrll Exp $
-
---- 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 -buNr icu.orig/patches/patch-ad icu/patches/patch-ad
--- icu.orig/patches/patch-ad 2003-03-20 23:01:52.000000000 +0900
+++ icu/patches/patch-ad 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/12/23 09:39:21 skrll Exp $
-
---- test/intltest/intltest.cpp.orig Tue Dec 12 19:40:58 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 -buNr icu.orig/patches/patch-ae icu/patches/patch-ae
--- icu.orig/patches/patch-ae 2003-03-20 23:01:52.000000000 +0900
+++ icu/patches/patch-ae 1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/12/23 09:39:21 skrll Exp $
-
---- tools/pkgdata/icupkg.inc.in.orig Tue Oct 24 20:50:19 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 -buNr icu.orig/patches/patch-af icu/patches/patch-af
--- icu.orig/patches/patch-af 2003-03-20 23:01:52.000000000 +0900
+++ icu/patches/patch-af 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/01/13 16:25:52 skrll Exp $
-
---- data/Makefile.in.orig Wed Dec 13 03:13:56 2000
-+++ data/Makefile.in
-@@ -118,7 +118,7 @@
- $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUDATA_DIR)/$(VERSION)
- ( cd build ; $(INVOKE) $(PKGDATA) -e icudata -T . -s . -p $(ICUDATA_NAME) icudata.lst -I $(DESTDIR)$(ICUDATA_DIR)/$(VERSION) )
- ifeq ($(strip $(PKGDATA_MODE)),dll)
-- (cd $(DESTDIR)$(ICUDATA_DIR)/$(VERSION); $(RM) icudata.$(SO) && ln -s $(ICUDATA_NAME).$(SO) icudata.$(SO))
-+ (cd $(DESTDIR)$(ICUDATA_DIR)/$(VERSION); $(RM) libicudata.$(SO) && ln -s lib$(ICUDATA_NAME).$(SO) libicudata.$(SO))
- endif
-
- install-convrtrstxt: $(top_srcdir)/../data/convrtrs.txt
diff -buNr icu.orig/patches/patch-ag icu/patches/patch-ag
--- icu.orig/patches/patch-ag 1970-01-01 09:00:00.000000000 +0900
+++ icu/patches/patch-ag 2003-03-20 23:29:48.000000000 +0900
@@ -0,0 +1,20 @@
+--- Makefile.in.orig 2002-11-15 03:44:14.000000000 +0900
++++ Makefile.in 2003-03-20 22:26:46.000000000 +0900
+@@ -132,7 +132,7 @@
+ $(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/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 $@
+ @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 >> $@
>Release-Note:
>Audit-Trail:
>Unformatted: