From 4a7b26734bf40eef48e308828ef33a7aaae0d358 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 23 Jun 2003 07:49:39 +0000 Subject: 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 --- textproc/icu/Makefile | 35 ++++++----- textproc/icu/PLIST | 54 ++++++++--------- textproc/icu/buildlink2.mk | 133 ++++-------------------------------------- textproc/icu/distinfo | 13 ++--- textproc/icu/patches/patch-aa | 19 ++---- textproc/icu/patches/patch-ab | 15 +++-- textproc/icu/patches/patch-ac | 18 +++--- textproc/icu/patches/patch-ad | 15 ----- 8 files changed, 81 insertions(+), 221 deletions(-) delete mode 100644 textproc/icu/patches/patch-ad (limited to 'textproc') diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 47745da1484..285165f236a 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,31 +1,30 @@ -# $NetBSD: Makefile,v 1.17 2003/06/20 09:55:55 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2003/06/23 07:49:39 jlam Exp $ # -DISTNAME= icu-2.4 -PKGREVISION= 1 +DISTNAME= icu-2.6 WRKSRC= ${WRKDIR}/${PKGBASE}/source CATEGORIES= textproc -MASTER_SITES= http://oss.software.ibm.com/icu/download/${PKGVERSION}/ +MASTER_SITES= ftp://www-126.ibm.com/pub/icu/${PKGVERSION}/ EXTRACT_SUFX= .tgz MAINTAINER= tech-pkg@netbsd.org -HOMEPAGE= http://oss.software.ibm.com/icu -COMMENT= Robust and full-featured unicode support +HOMEPAGE= http://oss.software.ibm.com/icu/ +COMMENT= robust and full-featured Unicode services -GNU_CONFIGURE= YES -USE_GMAKE= YES -USE_BUILDLINK2= YES -USE_PKGINSTALL= YES -TEST_TARGET= check +USE_GMAKE= YES +USE_BUILDLINK2= YES +USE_PKGINSTALL= YES +TEST_TARGET= check -PKG_SYSCONFSUBDIR= icu +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --enable-static +CONFIGURE_ARGS+= --disable-threads -SUPPORT_FILES+= ${PREFIX}/share/examples/icu/convrtrs.txt \ - ${PKG_SYSCONFDIR}/convrtrs.txt +# ICU's configure script will automatically append "/icu" to the sysconfdir. +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +PKG_SYSCONFSUBDIR= icu -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --disable-threads -CONFIGURE_ARGS+= --enable-layout -CONFIGURE_ARGS+= --enable-static +SUPPORT_FILES+= ${PREFIX}/share/examples/icu/convrtrs.txt \ + ${PKG_SYSCONFDIR}/convrtrs.txt .include "../../mk/bsd.pkg.mk" diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST index 92f14af09e4..66cda2b8b8e 100644 --- a/textproc/icu/PLIST +++ b/textproc/icu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/03/21 23:44:06 salo Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/06/23 07:49:39 jlam Exp $ bin/derb bin/genbrk bin/gencnval @@ -9,16 +9,19 @@ bin/pkgdata bin/uconv include/layout/ArabicLayoutEngine.h include/layout/GXLayoutEngine.h +include/layout/HanLayoutEngine.h include/layout/IndicLayoutEngine.h include/layout/LEFontInstance.h include/layout/LEGlyphFilter.h +include/layout/LELanguages.h include/layout/LEScripts.h include/layout/LESwaps.h include/layout/LETypes.h include/layout/LayoutEngine.h include/layout/OpenTypeLayoutEngine.h +include/layout/ParagraphLayout.h +include/layout/RunArrays.h include/layout/ThaiLayoutEngine.h -include/unicode/bidi.h include/unicode/brkiter.h include/unicode/calendar.h include/unicode/caniter.h @@ -26,8 +29,6 @@ include/unicode/chariter.h include/unicode/choicfmt.h include/unicode/coleitr.h include/unicode/coll.h -include/unicode/convert.h -include/unicode/cpdtrans.h include/unicode/datefmt.h include/unicode/dbbi.h include/unicode/dcfmtsym.h @@ -38,12 +39,10 @@ include/unicode/fieldpos.h include/unicode/fmtable.h include/unicode/format.h include/unicode/gregocal.h -include/unicode/hextouni.h include/unicode/locid.h include/unicode/loengine.h include/unicode/msgfmt.h include/unicode/normlzr.h -include/unicode/nultrans.h include/unicode/numfmt.h include/unicode/parseerr.h include/unicode/parsepos.h @@ -54,7 +53,6 @@ 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 @@ -71,6 +69,7 @@ include/unicode/translit.h include/unicode/ubidi.h include/unicode/ubrk.h include/unicode/ucal.h +include/unicode/ucat.h include/unicode/uchar.h include/unicode/uchriter.h include/unicode/uclean.h @@ -84,12 +83,12 @@ include/unicode/ucurr.h include/unicode/udat.h include/unicode/udata.h include/unicode/uenum.h +include/unicode/uidna.h include/unicode/uiter.h include/unicode/uloc.h include/unicode/umachine.h include/unicode/umisc.h include/unicode/umsg.h -include/unicode/unicode.h include/unicode/unifilt.h include/unicode/unifltlg.h include/unicode/unifunct.h @@ -97,7 +96,6 @@ 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 @@ -123,34 +121,34 @@ 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/libicudata.so.26 +lib/libicudata.so.26.0 lib/libicui18n.a lib/libicui18n.so -lib/libicui18n.so.24 -lib/libicui18n.so.24.0 +lib/libicui18n.so.26 +lib/libicui18n.so.26.0 +lib/libicuio.a +lib/libicuio.so +lib/libicuio.so.26 +lib/libicuio.so.26.0 lib/libicule.a lib/libicule.so -lib/libicule.so.24 -lib/libicule.so.24.0 +lib/libicule.so.26 +lib/libicule.so.26.0 +lib/libiculx.a +lib/libiculx.so +lib/libiculx.so.26 +lib/libiculx.so.26.0 lib/libicutoolutil.a lib/libicutoolutil.so -lib/libicutoolutil.so.24 -lib/libicutoolutil.so.24.0 +lib/libicutoolutil.so.26 +lib/libicutoolutil.so.26.0 lib/libicuuc.a lib/libicuuc.so -lib/libicuuc.so.24 -lib/libicuuc.so.24.0 -lib/libustdio.a -lib/libustdio.so -lib/libustdio.so.24 -lib/libustdio.so.24.0 +lib/libicuuc.so.26 +lib/libicuuc.so.26.0 man/man1/gencnval.1 man/man1/genrb.1 man/man1/icu-config.1 @@ -162,6 +160,7 @@ man/man5/convrtrs.txt.5 man/man8/decmn.8 man/man8/genccode.8 man/man8/gencmn.8 +man/man8/genidna.8 man/man8/gennames.8 man/man8/gennorm.8 man/man8/genprops.8 @@ -169,6 +168,7 @@ man/man8/genuca.8 sbin/decmn sbin/genccode sbin/gencmn +sbin/genidna sbin/gennames sbin/gennorm sbin/genpname diff --git a/textproc/icu/buildlink2.mk b/textproc/icu/buildlink2.mk index 962f47cee2a..d759a2c7c57 100644 --- a/textproc/icu/buildlink2.mk +++ b/textproc/icu/buildlink2.mk @@ -1,139 +1,26 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/03/21 23:44:06 salo Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/06/23 07:49:39 jlam Exp $ # # This Makefile fragment is included by packages that use icu. -# -# This file was created automatically using createbuildlink 2.4. -# .if !defined(ICU_BUILDLINK2_MK) ICU_BUILDLINK2_MK= # defined -BUILDLINK_PACKAGES+= icu -BUILDLINK_DEPENDS.icu?= icu>=2.4 -BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu +BUILDLINK_PACKAGES+= icu +BUILDLINK_DEPENDS.icu?= icu>=2.6 +BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu -EVAL_PREFIX+= BUILDLINK_PREFIX.icu=icu +EVAL_PREFIX+= BUILDLINK_PREFIX.icu=icu BUILDLINK_PREFIX.icu_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.icu+= include/layout/ArabicLayoutEngine.h -BUILDLINK_FILES.icu+= include/layout/GXLayoutEngine.h -BUILDLINK_FILES.icu+= include/layout/IndicLayoutEngine.h -BUILDLINK_FILES.icu+= include/layout/LEFontInstance.h -BUILDLINK_FILES.icu+= include/layout/LEGlyphFilter.h -BUILDLINK_FILES.icu+= include/layout/LEScripts.h -BUILDLINK_FILES.icu+= include/layout/LESwaps.h -BUILDLINK_FILES.icu+= include/layout/LETypes.h -BUILDLINK_FILES.icu+= include/layout/LayoutEngine.h -BUILDLINK_FILES.icu+= include/layout/OpenTypeLayoutEngine.h -BUILDLINK_FILES.icu+= include/layout/ThaiLayoutEngine.h -BUILDLINK_FILES.icu+= include/unicode/bidi.h -BUILDLINK_FILES.icu+= include/unicode/brkiter.h -BUILDLINK_FILES.icu+= include/unicode/calendar.h -BUILDLINK_FILES.icu+= include/unicode/caniter.h -BUILDLINK_FILES.icu+= include/unicode/chariter.h -BUILDLINK_FILES.icu+= include/unicode/choicfmt.h -BUILDLINK_FILES.icu+= include/unicode/coleitr.h -BUILDLINK_FILES.icu+= include/unicode/coll.h -BUILDLINK_FILES.icu+= include/unicode/convert.h -BUILDLINK_FILES.icu+= include/unicode/cpdtrans.h -BUILDLINK_FILES.icu+= include/unicode/datefmt.h -BUILDLINK_FILES.icu+= include/unicode/dbbi.h -BUILDLINK_FILES.icu+= include/unicode/dcfmtsym.h -BUILDLINK_FILES.icu+= include/unicode/decimfmt.h -BUILDLINK_FILES.icu+= include/unicode/docmain.h -BUILDLINK_FILES.icu+= include/unicode/dtfmtsym.h -BUILDLINK_FILES.icu+= include/unicode/fieldpos.h -BUILDLINK_FILES.icu+= include/unicode/fmtable.h -BUILDLINK_FILES.icu+= include/unicode/format.h -BUILDLINK_FILES.icu+= include/unicode/gregocal.h -BUILDLINK_FILES.icu+= include/unicode/hextouni.h -BUILDLINK_FILES.icu+= include/unicode/locid.h -BUILDLINK_FILES.icu+= include/unicode/loengine.h -BUILDLINK_FILES.icu+= include/unicode/msgfmt.h -BUILDLINK_FILES.icu+= include/unicode/normlzr.h -BUILDLINK_FILES.icu+= include/unicode/nultrans.h -BUILDLINK_FILES.icu+= include/unicode/numfmt.h -BUILDLINK_FILES.icu+= include/unicode/parseerr.h -BUILDLINK_FILES.icu+= include/unicode/parsepos.h -BUILDLINK_FILES.icu+= include/unicode/platform.h -BUILDLINK_FILES.icu+= include/unicode/pmacos.h -BUILDLINK_FILES.icu+= include/unicode/pos400.h -BUILDLINK_FILES.icu+= include/unicode/putil.h -BUILDLINK_FILES.icu+= include/unicode/pwin32.h -BUILDLINK_FILES.icu+= include/unicode/rbbi.h -BUILDLINK_FILES.icu+= include/unicode/rbnf.h -BUILDLINK_FILES.icu+= include/unicode/rbt.h -BUILDLINK_FILES.icu+= include/unicode/regex.h -BUILDLINK_FILES.icu+= include/unicode/rep.h -BUILDLINK_FILES.icu+= include/unicode/resbund.h -BUILDLINK_FILES.icu+= include/unicode/schriter.h -BUILDLINK_FILES.icu+= include/unicode/search.h -BUILDLINK_FILES.icu+= include/unicode/simpletz.h -BUILDLINK_FILES.icu+= include/unicode/smpdtfmt.h -BUILDLINK_FILES.icu+= include/unicode/sortkey.h -BUILDLINK_FILES.icu+= include/unicode/strenum.h -BUILDLINK_FILES.icu+= include/unicode/stsearch.h -BUILDLINK_FILES.icu+= include/unicode/tblcoll.h -BUILDLINK_FILES.icu+= include/unicode/timezone.h -BUILDLINK_FILES.icu+= include/unicode/translit.h -BUILDLINK_FILES.icu+= include/unicode/ubidi.h -BUILDLINK_FILES.icu+= include/unicode/ubrk.h -BUILDLINK_FILES.icu+= include/unicode/ucal.h -BUILDLINK_FILES.icu+= include/unicode/uchar.h -BUILDLINK_FILES.icu+= include/unicode/uchriter.h -BUILDLINK_FILES.icu+= include/unicode/uclean.h -BUILDLINK_FILES.icu+= include/unicode/ucnv.h -BUILDLINK_FILES.icu+= include/unicode/ucnv_cb.h -BUILDLINK_FILES.icu+= include/unicode/ucnv_err.h -BUILDLINK_FILES.icu+= include/unicode/ucol.h -BUILDLINK_FILES.icu+= include/unicode/ucoleitr.h -BUILDLINK_FILES.icu+= include/unicode/uconfig.h -BUILDLINK_FILES.icu+= include/unicode/ucurr.h -BUILDLINK_FILES.icu+= include/unicode/udat.h -BUILDLINK_FILES.icu+= include/unicode/udata.h -BUILDLINK_FILES.icu+= include/unicode/uenum.h -BUILDLINK_FILES.icu+= include/unicode/uiter.h -BUILDLINK_FILES.icu+= include/unicode/uloc.h -BUILDLINK_FILES.icu+= include/unicode/umachine.h -BUILDLINK_FILES.icu+= include/unicode/umisc.h -BUILDLINK_FILES.icu+= include/unicode/umsg.h -BUILDLINK_FILES.icu+= include/unicode/unicode.h -BUILDLINK_FILES.icu+= include/unicode/unifilt.h -BUILDLINK_FILES.icu+= include/unicode/unifltlg.h -BUILDLINK_FILES.icu+= include/unicode/unifunct.h -BUILDLINK_FILES.icu+= include/unicode/unimatch.h -BUILDLINK_FILES.icu+= include/unicode/unirepl.h -BUILDLINK_FILES.icu+= include/unicode/uniset.h -BUILDLINK_FILES.icu+= include/unicode/unistr.h -BUILDLINK_FILES.icu+= include/unicode/unitohex.h -BUILDLINK_FILES.icu+= include/unicode/unorm.h -BUILDLINK_FILES.icu+= include/unicode/unum.h -BUILDLINK_FILES.icu+= include/unicode/uobject.h -BUILDLINK_FILES.icu+= include/unicode/urename.h -BUILDLINK_FILES.icu+= include/unicode/urep.h -BUILDLINK_FILES.icu+= include/unicode/ures.h -BUILDLINK_FILES.icu+= include/unicode/uscript.h -BUILDLINK_FILES.icu+= include/unicode/usearch.h -BUILDLINK_FILES.icu+= include/unicode/uset.h -BUILDLINK_FILES.icu+= include/unicode/usetiter.h -BUILDLINK_FILES.icu+= include/unicode/ushape.h -BUILDLINK_FILES.icu+= include/unicode/ustdio.h -BUILDLINK_FILES.icu+= include/unicode/ustream.h -BUILDLINK_FILES.icu+= include/unicode/ustring.h -BUILDLINK_FILES.icu+= include/unicode/utf.h -BUILDLINK_FILES.icu+= include/unicode/utf16.h -BUILDLINK_FILES.icu+= include/unicode/utf32.h -BUILDLINK_FILES.icu+= include/unicode/utf8.h -BUILDLINK_FILES.icu+= include/unicode/utf_old.h -BUILDLINK_FILES.icu+= include/unicode/utrans.h -BUILDLINK_FILES.icu+= include/unicode/utypes.h -BUILDLINK_FILES.icu+= include/unicode/uversion.h -BUILDLINK_FILES.icu+= lib/libicuctestfw.* + +BUILDLINK_FILES.icu+= include/layout/* +BUILDLINK_FILES.icu+= include/unicode/* BUILDLINK_FILES.icu+= lib/libicudata.* BUILDLINK_FILES.icu+= lib/libicui18n.* +BUILDLINK_FILES.icu+= lib/libicuio.* BUILDLINK_FILES.icu+= lib/libicule.* +BUILDLINK_FILES.icu+= lib/libiculx.* BUILDLINK_FILES.icu+= lib/libicutoolutil.* BUILDLINK_FILES.icu+= lib/libicuuc.* -BUILDLINK_FILES.icu+= lib/libustdio.* BUILDLINK_TARGETS+= icu-buildlink diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index b95666e0487..b12408e2521 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.4 2003/04/10 15:32:01 kent Exp $ +$NetBSD: distinfo,v 1.5 2003/06/23 07:49:39 jlam Exp $ -SHA1 (icu-2.4.tgz) = 6a0a9cb521b874bdd86d08a04b038ca6ad1a2b89 -Size (icu-2.4.tgz) = 7652187 bytes -SHA1 (patch-aa) = 39babc88de3df5755cff605dab436d0e0bc972ab -SHA1 (patch-ab) = ab0f327275c40247f7d790b6fcb529e5dd88fc06 -SHA1 (patch-ac) = 1a8bcfb5d6684c06487cb796a3f5d4f41a0c9568 -SHA1 (patch-ad) = 2b05b04287db43fc8adce79985c6f0f069595979 +SHA1 (icu-2.6.tgz) = f6b26725c4910f5db77739b0808523f3b147257c +Size (icu-2.6.tgz) = 8204740 bytes +SHA1 (patch-aa) = 1aa9cd7e0be296f782557a02c5dc9921aede6ca8 +SHA1 (patch-ab) = 5d13368bfae12aee2d474d7e71dc37a1bb2ffbcc +SHA1 (patch-ac) = 7639e568de1ef2ff8e0ebf2cb6da53c86831c253 SHA1 (patch-ae) = c7e9d86a0799bfac79495f93b4f71608dfefef00 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@ -- cgit v1.2.3