Fix the broken symlink in lib/icu/1.7

7 files changed, 26 insertions, 12 deletions

diff --git a/textproc/icu/files/patch-sum b/textproc/icu/files/patch-sum
index 39e517f9a81..d4ec89966f8 100644
--- a/textproc/icu/files/patch-sum
+++ b/textproc/icu/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.2 2000/12/21 18:14:18 skrll Exp $
+$NetBSD: patch-sum,v 1.3 2000/12/23 09:39:20 skrll Exp $
 
-MD5 (patch-aa) = 144fa181401e241047caf8f4254c1087
+MD5 (patch-aa) = a9ca83a30cd6eb8f8f49a08f778f2c2d
 MD5 (patch-ab) = 811ff8c3eb5ef7a68fb3232442de1951
 MD5 (patch-ac) = b4286342af780046b878b1e312b367d0
-MD5 (patch-ad) = c78a8fd70a799d1ba7f4571a679a86b2
-MD5 (patch-ae) = b802a4610b6163c495bd5a642fff6c22
+MD5 (patch-ad) = 39b870d7c9b4aa9786faea77870b083b
+MD5 (patch-ae) = 28d170fbcc37ccdbc0c104f43d3c1012
+MD5 (patch-af) = e1c78260160b427fec7ae0937d1c9c2a
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 70f49aa3ac0..9cd1277353e 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2000/12/21 18:14:18 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2000/12/23 09:39:20 skrll Exp $
 
---- common/udata.c.orig	Thu Dec 21 15:37:15 2000
+--- common/udata.c.orig	Wed Dec  6 03:02:12 2000
 +++ common/udata.c
 @@ -238,7 +238,7 @@
  #   define MAP_IMPLEMENTATION MAP_WIN32
diff --git a/textproc/icu/patches/patch-ab b/textproc/icu/patches/patch-ab
index 4502585e65c..903ffda6502 100644
--- a/textproc/icu/patches/patch-ab
+++ b/textproc/icu/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2000/12/21 18:14:18 skrll Exp $
+$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
diff --git a/textproc/icu/patches/patch-ac b/textproc/icu/patches/patch-ac
index a85ab5ac634..e9fa67ef9a6 100644
--- a/textproc/icu/patches/patch-ac
+++ b/textproc/icu/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2000/12/21 18:14:18 skrll Exp $
+$NetBSD: patch-ac,v 1.3 2000/12/23 09:39:20 skrll Exp $
 
 --- configure.orig	Mon Dec  4 23:30:03 2000
 +++ configure
diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad
index fb87bf3826e..361953a6b1f 100644
--- a/textproc/icu/patches/patch-ad
+++ b/textproc/icu/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2000/12/21 18:14:18 skrll Exp $
+$NetBSD: patch-ad,v 1.3 2000/12/23 09:39:21 skrll Exp $
 
---- test/intltest/intltest.cpp.orig	Thu Dec 21 15:38:00 2000
+--- test/intltest/intltest.cpp.orig	Tue Dec 12 19:40:58 2000
 +++ test/intltest/intltest.cpp
 @@ -411,7 +411,7 @@
              mainDirBuffer[0]='\0';
diff --git a/textproc/icu/patches/patch-ae b/textproc/icu/patches/patch-ae
index a3fff2cab48..5cb1f6909f0 100644
--- a/textproc/icu/patches/patch-ae
+++ b/textproc/icu/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2000/12/21 18:14:18 skrll Exp $
+$NetBSD: patch-ae,v 1.3 2000/12/23 09:39:21 skrll Exp $
 
---- tools/pkgdata/icupkg.inc.in.orig	Thu Dec 21 15:38:50 2000
+--- 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)
diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af
new file mode 100644
index 00000000000..c5828c46b84
--- /dev/null
+++ b/textproc/icu/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2000/12/23 09:39:21 skrll Exp $
+
+--- data/Makefile.in.orig	Sat Dec 23 08:59:44 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) icudata.$(SO) && ln -s lib$(ICUDATA_NAME).$(SO) icudata.$(SO))
+ endif
+ 
+ install-convrtrstxt: $(top_srcdir)/../data/convrtrs.txt