- Make this compile with imake 4.2.0, in which the LinkFileList

  definition has been changed somehow.  Add a patch to override it with
  the previous definition.

  Addressed by:	Marc Espie <espie@openbsd.org>

- Add a patch to fix bzero()/bcopy() namespace collision. (by me)

- Change one of the master sites.

  Submitted by:	Kimura Fuyuki <fuyuki@mj.0038.net>

Discussed on:	ports-jp@jp.FreeBSD.org
On behalf of:	max (MAINTAINER)

3 files changed, 75 insertions, 3 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index cb2e016e4036..a41f7b1c7d15 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	3.5b2
 PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \
-		ftp://ftp.meshnet.or.jp/pub/tool/Canna/Canna35/ \
+		ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \
 		ftp://ftp.sra.co.jp/pub/misc/canna/ \
 		ftp://ftp.habi.or.jp/pub/Tools/Canna/Canna35/ \
 		ftp://ftp.hans.or.jp/pub/Tools/Canna/Canna35/
diff --git a/japanese/Canna/files/patch-ac b/japanese/Canna/files/patch-ac
index 3debb335f647..799c661ddeae 100644
--- a/japanese/Canna/files/patch-ac
+++ b/japanese/Canna/files/patch-ac
@@ -1,5 +1,5 @@
---- Canna.conf.orig	Thu Nov 28 04:27:01 1996
-+++ Canna.conf	Mon Nov 19 20:41:21 2001
+--- Canna.conf.orig	Thu Nov 28 19:27:01 1996
++++ Canna.conf	Tue Apr  2 05:36:35 2002
 @@ -128,14 +128,15 @@
   * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $
   */
@@ -56,3 +56,19 @@
            RK_DEFINES = $(pointerIntegerDef)
           RKC_DEFINES = $(wcharDefinition)
         UILIB_DEFINES = $(wcharDefinition) $(pointerIntegerDef) \
+@@ -378,6 +379,15 @@
+ 		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi \	@@\
+ 	done
+ #endif /* MakeDirectories */
++
++#ifdef LinkFileList
++#undef LinkFileList
++#endif
++#define LinkFileList(step,list,dir,sub)					@@\
++step:: list								@@\
++	@MakeFlagsToShellFlags(i,set +e); \				@@\
++	echo "	cd" dir; cd dir && \					@@\
++	for i in list; do (set -x; $(LN) -f sub/$$i .); done
+ 
+ /* 以下は IBM 基礎研の古畑さん(furuhata@trl.ibm.co.jp)により書かれました */
+ #if defined(RsArchitecture) && DoSharedLib
diff --git a/japanese/Canna/files/patch-bzero b/japanese/Canna/files/patch-bzero
new file mode 100644
index 000000000000..7a86d56cf123
--- /dev/null
+++ b/japanese/Canna/files/patch-bzero
@@ -0,0 +1,56 @@
+--- ccustom/canna.h.orig	Thu Nov  7 10:21:45 1996
++++ ccustom/canna.h	Tue Apr  2 00:09:52 2002
+@@ -46,4 +46,6 @@
+ # endif
++# if 0
+ # define bzero(buf, size) memset((char *)(buf), 0x00, (size))
+ # define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
++# endif
+ #endif
+--- lib/RK/RKintern.h.orig	Tue Apr  2 00:03:01 2002
++++ lib/RK/RKintern.h	Tue Apr  2 00:10:41 2002
+@@ -107,4 +107,6 @@
+ # ifndef __EMX__
++#  if 0
+ #  define bzero(buf, size) memset((char *)(buf), 0x00, (size))
+ #  define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
++#  endif
+ # endif
+--- lib/RK/ngram.c.orig	Tue Apr  2 00:03:01 2002
++++ lib/RK/ngram.c	Tue Apr  2 00:11:03 2002
+@@ -48,4 +48,6 @@
+ # endif
++# if 0
+ # define bzero(buf, size) memset((char *)(buf), 0x00, (size))
+ # define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
++# endif
+ #endif
+--- lib/RKC/rkc.h.orig	Wed Nov 27 16:21:35 1996
++++ lib/RKC/rkc.h	Tue Apr  2 00:11:35 2002
+@@ -48,2 +48,3 @@
+ # ifndef __EMX__
++#  if 0
+ #  ifndef bzero
+@@ -53,2 +54,3 @@
+ #   define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
++#  endif
+ #  endif
+--- lib/canna/canna.h.orig	Mon Dec  2 11:20:15 1996
++++ lib/canna/canna.h	Tue Apr  2 00:11:58 2002
+@@ -112,4 +112,6 @@
+ # ifndef __EMX__
++#  if 0
+ #  define bzero(buf, size) memset((char *)(buf), 0x00, (size))
+ #  define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
++#  endif
+ # endif
+--- server/IR.h.orig	Wed Nov 27 16:24:56 1996
++++ server/IR.h	Tue Apr  2 00:12:30 2002
+@@ -34,2 +34,3 @@
+ # ifndef __EMX__
++#  if 0
+ #  ifndef bcopy
+@@ -39,2 +40,3 @@
+ #   define bzero(buf, size) memset((char *)(buf), 0x00, (size))
++#  endif
+ #  endif