canna stable port information

Package: canna
Version: 3.7p3
Revision: 5
Replaces: %N (<= 3.5b2-4)
BuildDepends: system-xfree86-dev | x11-dev, passwd, xmkmf (>= 1.0.2-3)
Depends: %N-shlibs (= %v-%r), %N-utils (= %v-%r), %N-server (= %v-%r)
Source: http://downloads.sourceforge.jp/canna/9565/Canna37p3.tar.bz2
Source-MD5: 0b8c241f63ab4cd3c0b9be569456dc33
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/xmkmf/bin:$PATH
export IMAKEINCLUDE=-I%p/lib/X11/config
xmkmf
make canna
<<
InstallScript: <<
make install install.man DESTDIR=%d

rm %i/sbin/cannakill
install -c -m 755 %i/bin/catdic %i/sbin/cannakill

install -d -m 755 %i/etc/canna
mv %i/share/canna/default.canna %i/etc/canna/default.canna
( cd %i/share/canna && ln -sf %p/etc/canna/default.canna )

install -c -m 755 update-canna-dics-dir %i/sbin/
install -c -m 644 hosts.canna %i/etc/canna/
install -c -m 755 misc/rc.canna %i/etc/canna/

install -d -m 755 %i/var/lib/canna/dics.d
mv %i/var/lib/canna/dic/canna/dics.dir %i/var/lib/canna/dics.d/00default
touch %i/var/lib/canna/dic/canna/dics.dir
<<
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (client libraries)
Files: lib/libcanna.*.dylib lib/libcanna16.*.dylib lib/libRKC.*.dylib lib/libRKC16.*.dylib share/canna etc/canna/default.canna
ConfFiles: %p/etc/canna/default.canna
Shlibs: <<
%p/lib/libcanna.1.dylib 1.2.0 %n (>= 3.7p1-3)
%p/lib/libcanna16.1.dylib 1.2.0 %n (>= 3.7p1-3)
%p/lib/libRKC.1.dylib 1.2.0 %n (>= 3.7p1-3)
%p/lib/libRKC16.1.dylib 1.2.0 %n (>= 3.7p1-3)
<<
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (headers)
Files: include lib/*.a lib/libcanna.dylib lib/libcanna16.dylib lib/libRKC.dylib lib/libRKC16.dylib share/man/man3
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
SplitOff3: <<
Package: %N-server
Depends: %N-shlibs (= %v-%r), passwd, daemonic
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (server)
Files: sbin share/man/man1/cannaserver.1 share/man/man1/cannakill.1 var etc/canna/hosts.canna etc/canna/rc.canna
ConfFiles: %p/etc/canna/hosts.canna %p/etc/canna/rc.canna
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
PostInstScript: <<
daemonic install canna
daemonic enable canna
update-canna-dics-dir
%p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
install -d -m 1777 /tmp/.iroha_unix 2>&1 || true
mkdir -p %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
chown canna:canna %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
chmod 770 %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
%p/etc/canna/rc.canna start >/dev/null 2>&1 || true
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
%p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
daemonic remove canna || true
rmdir /tmp/.iroha_unix 2>&1 || true
rm -rf %p/var/log/canna
fi
<<
DaemonicName: canna
DaemonicFile: <<

Canna Server
Canna server

%p/etc/canna/rc.canna
start


<<
<<
SplitOff4: <<
Package: %N-utils
Depends: %N-shlibs (= %v-%r)
Conflicts: cannadic (<< 0.95a-1)
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (client utilities)
Files: bin share/man/man1
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
Description: Japanese input system (bundle)
DescDetail: <<
Canna is based on a client-server model for kana-to-kanji conversion,
that is, an application program which uses a Japanese input system
communicates with a kana-to-kanji conversion server, which is a separate
process from the application program.
<<
DescPort: <<
(load "nonexistent.canna" t) syntax is backported from CVS HEAD.
<<
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
License: BSD
Maintainer: Todai Fink Team
Homepage: http://canna.sourceforge.jp/

canna stable port .patch

diff -Naur Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
--- Canna37p3.orig/Canna.conf Wed May 19 15:48:47 2004
+++ Canna37p3/Canna.conf Sun May 29 14:59:54 2005
@@ -140,19 +140,23 @@
# define ModernElfLinkAvailable NO
#endif

-cannaPrefix = DefCannaPrefix
+#define MyCCOptions -no-cpp-precomp -Wall -Wpointer-arith -Wno-implicit-int -Wno-return-type
+#undef LibraryCCOptions
+#define LibraryCCOptions MyCCOptions -fno-common
+CCOPTIONS = MyCCOptions
+
+cannaPrefix = @PREFIX@
cannaExecPrefix = $(cannaPrefix)
cannaBinDir = $(cannaExecPrefix)/bin
cannaSrvDir = DefCannaSrvDir
XCOMM cannaLibDir = /var/lib/canna
XCOMM cannaLibDir = /var/db/canna
cannaLibDir = DefCannaLibDir
-XCOMM cannaManDir = $(cannaPrefix)/share/man
-cannaManDir = $(cannaPrefix)/man
+cannaManDir = $(cannaPrefix)/share/man
cannaIncDir = $(cannaPrefix)/include/canna

libCannaDir = DefLibCannaDir
-ErrDir = DefErrDir
+ErrDir = $(cannaPrefix)/var/log/canna

/* 旧バージョンとの互換APIを無効にする場合は0と定義してください */
#define SupportOldWchar 1
@@ -169,8 +173,8 @@
#define ModernElfLink NO /* experimental */


