summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorkent <kent@pkgsrc.org>2003-04-10 15:32:00 +0000
committerkent <kent@pkgsrc.org>2003-04-10 15:32:00 +0000
commite226c7576ffa6512af7d2df6f12123f196118c10 (patch)
treee4e139e42eee8eec703e09366284a4853889af47 /textproc
parenta4b1af47b8e5e65b9955825bcd5b8ce1df685015 (diff)
downloadpkgsrc-e226c7576ffa6512af7d2df6f12123f196118c10.tar.gz
Make this compile by a non-root user.
Fix confusion on NetBSD PECOFF environment
Diffstat (limited to 'textproc')
-rw-r--r--textproc/icu/Makefile3
-rw-r--r--textproc/icu/distinfo5
-rw-r--r--textproc/icu/patches/patch-aa17
-rw-r--r--textproc/icu/patches/patch-ae13
4 files changed, 31 insertions, 7 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 281751d8157..4702ae702fe 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/04/10 15:32:00 kent Exp $
#
DISTNAME= icu-2.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${PKGBASE}/source
CATEGORIES= textproc
MASTER_SITES= http://oss.software.ibm.com/icu/download/${PKGVERSION}/
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index b2b03c29dcd..b95666e0487 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2003/03/21 23:44:06 salo Exp $
+$NetBSD: distinfo,v 1.4 2003/04/10 15:32:01 kent Exp $
SHA1 (icu-2.4.tgz) = 6a0a9cb521b874bdd86d08a04b038ca6ad1a2b89
Size (icu-2.4.tgz) = 7652187 bytes
-SHA1 (patch-aa) = 9aa4a0d8cc298fbe282ff3cf0e0099558f964cc4
+SHA1 (patch-aa) = 39babc88de3df5755cff605dab436d0e0bc972ab
SHA1 (patch-ab) = ab0f327275c40247f7d790b6fcb529e5dd88fc06
SHA1 (patch-ac) = 1a8bcfb5d6684c06487cb796a3f5d4f41a0c9568
SHA1 (patch-ad) = 2b05b04287db43fc8adce79985c6f0f069595979
+SHA1 (patch-ae) = c7e9d86a0799bfac79495f93b4f71608dfefef00
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index afc06ee50df..db4086c420e 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/03/21 23:44:07 salo Exp $
+$NetBSD: patch-aa,v 1.5 2003/04/10 15:32:01 kent Exp $
---- Makefile.in.orig 2002-11-14 19:44:14.000000000 +0100
-+++ Makefile.in 2003-03-21 22:58:10.000000000 +0100
-@@ -132,7 +132,7 @@
+--- 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
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.4 2003/03/21 23:44:07 salo Exp $
ifeq ($(DOXYGEN),)
install-doc:
+@@ -180,7 +180,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) $@
+- $(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 >> $@
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
new file mode 100644
index 00000000000..4bd6d3c17e2
--- /dev/null
+++ b/textproc/icu/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2003/04/10 15:32:01 kent Exp $
+
+--- common/unicode/umachine.h.orig 2003-04-10 15:56:38.000000000 +0900
++++ common/unicode/umachine.h
+@@ -41,7 +41,7 @@
+ /* which are contained in the platform-specific file platform.h */
+ /*==========================================================================*/
+
+-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
++#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(__NetBSDPE__)
+ # include "unicode/pwin32.h"
+ #elif defined(__OS400__)
+ # include "unicode/pos400.h"