diff options
Diffstat (limited to 'textproc/icu/patches')
-rw-r--r-- | textproc/icu/patches/patch-aa | 15 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ab | 48 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ac | 31 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ad | 28 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ae | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-af | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ag | 22 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ah | 22 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ai | 15 | ||||
-rw-r--r-- | textproc/icu/patches/patch-aj | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ak | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-al | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-am | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-an | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ao | 30 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ap | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-aq | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ar | 21 | ||||
-rw-r--r-- | textproc/icu/patches/patch-as | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-at | 12 |
20 files changed, 430 insertions, 0 deletions
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa new file mode 100644 index 00000000000..35217cb3f84 --- /dev/null +++ b/textproc/icu/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/12/20 18:28:02 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 + + dist-local: diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab new file mode 100644 index 00000000000..1dc36e8ec81 --- /dev/null +++ b/textproc/icu/patches/patch-ab @@ -0,0 +1,48 @@ +$NetBSD: patch-ab,v 1.1.1.1 2000/12/20 18:28:06 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 + +-#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)); diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac new file mode 100644 index 00000000000..78052cec973 --- /dev/null +++ b/textproc/icu/patches/patch-ac @@ -0,0 +1,31 @@ +$NetBSD: patch-ac,v 1.1.1.1 2000/12/20 18:28:06 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); + diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad new file mode 100644 index 00000000000..75967c88504 --- /dev/null +++ b/textproc/icu/patches/patch-ad @@ -0,0 +1,28 @@ +$NetBSD: patch-ad,v 1.1.1.1 2000/12/20 18:28:05 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=":" ;; diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae new file mode 100644 index 00000000000..4e9ec7c0a64 --- /dev/null +++ b/textproc/icu/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.1.1.1 2000/12/20 18:28:05 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) \ diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af new file mode 100644 index 00000000000..fefb0b73c7f --- /dev/null +++ b/textproc/icu/patches/patch-af @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..d8086dbc4fa --- /dev/null +++ b/textproc/icu/patches/patch-ag @@ -0,0 +1,22 @@ +$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 new file mode 100644 index 00000000000..f3762ab07b9 --- /dev/null +++ b/textproc/icu/patches/patch-ah @@ -0,0 +1,22 @@ +$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 new file mode 100644 index 00000000000..7823e24162a --- /dev/null +++ b/textproc/icu/patches/patch-ai @@ -0,0 +1,15 @@ +$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 new file mode 100644 index 00000000000..feedcaa209d --- /dev/null +++ b/textproc/icu/patches/patch-aj @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..b68fecc3e1c --- /dev/null +++ b/textproc/icu/patches/patch-ak @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..fe8f0dc7fef --- /dev/null +++ b/textproc/icu/patches/patch-al @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..987246d2624 --- /dev/null +++ b/textproc/icu/patches/patch-am @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..b949140726e --- /dev/null +++ b/textproc/icu/patches/patch-an @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..b313fbc64d2 --- /dev/null +++ b/textproc/icu/patches/patch-ao @@ -0,0 +1,30 @@ +$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 new file mode 100644 index 00000000000..f35e4af7f79 --- /dev/null +++ b/textproc/icu/patches/patch-ap @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..d31560703ed --- /dev/null +++ b/textproc/icu/patches/patch-aq @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..45bd6371533 --- /dev/null +++ b/textproc/icu/patches/patch-ar @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..b7fec860ae2 --- /dev/null +++ b/textproc/icu/patches/patch-as @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..65d8ef3ded2 --- /dev/null +++ b/textproc/icu/patches/patch-at @@ -0,0 +1,12 @@ +$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 |