-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = canna
+cannaGroup = canna

#ifdef InstallAsUser
cannaOwnerGroup =
@@ -199,13 +203,13 @@
CHGRP = :
CHMOD = :
#else
-CHOWN = chown
-CHGRP = chgrp
-CHMOD = chmod
+CHOWN = /usr/sbin/chown
+CHGRP = /usr/bin/chgrp
+CHMOD = /bin/chmod
#endif

/* 日本語マニュアルを使わないのであればコメントアウト */
-#define JAPANESEMAN
+/* #define JAPANESEMAN */

/* #define engineSwitch */

@@ -237,7 +241,7 @@
/* #define UseInstalledLibCanna YES */
#define UseInstalledLibCanna NO

-DicDir = $(cannaLibDir)/dic
+DicDir = $(cannaPrefix)/var/lib/canna/dic

/* ここから下は変更不要です */

@@ -343,7 +347,7 @@
AccessFile = $(cannaPrefix)/etc/hosts.canna
#else
UnixSockDir = /tmp/.iroha_unix
-AccessFile = /etc/hosts.canna
+AccessFile = $(cannaPrefix)/etc/canna/hosts.canna
#endif
UnixSockName = IROHA

diff -Naur Canna37p3.orig/canna/widedef.h Canna37p3/canna/widedef.h
--- Canna37p3.orig/canna/widedef.h Sat Dec 27 17:15:20 2003
+++ Canna37p3/canna/widedef.h Sun May 29 15:00:31 2005
@@ -32,12 +32,12 @@
#endif

#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ || defined(__NetBSD__) || defined(__OpenBSD__)
# include
#endif

#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ || defined(__NetBSD__) || defined(__OpenBSD__)
# ifdef _BSD_WCHAR_T_
# undef _BSD_WCHAR_T_
# ifdef WCHAR16
@@ -45,10 +45,6 @@
# else
# define _BSD_WCHAR_T_ unsigned long
# endif
-# if defined(__APPLE__) && defined(__WCHAR_TYPE__)
-# undef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ _BSD_WCHAR_T_
-# endif
# include
# define _WCHAR_T
# endif
@@ -59,6 +55,14 @@
# endif
# include
# define _WCHAR_T
+#elif defined(__APPLE__)
+# ifdef WCHAR16
+typedef unsigned short wchar_t;
+# else
+typedef unsigned long wchar_t;
+# endif
+# define _BSD_WCHAR_T_DEFINED_ /* <= 10.3 */
+# define _WCHAR_T /* >= 10.4 */
#else
#if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
&& !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) && !defined(_WCHAR_T_DEFINED)
diff -Naur Canna37p3.orig/dic/ideo/words/chimei.t Canna37p3/dic/ideo/words/chimei.t
--- Canna37p3.orig/dic/ideo/words/chimei.t Sat Sep 27 06:18:39 2003
+++ Canna37p3/dic/ideo/words/chimei.t Sun May 29 14:59:54 2005
@@ -714,7 +714,7 @@
じょうせき #CN 城跡
じょうとうく #CNS 城東区
じょうなんく #CNS 城南区
-じょうばんせん #CNS 常盤線
+じょうばんせん #CNS 常磐線
じょうようし #CNS 城陽市
じょほーる #CN ジョホール
じんぐうまえ #CN 神宮前
diff -Naur Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
--- Canna37p3.orig/dic/phono/Imakefile Sat Oct 19 08:27:40 2002
+++ Canna37p3/dic/phono/Imakefile Sun May 29 14:59:54 2005
@@ -25,7 +25,11 @@
KPDIC = $(CMDDIR)/kpdic/kpdic
#endif

