Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3080/10.3/unstable/main/finkinfo/utils
Modified Files:
canna.info canna.patch cannadic.info
Log Message:
Implemented a mechanism for canlisps to detect cannadic is installed or not.
It is, however, nonsensical if your cannaserver is running on a remote host.
Index: cannadic.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/cannadic.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cannadic.info 30 Mar 2005 07:18:38 -0000 1.3
+++ cannadic.info 23 Mar 2006 18:33:28 -0000 1.4
@@ -1,6 +1,6 @@
Package: cannadic
Version: 0.95c
-Revision: 1
+Revision: 2
BuildDepends: canna-utils (>= 3.7p1-3)
Depends: canna-server (>= 3.7p1-3)
Conflicts: canna (<< 3.7p1-3)
@@ -11,9 +11,13 @@
install -d -m 755 %i/var/lib/canna/dic/canna
install -o canna -g canna -m 644 gcanna.cbd gcanna.cld gcannaf.ctd
%i/var/lib/canna/dic/canna/
install -d -m 755 %i/var/lib/canna/dics.d
- echo "gcanna.cbd(gcanna.mwd) -gcanna---"
>>/%i/var/lib/canna/dics.d/01cannadic
- echo "gcanna.cld(gcanna.mwd) -gcanna---"
>>/%i/var/lib/canna/dics.d/01cannadic
- echo "gcannaf.ctd(.swd) -gcannaf---" >>/%i/var/lib/canna/dics.d/01cannadic
+ echo "gcanna.cbd(gcanna.mwd) -gcanna---" >>
%i/var/lib/canna/dics.d/01cannadic
+ echo "gcanna.cld(gcanna.mwd) -gcanna---" >>
%i/var/lib/canna/dics.d/01cannadic
+ echo "gcannaf.ctd(.swd) -gcannaf---" >> %i/var/lib/canna/dics.d/01cannadic
+ install -d -m 755 %i/share/canna
+ echo ';; If cannadic is installed, (load (concat canna-directory
"/gcannatest.canna") t)' >> %i/share/canna/gcannatest.canna
+ echo ';; returns non-nil on canna >= 3.7p3-5. This file contains no lisp
codes.' >> %i/share/canna/gcannatest.canna
+ echo ';; If your cannaserver is running on a remote host, this method will
not work.' >> %i/share/canna/gcannatest.canna
<<
DocFiles: COPYING README.ja
PostInstScript: <<
Index: canna.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/canna.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- canna.patch 4 Jun 2005 15:35:09 -0000 1.5
+++ canna.patch 23 Mar 2006 18:33:28 -0000 1.6
@@ -1,6 +1,6 @@
diff -Naur Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
---- Canna37p3.orig/Canna.conf 2004-05-19 15:48:47.000000000 +0000
-+++ Canna37p3/Canna.conf 2005-05-29 14:59:54.000000000 +0000
+--- 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
@@ -77,8 +77,8 @@
UnixSockName = IROHA
diff -Naur Canna37p3.orig/canna/widedef.h Canna37p3/canna/widedef.h
---- Canna37p3.orig/canna/widedef.h 2003-12-27 17:15:20.000000000 +0000
-+++ Canna37p3/canna/widedef.h 2005-05-29 15:00:31.000000000 +0000
+--- 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
@@ -121,8 +121,8 @@
#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 2003-09-27 06:18:39.000000000
+0000
-+++ Canna37p3/dic/ideo/words/chimei.t 2005-05-29 14:59:54.000000000 +0000
+--- 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 ¾ëÅì¶è
@@ -133,8 +133,8 @@
¤¸¤ç¤Û¡¼¤ë #CN ¥¸¥ç¥Û¡¼¥ë
¤¸¤ó¤°¤¦¤Þ¤¨ #CN ¿ÀµÜÁ°
diff -Naur Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
---- Canna37p3.orig/dic/phono/Imakefile 2002-10-19 08:27:40.000000000 +0000
-+++ Canna37p3/dic/phono/Imakefile 2005-05-29 14:59:54.000000000 +0000
+--- 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
@@ -148,14 +148,41 @@
DICDIR = $(cannaLibDir)/dic
SAMPLEDIR = $(cannaLibDir)/sample
diff -Naur Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
---- Canna37p3.orig/hosts.canna 1970-01-01 00:00:00.000000000 +0000
-+++ Canna37p3/hosts.canna 2005-05-29 14:59:54.000000000 +0000
+--- 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 2003-09-21 12:56:29.000000000 +0000
-+++ Canna37p3/server/util.c 2005-06-04 15:28:41.000000000 +0000
+--- 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$";
#endif
@@ -179,8 +206,8 @@
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 1970-01-01 00:00:00.000000000
+0000
-+++ Canna37p3/update-canna-dics-dir 2005-05-29 14:59:54.000000000 +0000
+--- 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
+
Index: canna.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/canna.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- canna.info 4 Jun 2005 15:35:09 -0000 1.8
+++ canna.info 23 Mar 2006 18:33:28 -0000 1.9
@@ -1,6 +1,6 @@
Package: canna
Version: 3.7p3
-Revision: 4
+Revision: 5
Replaces: %N (<= 3.5b2-4)
BuildDepends: system-xfree86-dev | x11-dev, passwd
Depends: %N-shlibs (= %v-%r), %N-utils (= %v-%r), %N-server (= %v-%r)
@@ -32,6 +32,7 @@
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: <<
@@ -47,6 +48,7 @@
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
<<
@@ -54,6 +56,7 @@
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
@@ -93,16 +96,20 @@
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
+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 <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
