Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/utils
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19963/dists/10.4-transitional/stable/main/finkinfo/utils
Modified Files:
kinput2.macim.info kinput2.macim.patch
Added Files:
canna.info canna.patch cannadic.info kinput2.info
kinput2.patch
Log Message:
sync with unstable
--- NEW FILE: kinput2.patch ---
diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
--- kinput2-v3.1.orig/Kinput2.conf Thu Oct 3 09:35:26 2002
+++ kinput2-v3.1/Kinput2.conf Mon Mar 29 21:19:55 2004
@@ -18,7 +18,7 @@
/* #define UseWnn */ /* define if you are going to use Wnn (v4, v6 or v7) */
/* #define UseWnn6 */ /* define if you are going to use Wnn6 or above */
#define UseCanna /* define if you are going to use Canna */
-#define UseSj3 /* define if you are going to use Sj3 */
+/* #define UseSj3 */ /* define if you are going to use Sj3 */
/* #define UseAtok */ /* define if you are going to use Atok */
@@ -78,17 +78,17 @@
* If you have already installed Canna header files and libraries..
*/
XCOMM use installed headers/libraries
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
+CANNAINSTDIR = $(PREFIX)
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -L$(CANNAINSTDIR)/lib -lcanna16
/*
* If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
* but not installed yet..
*/
XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
XCOMM SJ3 configuration
diff -Naur kinput2-v3.1.orig/cmd/Kinput2.ad kinput2-v3.1/cmd/Kinput2.ad
--- kinput2-v3.1.orig/cmd/Kinput2.ad Thu Oct 3 09:35:26 2002
+++ kinput2-v3.1/cmd/Kinput2.ad Mon Mar 29 21:18:39 2004
@@ -96,7 +96,7 @@
! XimpProtocol
*XimpProtocol.ForceDefaultServer: true
! X Input Method Protocol
-*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP, japanese, japan, ja
+*IMProtocol.locales: ja_JP.UTF-8, ja_JP.eucJP, ja_JP.SJIS, ja_JP, japanese,
japan, ja
! common to XimpProtocol and IMProtocol
*defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
*ConversionStartKeys: \
diff -Naur kinput2-v3.1.orig/copyright kinput2-v3.1/copyright
--- kinput2-v3.1.orig/copyright Thu Jan 1 00:00:00 1970
+++ kinput2-v3.1/copyright Mon Mar 29 21:16:19 2004
@@ -0,0 +1,22 @@
+/*
+ * kinput2
+ */
+
+/*
+ * Copyright (C) 1991 by Software Research Associates, Inc.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Software Research Associates not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission. Software Research
+ * Associates makes no representations about the suitability of this software
+ * for any purpose. It is provided "as is" without express or implied
+ * warranty.
+ *
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ * [EMAIL PROTECTED]
+ */
+
diff -Naur kinput2-v3.1.orig/lib/Canna.c kinput2-v3.1/lib/Canna.c
--- kinput2-v3.1.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
+++ kinput2-v3.1/lib/Canna.c Mon Mar 29 21:20:35 2004
@@ -61,6 +61,10 @@
#include "CannaP.h"
#include "DebugPrint.h"
+/* Canna 3.7$B0J9_$O$3$N$h$&$KDj5A$9$k(B */
+#define CANNA_WCHAR16
+#define CANNA_NEW_WCHAR_AWARE
+/* Canna 3.6$B$^$G$N>l9g(B */
#define _WCHAR_T /* $B$3$NDj5A$O(B jrkanji.h $B$G(B wcKanjiStatus
$B$J$I$rDj5A$9$k$?$a(B */
#define wchar_t wchar
@@ -246,7 +250,7 @@
kanabuf[0] = '\0';
nbytes = XKanaLookup(event, kanabuf, 20, &ks, &compose_status);
- buf[0] = (wchar)kanabuf[0]; /* $B$-$?$J$$(B */
+ buf[0] = (wchar)(unsigned char)kanabuf[0]; /* $B$-$?$J$$(B */
if (ks == XK_space && (event->xkey.state & ShiftMask)) {
void convend();
@@ -271,7 +275,7 @@
/* $B$+$J4A;zJQ49$9$k(B */
len = wcKanjiString((int)obj, (int)buf[0],
- (wchar_t *)buf, 1024, &kanji_status);
+ (wchar *)buf, 1024, &kanji_status);
displayPreEdit(obj, len, buf, &kanji_status);
return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
@@ -642,7 +646,9 @@
CannaObject obj;
{
char **warn = 0;
+#ifndef CANNA_JR_BEEP_FUNC_DECLARED
extern (*jrBeepFunc)();
+#endif
if (nCannaContexts == 0) {
#ifdef KC_SETSERVERNAME
diff -Naur kinput2-v3.1.orig/xinitrc.kinput2.sh kinput2-v3.1/xinitrc.kinput2.sh
--- kinput2-v3.1.orig/xinitrc.kinput2.sh Thu Jan 1 00:00:00 1970
+++ kinput2-v3.1/xinitrc.kinput2.sh Sun Mar 12 09:49:59 2006
@@ -0,0 +1,11 @@
+# If you don't want to launch kinput2, put xinitrc_kinput2_enable=NO
+# in your .xinitrc
+: ${xinitrc_kinput2_enable=YES}
+
+case $xinitrc_kinput2_enable in
+ [Yy][Ee][Ss])
+ if test -x "$fink_prefix/bin/kinput2"; then
+ "$fink_prefix/bin/kinput2" -canna -xim &
+ fi
+ ;;
+esac
--- NEW FILE: kinput2.info ---
Package: kinput2
Version: 3.1
Revision: 6
BuildDepends: canna-dev, x11-dev
Depends: canna-shlibs (>= 3.7p1-1), app-defaults, x11-shlibs, xinitrc
Conflicts: user-ja (<< 3.0)
Source: ftp://ftp.sra.co.jp/pub/x11/%n/%n-v%v.tar.gz
Source-MD5: 2de20576f150248d1fdfe66d7cc4e510
Patch: %n.patch
CompileScript: xmkmf; make Makefiles; make depend PREFIX=%p; make PREFIX=%p
CDEBUGFLAGS=-O3
InstallScript: <<
make install install.man DESTDIR=%d PREFIX=%p BINDIR=%p/bin LIBDIR=%p/lib
CONFDIR=%p/etc MANSOURCEPATH=%p/share/man/man DOCDIR=%p/share/doc/%n
XAPPLOADDIR=%p/etc/app-defaults
rm -f %i/lib/app-defaults
mkdir -p -m 755 %i/etc/xinitrc.d
install -m 755 xinitrc.kinput2.sh %i/etc/xinitrc.d/50kinput2.sh
<<
DocFiles: NEWS README copyright
Description: Input server for easy input of Japanese text
DescDetail: <<
Kinput2 is an input server for X11 applications that want Japanese
text input.
A client that wants kana-kanji conversion service for Japanese text
sends a request to kinput2. Kinput2 receives the request, does
kana-kanji conversion, and sends the converted text back to the
client.
<<
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Homepage: ftp://ftp.sra.co.jp/pub/x11/kinput2/
Index: kinput2.macim.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/utils/kinput2.macim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kinput2.macim.patch 5 Dec 2005 01:26:29 -0000 1.1
+++ kinput2.macim.patch 25 Mar 2006 19:18:41 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur kinput2-v3.1-macim-20050528.orig/Kinput2.conf
kinput2-v3.1-macim-20050528/Kinput2.conf
---- kinput2-v3.1-macim-20050528.orig/Kinput2.conf Thu Jan 22 00:53:19 2004
-+++ kinput2-v3.1-macim-20050528/Kinput2.conf Sat Jun 4 16:28:42 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/Kinput2.conf
kinput2-v3.1-macim-20050629/Kinput2.conf
+--- kinput2-v3.1-macim-20050629.orig/Kinput2.conf Thu Jan 22 00:53:19 2004
++++ kinput2-v3.1-macim-20050629/Kinput2.conf Sat Jun 4 16:28:42 2005
@@ -79,17 +79,17 @@
* If you have already installed Canna header files and libraries..
*/
@@ -24,9 +24,9 @@
XCOMM SJ3 configuration
-diff -Naur kinput2-v3.1-macim-20050528.orig/cmd/Imakefile
kinput2-v3.1-macim-20050528/cmd/Imakefile
---- kinput2-v3.1-macim-20050528.orig/cmd/Imakefile Thu Jan 22 00:58:31 2004
-+++ kinput2-v3.1-macim-20050528/cmd/Imakefile Sat Jun 4 16:28:42 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Imakefile
kinput2-v3.1-macim-20050629/cmd/Imakefile
+--- kinput2-v3.1-macim-20050629.orig/cmd/Imakefile Thu Jan 22 00:58:31 2004
++++ kinput2-v3.1-macim-20050629/cmd/Imakefile Sat Jun 4 16:28:42 2005
@@ -49,5 +49,5 @@
SRCS = kinput2.c
OBJS = kinput2.o
@@ -35,9 +35,9 @@
-InstallAppDefaults(Kinput2)
+ComplexProgramTargetNoMan(kinput2.macim)
+InstallAppDefaultsLong(Kinput2,Kinput2_macim)
-diff -Naur kinput2-v3.1-macim-20050528.orig/cmd/Kinput2.ad
kinput2-v3.1-macim-20050528/cmd/Kinput2.ad
---- kinput2-v3.1-macim-20050528.orig/cmd/Kinput2.ad Fri May 6 04:35:47 2005
-+++ kinput2-v3.1-macim-20050528/cmd/Kinput2.ad Sat Jun 4 16:28:42 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad
kinput2-v3.1-macim-20050629/cmd/Kinput2.ad
+--- kinput2-v3.1-macim-20050629.orig/cmd/Kinput2.ad Fri May 6 04:35:47 2005
++++ kinput2-v3.1-macim-20050629/cmd/Kinput2.ad Sat Jun 4 16:28:42 2005
@@ -5,9 +5,10 @@
!!
!! things you shouldn't change
@@ -61,9 +61,9 @@
! common to XimpProtocol and IMProtocol
*defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
*ConversionStartKeys: \
-diff -Naur kinput2-v3.1-macim-20050528.orig/cmd/kinput2.c
kinput2-v3.1-macim-20050528/cmd/kinput2.c
---- kinput2-v3.1-macim-20050528.orig/cmd/kinput2.c Tue Mar 23 01:27:35 2004
-+++ kinput2-v3.1-macim-20050528/cmd/kinput2.c Sat Jun 4 16:28:42 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c
kinput2-v3.1-macim-20050629/cmd/kinput2.c
+--- kinput2-v3.1-macim-20050629.orig/cmd/kinput2.c Tue Mar 23 01:27:35 2004
++++ kinput2-v3.1-macim-20050629/cmd/kinput2.c Sat Jun 4 16:28:42 2005
@@ -96,9 +96,9 @@
static String fallback_resources[] = {
@@ -86,9 +86,9 @@
options, XtNumber(options),
&ac, av,
fallback_resources, (ArgList)NULL, 0);
-diff -Naur kinput2-v3.1-macim-20050528.orig/copyright
kinput2-v3.1-macim-20050528/copyright
---- kinput2-v3.1-macim-20050528.orig/copyright Thu Jan 1 00:00:00 1970
-+++ kinput2-v3.1-macim-20050528/copyright Tue May 3 02:14:22 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/copyright
kinput2-v3.1-macim-20050629/copyright
+--- kinput2-v3.1-macim-20050629.orig/copyright Thu Jan 1 00:00:00 1970
++++ kinput2-v3.1-macim-20050629/copyright Tue May 3 02:14:22 2005
@@ -0,0 +1,22 @@
+/*
+ * kinput2
@@ -112,9 +112,9 @@
+ * [EMAIL PROTECTED]
+ */
+
-diff -Naur kinput2-v3.1-macim-20050528.orig/lib/Canna.c
kinput2-v3.1-macim-20050528/lib/Canna.c
---- kinput2-v3.1-macim-20050528.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
-+++ kinput2-v3.1-macim-20050528/lib/Canna.c Tue May 3 02:14:22 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/Canna.c
kinput2-v3.1-macim-20050629/lib/Canna.c
+--- kinput2-v3.1-macim-20050629.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
++++ kinput2-v3.1-macim-20050629/lib/Canna.c Tue May 3 02:14:22 2005
@@ -61,6 +61,10 @@
#include "CannaP.h"
#include "DebugPrint.h"
@@ -154,9 +154,9 @@
if (nCannaContexts == 0) {
#ifdef KC_SETSERVERNAME
-diff -Naur kinput2-v3.1-macim-20050528.orig/lib/IMProto.c
kinput2-v3.1-macim-20050528/lib/IMProto.c
---- kinput2-v3.1-macim-20050528.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002
-+++ kinput2-v3.1-macim-20050528/lib/IMProto.c Tue May 3 02:14:22 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/IMProto.c
kinput2-v3.1-macim-20050629/lib/IMProto.c
+--- kinput2-v3.1-macim-20050629.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002
++++ kinput2-v3.1-macim-20050629/lib/IMProto.c Tue May 3 02:14:22 2005
@@ -44,7 +44,7 @@
#include "im.h"
@@ -166,9 +166,9 @@
#define UNIX_SOCKET_DIR "/tmp/.ki2-unix"
/*- resource table -*/
-diff -Naur kinput2-v3.1-macim-20050528.orig/lib/XimpProto.c
kinput2-v3.1-macim-20050528/lib/XimpProto.c
---- kinput2-v3.1-macim-20050528.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002
-+++ kinput2-v3.1-macim-20050528/lib/XimpProto.c Tue May 3 02:14:22 2005
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c
kinput2-v3.1-macim-20050629/lib/XimpProto.c
+--- kinput2-v3.1-macim-20050629.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002
++++ kinput2-v3.1-macim-20050629/lib/XimpProto.c Tue May 3 02:14:22 2005
@@ -45,7 +45,7 @@
@@ -178,3 +178,40 @@
#define SERVER_VERSION "1"
#define VENDOR_NAME "SRA"
+diff -Naur kinput2-v3.1-macim-20050629.orig/lib/mactext.c
kinput2-v3.1-macim-20050629/lib/mactext.c
+--- kinput2-v3.1-macim-20050629.orig/lib/mactext.c Wed May 18 18:00:25 2005
++++ kinput2-v3.1-macim-20050629/lib/mactext.c Sun Mar 12 15:58:51 2006
+@@ -410,10 +410,18 @@
+ hiliteRange->fNumOfRanges = 2;
+ hiliteRange->fRange[0].fStart = 0;
+ hiliteRange->fRange[0].fEnd = length;
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ hiliteRange->fRange[0].fHiliteStyle =
kTSMHiliteConvertedText;
++#else
++ hiliteRange->fRange[0].fHiliteStyle = kConvertedText;
++#endif
+ hiliteRange->fRange[1].fStart = 0;
+ hiliteRange->fRange[1].fEnd = length;
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+ hiliteRange->fRange[1].fHiliteStyle =
kTSMHiliteCaretPosition;
++#else
++ hiliteRange->fRange[1].fHiliteStyle = kCaretPosition;
++#endif
+ } else
+ status = memFullErr;
+ }
+diff -Naur kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh
kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh
+--- kinput2-v3.1-macim-20050629.orig/xinitrc.kinput2.macim.sh Thu Jan 1
00:00:00 1970
++++ kinput2-v3.1-macim-20050629/xinitrc.kinput2.macim.sh Sun Mar 12
15:13:13 2006
+@@ -0,0 +1,11 @@
++# If you don't want to launch kinput2.macim, put
xinitrc_kinput2_macim_enable=NO
++# in your .xinitrc
++: ${xinitrc_kinput2_macim_enable=YES}
++
++case $xinitrc_kinput2_macim_enable in
++ [Yy][Ee][Ss])
++ if test -x "$fink_prefix/bin/kinput2.macim"; then
++ "$fink_prefix/bin/kinput2.macim" -macim -xim &
++ fi
++ ;;
++esac
Index: kinput2.macim.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/utils/kinput2.macim.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kinput2.macim.info 19 Feb 2006 18:10:56 -0000 1.2
+++ kinput2.macim.info 25 Mar 2006 19:18:41 -0000 1.3
@@ -1,8 +1,8 @@
Package: kinput2.macim
Version: 3.1+20050629
-Revision: 1
-BuildDepends: system-xfree86-dev | x11-dev
-Depends: app-defaults, system-xfree86-shlibs | x11-shlibs, macosx (>= 10.4)
+Revision: 3
+BuildDepends: x11-dev
+Depends: app-defaults, x11-shlibs, macosx (>= 10.3), xinitrc
Source: ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.1.tar.gz
Source-MD5: 2de20576f150248d1fdfe66d7cc4e510
Source2:
http://homepage1.nifty.com/daemon/MachTen/sonoda/kinput2.fix4.macim.0.2.patch.gz
@@ -22,10 +22,13 @@
make Makefiles
make depend PREFIX=%p
make PREFIX=%p CDEBUGFLAGS=-O3
+ test -x cmd/kinput2.macim || { echo "Build failed!" >&2; exit 2; }
<<
InstallScript: <<
make install install.man DESTDIR=%d PREFIX=%p BINDIR=%p/bin LIBDIR=%p/lib
CONFDIR=%p/etc MANSOURCEPATH=%p/share/man/man DOCDIR=%p/share/doc/%n
XAPPLOADDIR=%p/etc/app-defaults
rm -f %i/lib/app-defaults
+ mkdir -p -m 755 %i/etc/xinitrc.d
+ install -m 755 xinitrc.kinput2.macim.sh %i/etc/xinitrc.d/50kinput2.macim.sh
<<
DocFiles: NEWS README ../Kinput2-MacIM.README copyright
Description: Input server for easy input of Japanese text, using Kotoeri
@@ -38,9 +41,13 @@
kana-kanji conversion, and sends the converted text back to the
client.
<<
+DescPort: <<
+Upstream author says kinput2.macim > 20040417 is only for >= 10.4, but
+also runs on 10.3 with a trivial patch.
+<<
DescUsage: <<
-Launch kinput2.macim, and set environment value XMODIFIERS to
-"@im=kinput2.macim".
+Set environment value XMODIFIERS to "@im=kinput2.macim".
+kinput2.macim itself is automatically launched by Fink xinitrc mechanism.
<<
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
--- NEW FILE: canna.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 <machine/ansi.h>
#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 <stddef.h>
# define _WCHAR_T
# endif
@@ -59,6 +55,14 @@
# endif
# include <stddef.h>
# 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
+
[EMAIL PROTECTED]@/var/lib/canna/dic/canna/dics.dir
[EMAIL PROTECTED]@/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
--- NEW FILE: canna.info ---
Package: canna
Version: 3.7p3
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)
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: <<
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: <<
<service>
<description>Canna Server</description>
<message>Canna server</message>
<daemon name="canna">
<executable>%p/etc/canna/rc.canna</executable>
<parameters>start</parameters>
</daemon>
</service>
<<
<<
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 <[EMAIL PROTECTED]>
Homepage: http://canna.sourceforge.jp/
--- NEW FILE: cannadic.info ---
Package: cannadic
Version: 0.95c
Revision: 2
BuildDepends: canna-utils (>= 3.7p1-3)
Depends: canna-server (>= 3.7p1-3)
Conflicts: canna (<< 3.7p1-3)
Source: http://cannadic.oucrc.org/%n-%v.tar.gz
Source-MD5: 2a7fc1be5a50e0ca5dd6e5721be4371a
CompileScript: make maindic
InstallScript: <<
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
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: <<
%p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
update-canna-dics-dir
%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
update-canna-dics-dir 2>&1 || true
%p/etc/canna/rc.canna start >/dev/null 2>&1 || true
fi
<<
Description: Japanese kana-kanji conversion dictionary for canna
DescDetail: <<
'cannadic' is Japanese kana-kanji conversion dictionary for Canna. This
dictionary has been compiled as a supplement/replacement to the dictionaries
distributed together with original Canna. Currently main dictionary and suffix-
and prefix-dictionary together contain over 140000 words.
<<
DescUsage: <<
To use cannadic, you should add the entry of cannadic to your ~/.canna
file.
example of .canna file:
(use-dictionary
"gcanna" ; add cannadic entry
"gcannaf" : add cannadic entry
;;"iroha" ; comment out iroha (conflicts with cannadic)
"fuzokugo"
"hojomwd"
"hojoswd"
:bushu "bushu"
:user "user"
)
Additionally, you should create personal learning file of dictionary.
$ mkdic -fq gcanna
If you are asked to overwrite existing one or not, you should answer yes.
<<
License: GPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://cannadic.oucrc.org/
-------------------------------------------------------
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