+#ifdef HasGcc
+ ROMAJI_DIC_DEF = -DSHIFT -traditional
+#else
ROMAJI_DIC_DEF = -DSHIFT
+#endif

DICDIR = $(cannaLibDir)/dic
SAMPLEDIR = $(cannaLibDir)/sample
diff -Naur Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
--- Canna37p3.orig/hosts.canna Thu Jan 1 00:00:00 1970
+++ Canna37p3/hosts.canna Sun May 29 14:59:54 2005
@@ -0,0 +1,2 @@
+unix
+localhost
diff -Naur Canna37p3.orig/lib/canna/lisp.c Canna37p3/lib/canna/lisp.c
--- Canna37p3.orig/lib/canna/lisp.c Mon Apr 26 22:49:21 2004
+++ Canna37p3/lib/canna/lisp.c Thu Mar 23 17:24:20 2006
@@ -2643,15 +2643,21 @@
int n;
{
list p, t;
- FILE *instream, *fopen();
+ list noerror = NIL;
+ FILE *instream;

- argnchk("load",1);
+ if (n != 1 && n != 2)
+ argnerr("load");
+ if (n == 2)
+ noerror = pop1();
p = pop1();
if ( !stringp(p) ) {
error("load: illegal file name ",p);
/* NOTREACHED */
}
if ((instream = fopen(xstring(p), "r")) == (FILE *)NULL) {
+ if (noerror)
+ return NIL;
error("load: file not found ",p);
/* NOTREACHED */
}
diff -Naur Canna37p3.orig/server/util.c Canna37p3/server/util.c
--- Canna37p3.orig/server/util.c Sun Sep 21 12:56:29 2003
+++ Canna37p3/server/util.c Sat Jun 4 15:28:41 2005
@@ -24,10 +24,10 @@
static char rcs_id[] = "$Id: util.c,v 1.8 2003/09/21 12:56:29 aida_s Exp $";
#endif

-#include "server.h"
-#if 1 /* unused */
+#if 0 /* unused */
#include "widedef.h"
#endif
+#include "server.h"

size_t
ushort2euc(src, srclen, dest, destlen)
@@ -104,7 +104,7 @@
return j;
}

