--- Canna35b2/canna/widedef.h.ORIG	Mon Jan 15 17:40:17 2001
+++ Canna35b2/canna/widedef.h	Mon Jan 15 17:57:34 2001
@@ -35,7 +35,7 @@
 #define WCHAR16
 #endif
      
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DARWIN__)
 # include <machine/ansi.h>
 #endif
 
@@ -61,7 +61,7 @@
 #endif /* !nec_ews_svr2 */
 #endif /* HAVE_WCHAR_OPERATION */
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DARWIN__)
 # ifdef _BSD_WCHAR_T_
 #  undef _BSD_WCHAR_T_
 #  ifdef WCHAR16
--- Canna35b2/lib/RKC/rkc.c.ORIG	Wed Nov 27 16:21:11 1996
+++ Canna35b2/lib/RKC/rkc.c	Mon Jan 15 19:17:28 2001
@@ -253,7 +253,7 @@
 
 int RkwSetUserInfo pro((char *, char *, char *));
 
-RkUserInfo *uinfo;
+static RkUserInfo *uinfo;
 
 int
 RkwSetUserInfo(user, group, topdir)
--- Canna35b2/Canna.conf.ORIG	Mon Jan 15 17:15:37 2001
+++ Canna35b2/Canna.conf	Mon Jan 15 20:29:10 2001
@@ -128,12 +128,12 @@
  * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $
  */
 
-cannaBinDir = /usr/bin
-cannaSrvDir = /usr/sbin
-cannaLibDir = /var/lib/canna
-cannaManDir = /usr/man/$(JapaneseLocale)
-cannaIncDir = /usr/include/canna
-libCannaDir = /usr/lib
+cannaBinDir = /usr/local/bin
+cannaSrvDir = /usr/local/sbin
+cannaLibDir = /usr/local/lib/canna
+cannaManDir = /usr/local/man/$(JapaneseLocale)
+cannaIncDir = /usr/local/include/canna
+libCannaDir = /usr/local/lib
 
 ErrDir  = /var/log/canna
 
@@ -141,8 +141,8 @@
 Wlib =
 JapaneseLocale = ja
 
-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = daemon
+cannaGroup = daemon
 
 cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
 
@@ -155,7 +155,10 @@
             cannaDsoRev = 1.0
     と指定してください。 */
 
+/*
 sharedLibExtension = so.$(cannaDsoRev)
+*/
+sharedLibExtension = dylib
 
 /* iroha.t の場所を指定。pubdic+ があればそちらを指定します。 */
 pubdicDir = $(CANNAROOT)/dic/ideo/pubdic