Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9177/10.3/stable/main/finkinfo/utils
Added Files:
canna.info canna.patch cannadic.info kinput2.info
kinput2.macim.info kinput2.macim.patch kinput2.patch
Log Message:
Japanese input methods: moved from the unstable tree.
--- NEW FILE: kinput2.patch ---
diff -Naur kinput2-v3.1.old/Kinput2.conf kinput2-v3.1.new/Kinput2.conf
--- kinput2-v3.1.old/Kinput2.conf Thu Oct 3 18:35:26 2002
+++ kinput2-v3.1.new/Kinput2.conf Thu Jan 23 00:27:56 2003
@@ -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 = $(PREFIX)/include
+CANNALIB = -L$(PREFIX)/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
@@ -117,8 +117,8 @@
* Use compiled library in the source tree..
*/
XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3
+XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
XCOMM Atok configuration
diff -Naur kinput2-v3.1.old/cmd/Kinput2.ad kinput2-v3.1.new/cmd/Kinput2.ad
--- kinput2-v3.1.old/cmd/Kinput2.ad Thu Oct 3 18:35:26 2002
+++ kinput2-v3.1.new/cmd/Kinput2.ad Thu Jan 23 00:27:02 2003
@@ -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.old/copyright kinput2-v3.1.new/copyright
--- kinput2-v3.1.old/copyright Thu Jan 1 09:00:00 1970
+++ kinput2-v3.1.new/copyright Thu Jan 23 00:27:02 2003
@@ -0,0 +1,21 @@
+/*
+ * 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]
+ */
--- NEW FILE: kinput2.info ---
Package: kinput2
Version: 3.1
Revision: 1
BuildDepends: libxml2, gdbm, gmp, canna-dev, expat, tcltk-dev
Depends: canna (>=3.5b2-4), app-defaults
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
<<
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]>
Homepage: ftp://ftp.sra.co.jp/pub/x11/kinput2/
--- NEW FILE: cannadic.info ---
Package: cannadic
Version: 0.94f
Revision: 1
Depends: canna (>= 3.6-1)
Source: http://cannadic.oucrc.org/%n-%v.tar.gz
Source-MD5: cc43614581554bfeec3bff904d3f5ba8
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.t
%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.t(.swd) -gcannaf---" >>/%i/var/lib/canna/dics.d/01cannadic
<<
DocFiles: COPYING README
PostInstScript: <<
cannakill >/dev/null 2>&1 || true
update-canna-dics-dir
cannaserver -u canna >/dev/null 2>&1 || true
<<
PreRmScript: <<
if [ "$1" != upgrade ]; then
cannakill >/dev/null 2>&1 || true
update-canna-dics-dir 2>&1 || true
cannaserver -u canna >/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 Canna3.5b2. 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/
--- NEW FILE: kinput2.macim.patch ---
diff -Nru kinput2-v3.1-macim-20040328.orig/Kinput2.conf
kinput2-v3.1-macim-20040328/Kinput2.conf
--- kinput2-v3.1-macim-20040328.orig/Kinput2.conf Tue Mar 30 04:28:31 2004
+++ kinput2-v3.1-macim-20040328/Kinput2.conf Tue Mar 30 07:14:38 2004
@@ -79,17 +79,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 -Nru kinput2-v3.1-macim-20040328.orig/cmd/Imakefile
kinput2-v3.1-macim-20040328/cmd/Imakefile
--- kinput2-v3.1-macim-20040328.orig/cmd/Imakefile Tue Mar 30 06:30:49 2004
+++ kinput2-v3.1-macim-20040328/cmd/Imakefile Tue Mar 30 06:56:20 2004
@@ -49,5 +49,5 @@
SRCS = kinput2.c
OBJS = kinput2.o
-ComplexProgramTarget(kinput2)
-InstallAppDefaults(Kinput2)
+ComplexProgramTargetNoMan(kinput2.macim)
+InstallAppDefaultsLong(Kinput2,Kinput2_macim)
diff -Nru kinput2-v3.1-macim-20040328.orig/cmd/Kinput2.ad
kinput2-v3.1-macim-20040328/cmd/Kinput2.ad
--- kinput2-v3.1-macim-20040328.orig/cmd/Kinput2.ad Tue Mar 30 04:28:31 2004
+++ kinput2-v3.1-macim-20040328/cmd/Kinput2.ad Tue Mar 30 06:57:58 2004
@@ -5,9 +5,10 @@
!!
!! things you shouldn't change
!!
-Kinput2.mappedWhenManaged: false
-Kinput2.width: 1
-Kinput2.height: 1
+Kinput2_macim.conversionEngine: macim
+Kinput2_macim.mappedWhenManaged: false
+Kinput2_macim.width: 1
+Kinput2_macim.height: 1
*converter.accelerators: <Key>: to-inputobj()
! AIX seems to need the following superfluous definition.
*ki2AppDefsLoaded: true
@@ -96,7 +97,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 -Nru kinput2-v3.1-macim-20040328.orig/cmd/kinput2.c
kinput2-v3.1-macim-20040328/cmd/kinput2.c
--- kinput2-v3.1-macim-20040328.orig/cmd/kinput2.c Tue Mar 30 04:28:31 2004
+++ kinput2-v3.1-macim-20040328/cmd/kinput2.c Tue Mar 30 06:56:20 2004
@@ -96,9 +96,9 @@
static String fallback_resources[] = {
"*ki2AppDefsLoaded: false",
- "Kinput2.mappedWhenManaged: false",
- "Kinput2.width: 1",
- "Kinput2.height: 1",
+ "Kinput2_macim.mappedWhenManaged: false",
+ "Kinput2_macim.width: 1",
+ "Kinput2_macim.height: 1",
NULL,
};
@@ -200,7 +200,7 @@
WidgetClass inputobjclass, displayobjclass;
Widget inputobj;
- toplevel = XtAppInitialize(&apc, "Kinput2",
+ toplevel = XtAppInitialize(&apc, "Kinput2_macim",
options, XtNumber(options),
&ac, av,
fallback_resources, (ArgList)NULL, 0);
diff -Nru kinput2-v3.1-macim-20040328.orig/copyright
kinput2-v3.1-macim-20040328/copyright
--- kinput2-v3.1-macim-20040328.orig/copyright Thu Jan 1 09:00:00 1970
+++ kinput2-v3.1-macim-20040328/copyright Tue Mar 30 06:57:58 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 -Nru kinput2-v3.1-macim-20040328.orig/lib/Canna.c
kinput2-v3.1-macim-20040328/lib/Canna.c
--- kinput2-v3.1-macim-20040328.orig/lib/Canna.c Thu Oct 3 18:35:27 2002
+++ kinput2-v3.1-macim-20040328/lib/Canna.c Tue Mar 30 06:59:18 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 -Nru kinput2-v3.1-macim-20040328.orig/lib/IMProto.c
kinput2-v3.1-macim-20040328/lib/IMProto.c
--- kinput2-v3.1-macim-20040328.orig/lib/IMProto.c Thu Oct 3 18:35:28 2002
+++ kinput2-v3.1-macim-20040328/lib/IMProto.c Tue Mar 30 06:56:20 2004
@@ -44,7 +44,7 @@
#include "im.h"
-#define SERVER_NAME "kinput2"
+#define SERVER_NAME "kinput2.macim"
#define UNIX_SOCKET_DIR "/tmp/.ki2-unix"
/*- resource table -*/
diff -Nru kinput2-v3.1-macim-20040328.orig/lib/XimpProto.c
kinput2-v3.1-macim-20040328/lib/XimpProto.c
--- kinput2-v3.1-macim-20040328.orig/lib/XimpProto.c Thu Oct 3 18:35:28 2002
+++ kinput2-v3.1-macim-20040328/lib/XimpProto.c Tue Mar 30 06:56:20 2004
@@ -45,7 +45,7 @@
#define PROTOCOL_VERSION_STR "XIMP.3.5"
-#define SERVER_NAME "kinput2"
+#define SERVER_NAME "kinput2.macim"
#define SERVER_VERSION "1"
#define VENDOR_NAME "SRA"
--- NEW FILE: kinput2.macim.info ---
Package: kinput2.macim
Version: 3.1+20040417
Revision: 1
BuildDepends: system-xfree86-dev | x11-dev
Depends: app-defaults, system-xfree86-shlibs | x11-shlibs, macosx
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
Source2-MD5: 8533185fe2957f7106d02803f28bc31b
Source3: http://homepage1.nifty.com/daemon/MachTen/sonoda/Kinput2-MacIM.README.gz
Source3-MD5: f99be328fc4b5145fb48bfe53cf25c4d
Source4:
http://www.sol.dti.ne.jp/~kikuyan/macosx/patches/kinput2-v3.1-macim-20040417.patch.gz
Source4-MD5: be9b20df81c980b08f3d274153753d09
PatchScript: <<
gzip -cd ../kinput2.fix4.macim.0.2.patch.gz | sed -n -e '143,549p' -e '581,$p' |
patch -p1
gzip -cd ../kinput2-v3.1-macim-20040417.patch.gz | patch -p0
patch -p1 -i %a/%n.patch
gzip -d ../Kinput2-MacIM.README.gz
<<
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
<<
DocFiles: NEWS README ../Kinput2-MacIM.README copyright
Description: Input server for easy input of Japanese text, using Kotoeri
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.
<<
DescUsage: <<
Launch kinput2.macim, and set environment value XMODIFIERS to
"@im=kinput2.macim".
<<
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://www.sol.dti.ne.jp/~kikuyan/macosx/x11kotoeri.html
--- NEW FILE: canna.patch ---
diff -Naur Canna36p4.old/Canna.conf Canna36p4.new/Canna.conf
--- Canna36p4.old/Canna.conf Mon Sep 22 19:27:12 2003
+++ Canna36p4.new/Canna.conf Wed Dec 3 04:35:21 2003
@@ -156,27 +156,24 @@
# define DefCannaLibDir $(cannaPrefix)/share/canna
#endif
-cannaPrefix = DefCannaPrefix
+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
+cannaSrvDir = $(cannaExecPrefix)/sbin
+cannaLibDir = $(cannaPrefix)/var/lib/canna
+cannaManDir = $(cannaPrefix)/share/man
cannaIncDir = $(cannaPrefix)/include/canna
-libCannaDir = DefLibCannaDir
-ErrDir = DefErrDir
+libCannaDir = $(cannaPrefix)/lib
+ErrDir = $(cannaPrefix)/var/log/canna
/* ����3�Ԥ��ѹ����ʤ��Ǥ������� */
wcharDefinition = -DCANNA_WCHAR
Wlib =
JapaneseLocale = japanese
-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = canna
+cannaGroup = canna
#ifdef InstallAsUser
cannaOwnerGroup =
@@ -197,7 +194,7 @@
/* ���ΤȤ���__APPLE__��Imake.cf��undef����� */
sharedLibExtension = $(cannaDsoRev).dylib
#else
-sharedLibExtension = so.$(cannaDsoRev)
+sharedLibExtension = $(cannaDsoRev).dylib
#endif
/* iroha.t �ξ�����ꡣpubdic+ ������Ф��������ꤷ�ޤ��� */
@@ -208,16 +205,16 @@
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 */
/* locale �ǥ��쥯�ȥ����äƤ�����ϰʲ��Ҥ��� */
-/* #define LOCALE_DIR /usr/lib/locale */
+#define LOCALE_DIR /usr/share/locale
/* �����å���ǽ��Ȥ��ΤǤ���Х����Ȥ�Ϥ��� */
/* ���� Canna version 3.5 �Ǥϥ����Ȥ�Ϥ����ʤ��Ǥ������� */
@@ -251,7 +248,7 @@
/* #define UseInstalledLibCanna YES */
#define UseInstalledLibCanna NO
-DicDir = $(cannaLibDir)/dic
+DicDir = $(cannaPrefix)/var/lib/canna/dic
#ifdef NeXT
#define NO_X_ENV
diff -Naur Canna36p4.old/canna/protodefs.h Canna36p4.new/canna/protodefs.h
--- Canna36p4.old/canna/protodefs.h Sun Oct 20 17:20:33 2002
+++ Canna36p4.new/canna/protodefs.h Wed Dec 3 04:34:20 2003
@@ -78,7 +78,7 @@
#define I16toI32(x) (x)
#define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x))
-#if defined(__bsdi__) || defined(__FreeBSD__)
+#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__)
#include <machine/endian.h>
#endif
diff -Naur Canna36p4.old/canna/widedef.h Canna36p4.new/canna/widedef.h
--- Canna36p4.old/canna/widedef.h Fri Sep 12 23:32:52 2003
+++ Canna36p4.new/canna/widedef.h Wed Dec 3 04:38:29 2003
@@ -67,7 +67,7 @@
#endif /* HAVE_WCHAR_OPERATION */
#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
@@ -85,6 +85,17 @@
# endif
# include <stddef.h>
# define _WCHAR_T
+#elif defined(__APPLE__)
+# ifdef __WCHAR_TYPE__
+# undef __WCHAR_TYPE__
+# endif
+# ifdef WCHAR16
+# define __WCHAR_TYPE__ unsigned short
+# else
+# define __WCHAR_TYPE__ unsigned long
+# endif
+# include <stddef.h>
+# define _WCHAR_T
#else
#if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
&& !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) && !defined(_WCHAR_T_DEFINED)
@@ -92,7 +103,7 @@
typedef unsigned short wchar_t;
# else
/* replace this with #include or typedef appropriate for your system */
-typedef unsigned long wchar_t;
+# include <wchar.h>
# endif
# define WCHAR_T
# define _WCHAR_T
diff -Naur Canna36p4.old/update-canna-dics-dir Canna36p4.new/update-canna-dics-dir
--- Canna36p4.old/update-canna-dics-dir Thu Jan 1 09:00:00 1970
+++ Canna36p4.new/update-canna-dics-dir Wed Dec 3 04:34:26 2003
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin
+
[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.6p4
Revision: 1
GCC: 3.3
BuildDepends: x11-dev
Depends: %N-shlibs (= %v-%r)
Source: http://osdn.dl.sourceforge.jp/%n/6059/Canna36p4.tar.gz
Source-MD5: 4798ca358e9ecdb37dbb1f5d986832e1
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
ConfFiles: %p/etc/canna/default.canna
CompileScript: xmkmf; make Makefile; make canna
InstallScript: <<
make install install.man DESTDIR=%d
install -d -m 755 %i/etc/canna
mv %i/var/lib/canna/default.canna %i/etc/canna/default.canna
ln -s %p/etc/canna/default.canna %i/var/lib/canna/default.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
install -d -m 755 %i/sbin
install -c -m 755 update-canna-dics-dir %i/sbin/
<<
SplitOff: <<
Package: %N-shlibs
Depends: x11, daemonic
Replaces: %N (<= 3.5b2-4)
Files: lib/libcanna.*.dylib lib/libcanna16.*.dylib lib/libRKC.*.dylib
lib/libRKC16.*.dylib
Shlibs: <<
%p/lib/libcanna.1.dylib 1.0.0 %n (>= 3.6-1)
%p/lib/libcanna16.1.dylib 1.0.0 %n (>= 3.6-1)
%p/lib/libRKC.1.dylib 1.0.0 %n (>= 3.6-1)
%p/lib/libRKC16.1.dylib 1.0.0 %n (>= 3.6-1)
<<
DocFiles: CHANGES* README* WHATIS*
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 3.5b2-4)
Files: include lib/*.a lib/libcanna.dylib lib/libcanna16.dylib lib/libRKC.dylib
lib/libRKC16.dylib share/man/man3
DocFiles: CHANGES* README* WHATIS*
<<
DocFiles: CHANGES* README* WHATIS*
DaemonicFile: <<
<service>
<description>Canna Server</description>
<message>Canna server</message>
<daemon name="canna">
<executable background="yes">%p/sbin/cannaserver</executable>
<parameters>-u canna</parameters>
<pidfile>%p/var/run/%n.pid</pidfile>
</daemon>
</service>
<<
PostInstScript: <<
if [ configure = "$1" ]; then
daemonic install canna
daemonic enable canna
update-canna-dics-dir
cannakill >/dev/null 2>&1 || true
cannaserver -u canna >/dev/null 2>&1 || true
fi
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
cannakill >/dev/null 2>&1 || true
daemonic remove canna
fi
<<
Description: Japanese input system
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.
<<
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://canna.sourceforge.jp/
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