-#if 1 /* unused */
+#if 0 /* unused */
size_t
wchar2ushort32(src, srclen, dest, destlen)
register const wchar_t *src;
diff -Naur Canna37p3.orig/update-canna-dics-dir Canna37p3/update-canna-dics-dir
--- Canna37p3.orig/update-canna-dics-dir Thu Jan 1 00:00:00 1970
+++ Canna37p3/update-canna-dics-dir Sun May 29 14:59:54 2005
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin
+export PATH
+
+LIST_FILE=@PREFIX@/var/lib/canna/dic/canna/dics.dir
+LIST_DIR=@PREFIX@/var/lib/canna/dics.d
+
+TMPFILE=`tempfile`
+cat ${LIST_DIR}/* >>${TMPFILE}
+mv ${TMPFILE} ${LIST_FILE}
+chmod 0644 ${LIST_FILE}
+chown canna:canna ${LIST_FILE}
+
+exit 0

canna _unstable_ port information

Package: canna
Version: 3.7p3
Revision: 5
Replaces: %N (<= 3.5b2-4)
BuildDepends: system-xfree86-dev | x11-dev, passwd, xmkmf (>= 1.0.2-3)
Depends: %N-shlibs (= %v-%r), %N-utils (= %v-%r), %N-server (= %v-%r)
Source: http://downloads.sourceforge.jp/canna/9565/Canna37p3.tar.bz2
Source-MD5: 0b8c241f63ab4cd3c0b9be569456dc33
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/xmkmf/bin:$PATH
export IMAKEINCLUDE=-I%p/lib/X11/config
xmkmf
make canna
<<
InstallScript: <<
make install install.man DESTDIR=%d

rm %i/sbin/cannakill
install -c -m 755 %i/bin/catdic %i/sbin/cannakill

install -d -m 755 %i/etc/canna
mv %i/share/canna/default.canna %i/etc/canna/default.canna
( cd %i/share/canna && ln -sf %p/etc/canna/default.canna )

install -c -m 755 update-canna-dics-dir %i/sbin/
install -c -m 644 hosts.canna %i/etc/canna/
install -c -m 755 misc/rc.canna %i/etc/canna/

install -d -m 755 %i/var/lib/canna/dics.d
mv %i/var/lib/canna/dic/canna/dics.dir %i/var/lib/canna/dics.d/00default
touch %i/var/lib/canna/dic/canna/dics.dir
<<
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (client libraries)
Files: lib/libcanna.*.dylib lib/libcanna16.*.dylib lib/libRKC.*.dylib lib/libRKC16.*.dylib share/canna etc/canna/default.canna
ConfFiles: %p/etc/canna/default.canna
Shlibs: <<
%p/lib/libcanna.1.dylib 1.2.0 %n (>= 3.7p1-3)
%p/lib/libcanna16.1.dylib 1.2.0 %n (>= 3.7p1-3)
%p/lib/libRKC.1.dylib 1.2.0 %n (>= 3.7p1-3)
%p/lib/libRKC16.1.dylib 1.2.0 %n (>= 3.7p1-3)
<<
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (headers)
Files: include lib/*.a lib/libcanna.dylib lib/libcanna16.dylib lib/libRKC.dylib lib/libRKC16.dylib share/man/man3
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
SplitOff3: <<
Package: %N-server
Depends: %N-shlibs (= %v-%r), passwd, daemonic
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (server)
Files: sbin share/man/man1/cannaserver.1 share/man/man1/cannakill.1 var etc/canna/hosts.canna etc/canna/rc.canna
ConfFiles: %p/etc/canna/hosts.canna %p/etc/canna/rc.canna
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
PostInstScript: <<
daemonic install canna
daemonic enable canna
update-canna-dics-dir
%p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
install -d -m 1777 /tmp/.iroha_unix 2>&1 || true
mkdir -p %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
chown canna:canna %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
chmod 770 %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
%p/etc/canna/rc.canna start >/dev/null 2>&1 || true
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
%p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
daemonic remove canna || true
rmdir /tmp/.iroha_unix 2>&1 || true
rm -rf %p/var/log/canna
fi
<<
DaemonicName: canna
DaemonicFile: <<

Canna Server
Canna server

%p/etc/canna/rc.canna
start


<<
<<
SplitOff4: <<
Package: %N-utils
Depends: %N-shlibs (= %v-%r)
Conflicts: cannadic (<< 0.95a-1)
Replaces: %N (<= 3.5b2-4)
Description: Japanese input system (client utilities)
Files: bin share/man/man1
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
Description: Japanese input system (bundle)
DescDetail: <<
Canna is based on a client-server model for kana-to-kanji conversion,
that is, an application program which uses a Japanese input system
communicates with a kana-to-kanji conversion server, which is a separate
process from the application program.
<<
DescPort: <<
(load "nonexistent.canna" t) syntax is backported from CVS HEAD.
<<
DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
License: BSD
Maintainer: Todai Fink Team
Homepage: http://canna.sourceforge.jp/

canna _unstable_ port .patch

diff -Naur Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
--- Canna37p3.orig/Canna.conf Wed May 19 15:48:47 2004
+++ Canna37p3/Canna.conf Sun May 29 14:59:54 2005
@@ -140,19 +140,23 @@
# define ModernElfLinkAvailable NO
#endif

-cannaPrefix = DefCannaPrefix
+#define MyCCOptions -no-cpp-precomp -Wall -Wpointer-arith -Wno-implicit-int -Wno-return-type
+#undef LibraryCCOptions
+#define LibraryCCOptions MyCCOptions -fno-common
+CCOPTIONS = MyCCOptions
+
+cannaPrefix = @PREFIX@
cannaExecPrefix = $(cannaPrefix)
cannaBinDir = $(cannaExecPrefix)/bin
cannaSrvDir = DefCannaSrvDir
XCOMM cannaLibDir = /var/lib/canna
XCOMM cannaLibDir = /var/db/canna
cannaLibDir = DefCannaLibDir
-XCOMM cannaManDir = $(cannaPrefix)/share/man
-cannaManDir = $(cannaPrefix)/man
+cannaManDir = $(cannaPrefix)/share/man
cannaIncDir = $(cannaPrefix)/include/canna

libCannaDir = DefLibCannaDir
-ErrDir = DefErrDir
+ErrDir = $(cannaPrefix)/var/log/canna

/* 旧バージョンとの互換APIを無効にする場合は0と定義してください */
#define SupportOldWchar 1
@@ -169,8 +173,8 @@
#define ModernElfLink NO /* experimental */


-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = canna
+cannaGroup = canna

#ifdef InstallAsUser
cannaOwnerGroup =
@@ -199,13 +203,13 @@
CHGRP = :
CHMOD = :
#else
-CHOWN = chown
-CHGRP = chgrp
-CHMOD = chmod
+CHOWN = /usr/sbin/chown
+CHGRP = /usr/bin/chgrp
+CHMOD = /bin/chmod
#endif

/* 日本語マニュアルを使わないのであればコメントアウト */
-#define JAPANESEMAN
+/* #define JAPANESEMAN */

/* #define engineSwitch */

@@ -237,7 +241,7 @@
/* #define UseInstalledLibCanna YES */
#define UseInstalledLibCanna NO

-DicDir = $(cannaLibDir)/dic
+DicDir = $(cannaPrefix)/var/lib/canna/dic

/* ここから下は変更不要です */

@@ -343,7 +347,7 @@
AccessFile = $(cannaPrefix)/etc/hosts.canna
#else
UnixSockDir = /tmp/.iroha_unix
-AccessFile = /etc/hosts.canna
+AccessFile = $(cannaPrefix)/etc/canna/hosts.canna
#endif
UnixSockName = IROHA

diff -Naur Canna37p3.orig/canna/widedef.h Canna37p3/canna/widedef.h
--- Canna37p3.orig/canna/widedef.h Sat Dec 27 17:15:20 2003
+++ Canna37p3/canna/widedef.h Sun May 29 15:00:31 2005
@@ -32,12 +32,12 @@
#endif

#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ || defined(__NetBSD__) || defined(__OpenBSD__)
# include
#endif

#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ || defined(__NetBSD__) || defined(__OpenBSD__)
# ifdef _BSD_WCHAR_T_
# undef _BSD_WCHAR_T_
# ifdef WCHAR16
@@ -45,10 +45,6 @@
# else
# define _BSD_WCHAR_T_ unsigned long
# endif
-# if defined(__APPLE__) && defined(__WCHAR_TYPE__)
-# undef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ _BSD_WCHAR_T_
-# endif
# include
# define _WCHAR_T
# endif
@@ -59,6 +55,14 @@
# endif
# include
# define _WCHAR_T
+#elif defined(__APPLE__)
+# ifdef WCHAR16
+typedef unsigned short wchar_t;
+# else
+typedef unsigned long wchar_t;
+# endif
+# define _BSD_WCHAR_T_DEFINED_ /* <= 10.3 */
+# define _WCHAR_T /* >= 10.4 */
#else
#if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
&& !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) && !defined(_WCHAR_T_DEFINED)
diff -Naur Canna37p3.orig/dic/ideo/words/chimei.t Canna37p3/dic/ideo/words/chimei.t
--- Canna37p3.orig/dic/ideo/words/chimei.t Sat Sep 27 06:18:39 2003
+++ Canna37p3/dic/ideo/words/chimei.t Sun May 29 14:59:54 2005
@@ -714,7 +714,7 @@
じょうせき #CN 城跡
じょうとうく #CNS 城東区
じょうなんく #CNS 城南区
-じょうばんせん #CNS 常盤線
+じょうばんせん #CNS 常磐線
じょうようし #CNS 城陽市
じょほーる #CN ジョホール
じんぐうまえ #CN 神宮前
diff -Naur Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
--- Canna37p3.orig/dic/phono/Imakefile Sat Oct 19 08:27:40 2002
+++ Canna37p3/dic/phono/Imakefile Sun May 29 14:59:54 2005
@@ -25,7 +25,11 @@
KPDIC = $(CMDDIR)/kpdic/kpdic
#endif

+#ifdef HasGcc
+ ROMAJI_DIC_DEF = -DSHIFT -traditional
+#else
ROMAJI_DIC_DEF = -DSHIFT
+#endif

DICDIR = $(cannaLibDir)/dic
SAMPLEDIR = $(cannaLibDir)/sample
diff -Naur Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
--- Canna37p3.orig/hosts.canna Thu Jan 1 00:00:00 1970
+++ Canna37p3/hosts.canna Sun May 29 14:59:54 2005
@@ -0,0 +1,2 @@
+unix
+localhost
diff -Naur Canna37p3.orig/lib/canna/lisp.c Canna37p3/lib/canna/lisp.c
--- Canna37p3.orig/lib/canna/lisp.c Mon Apr 26 22:49:21 2004
+++ Canna37p3/lib/canna/lisp.c Thu Mar 23 17:24:20 2006
@@ -2643,15 +2643,21 @@
int n;
{
list p, t;
- FILE *instream, *fopen();
+ list noerror = NIL;
+ FILE *instream;

- argnchk("load",1);
+ if (n != 1 && n != 2)
+ argnerr("load");
+ if (n == 2)
+ noerror = pop1();
p = pop1();
if ( !stringp(p) ) {
error("load: illegal file name ",p);
/* NOTREACHED */
}
if ((instream = fopen(xstring(p), "r")) == (FILE *)NULL) {
+ if (noerror)
+ return NIL;
error("load: file not found ",p);
/* NOTREACHED */
}
diff -Naur Canna37p3.orig/server/util.c Canna37p3/server/util.c
--- Canna37p3.orig/server/util.c Sun Sep 21 12:56:29 2003
+++ Canna37p3/server/util.c Sat Jun 4 15:28:41 2005
@@ -24,10 +24,10 @@
static char rcs_id[] = "$Id: util.c,v 1.8 2003/09/21 12:56:29 aida_s Exp $";
#endif

-#include "server.h"
-#if 1 /* unused */
+#if 0 /* unused */
#include "widedef.h"
#endif
+#include "server.h"

size_t
ushort2euc(src, srclen, dest, destlen)
@@ -104,7 +104,7 @@
return j;
}

-#if 1 /* unused */
+#if 0 /* unused */
size_t
wchar2ushort32(src, srclen, dest, destlen)
register const wchar_t *src;
diff -Naur Canna37p3.orig/update-canna-dics-dir Canna37p3/update-canna-dics-dir
--- Canna37p3.orig/update-canna-dics-dir Thu Jan 1 00:00:00 1970
+++ Canna37p3/update-canna-dics-dir Sun May 29 14:59:54 2005
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin
+export PATH
+
+LIST_FILE=@PREFIX@/var/lib/canna/dic/canna/dics.dir
+LIST_DIR=@PREFIX@/var/lib/canna/dics.d
+
+TMPFILE=`tempfile`
+cat ${LIST_DIR}/* >>${TMPFILE}
+mv ${TMPFILE} ${LIST_FILE}
+chmod 0644 ${LIST_FILE}
+chown canna:canna ${LIST_FILE}
+
+exit 0