Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25178/main/finkinfo/utils
Modified Files:
canna.info canna.patch cannadic.info kinput2.info
kinput2.patch
Added Files:
cocot.info lha.info lha.patch
Log Message:
Moved from unstable.
Index: kinput2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils/kinput2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kinput2.patch 2 Nov 2004 01:19:45 -0000 1.1
+++ kinput2.patch 19 Apr 2005 14:34:25 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -Nru kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
+--- kinput2-v3.1.orig/Kinput2.conf Thu Oct 3 18:35:26 2002
++++ kinput2-v3.1/Kinput2.conf Tue Mar 30 06: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 */
@@ -18,8 +18,8 @@
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
+CANNAINSTDIR = $(PREFIX)
-+CANNASRC = $(PREFIX)/include
-+CANNALIB = -L$(PREFIX)/lib -lcanna16
++CANNASRC = $(CANNAINSTDIR)/include
++CANNALIB = -L$(CANNAINSTDIR)/lib -lcanna16
/*
* If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
@@ -33,20 +33,9 @@
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
+diff -Nru kinput2-v3.1.orig/cmd/Kinput2.ad kinput2-v3.1/cmd/Kinput2.ad
+--- kinput2-v3.1.orig/cmd/Kinput2.ad Thu Oct 3 18:35:26 2002
++++ kinput2-v3.1/cmd/Kinput2.ad Tue Mar 30 06:18:39 2004
@@ -96,7 +96,7 @@
! XimpProtocol
*XimpProtocol.ForceDefaultServer: true
@@ -56,10 +45,10 @@
! 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 @@
+diff -Nru kinput2-v3.1.orig/copyright kinput2-v3.1/copyright
+--- kinput2-v3.1.orig/copyright Thu Jan 1 09:00:00 1970
++++ kinput2-v3.1/copyright Tue Mar 30 06:16:19 2004
+@@ -0,0 +1,22 @@
+/*
+ * kinput2
+ */
@@ -81,3 +70,46 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ * [EMAIL PROTECTED]
+ */
++
+diff -Nru kinput2-v3.1.orig/lib/Canna.c kinput2-v3.1/lib/Canna.c
+--- kinput2-v3.1.orig/lib/Canna.c Thu Oct 3 18:35:27 2002
++++ kinput2-v3.1/lib/Canna.c Tue Mar 30 06: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
Index: kinput2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils/kinput2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kinput2.info 2 Nov 2004 01:19:45 -0000 1.1
+++ kinput2.info 19 Apr 2005 14:34:25 -0000 1.2
@@ -1,8 +1,8 @@
Package: kinput2
Version: 3.1
-Revision: 1
-BuildDepends: libxml2, gdbm, gmp, canna-dev, expat, tcltk-dev
-Depends: canna (>=3.5b2-4), app-defaults
+Revision: 4
+BuildDepends: canna-dev, system-xfree86-dev | x11-dev
+Depends: canna-shlibs (>= 3.7p1-1), app-defaults, system-xfree86-shlibs |
x11-shlibs
Source: ftp://ftp.sra.co.jp/pub/x11/%n/%n-v%v.tar.gz
Source-MD5: 2de20576f150248d1fdfe66d7cc4e510
Patch: %n.patch
@@ -23,5 +23,8 @@
client.
<<
License: BSD
-Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
+Maintainer: None <[email protected]>
+DescPackaging: <<
+ Originally packaged by Masanori Sekino.
+<<
Homepage: ftp://ftp.sra.co.jp/pub/x11/kinput2/
--- NEW FILE: lha.info ---
Package: lha
Version: 1.14i
Revision: 2
Source:http://www2m.biglobe.ne.jp/~dolphin/%n/prog/%n-114i.tar.gz
Source-MD5: 5225884d557b91f04124693e2c5c9e94
Patch: %n.patch
CompileScript: make
InstallScript: <<
install -d -m 755 %i/bin %i/share/man/ja/man1
make BINDIR=%i/bin MANDIR=%i/share/man/ja install MANSECT=1
<<
DocFiles: *.txt *.euc *.eng LICENSE
Description: Utility for creating and opening lzh archives
License: Restrictive
Homepage: http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Index: canna.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils/canna.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- canna.patch 2 Nov 2004 01:19:45 -0000 1.1
+++ canna.patch 19 Apr 2005 14:34:25 -0000 1.2
@@ -1,34 +1,37 @@
-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
+diff -Nru Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
+--- Canna37p3.orig/Canna.conf Thu May 20 00:48:47 2004
++++ Canna37p3/Canna.conf Wed Mar 9 02:04:46 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
+ 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
+ libCannaDir = DefLibCannaDir
-ErrDir = DefErrDir
-+libCannaDir = $(cannaPrefix)/lib
+ErrDir = $(cannaPrefix)/var/log/canna
- /* ����3�Ԥ��ѹ����ʤ��Ǥ������� */
- wcharDefinition = -DCANNA_WCHAR
- Wlib =
- JapaneseLocale = japanese
+ /* ��С������Ȥθߴ�API��̵���ˤ������0��������Ƥ������� */
+ #define SupportOldWchar 1
+@@ -169,8 +173,8 @@
+ #define ModernElfLink NO /* experimental */
+
-cannaOwner = bin
-cannaGroup = bin
@@ -37,16 +40,7 @@
#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 @@
+@@ -199,13 +203,13 @@
CHGRP = :
CHMOD = :
#else
@@ -62,79 +56,67 @@
-#define JAPANESEMAN
+/* #define JAPANESEMAN */
- /* locale �ǥ��쥯�ȥ����äƤ�����ϰʲ��Ҥ��� */
--/* #define LOCALE_DIR /usr/lib/locale */
-+#define LOCALE_DIR /usr/share/locale
+ /* #define engineSwitch */
- /* �����å���ǽ��Ȥ��ΤǤ���Х����Ȥ�Ϥ��� */
- /* ���� Canna version 3.5 �Ǥϥ����Ȥ�Ϥ����ʤ��Ǥ������� */
-@@ -251,7 +248,7 @@
+@@ -237,7 +241,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>
+@@ -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 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 */
+diff -Nru Canna37p3.orig/dic/ideo/words/chimei.t
Canna37p3/dic/ideo/words/chimei.t
+--- Canna37p3.orig/dic/ideo/words/chimei.t Sat Sep 27 15:18:39 2003
++++ Canna37p3/dic/ideo/words/chimei.t Wed Mar 9 02:05:13 2005
+@@ -714,7 +714,7 @@
+ ���礦���� #CN ����
+ ���礦�Ȥ��� #CNS �����
+ ���礦�ʤ� #CNS �����
+-���礦�Ф� #CNS ������
++���礦�Ф� #CNS ������
+ ���礦�褦�� #CNS ���ۻ�
+ ����ۡ��� #CN ����ۡ���
+ �����ޤ� #CN ������
+diff -Nru Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
+--- Canna37p3.orig/dic/phono/Imakefile Sat Oct 19 17:27:40 2002
++++ Canna37p3/dic/phono/Imakefile Wed Mar 9 02:04:46 2005
+@@ -25,7 +25,11 @@
+ KPDIC = $(CMDDIR)/kpdic/kpdic
+ #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
-@@ -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 @@
++#ifdef HasGcc
++ ROMAJI_DIC_DEF = -DSHIFT -traditional
++#else
+ ROMAJI_DIC_DEF = -DSHIFT
++#endif
+
+ DICDIR = $(cannaLibDir)/dic
+ SAMPLEDIR = $(cannaLibDir)/sample
+diff -Nru Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
+--- Canna37p3.orig/hosts.canna Thu Jan 1 09:00:00 1970
++++ Canna37p3/hosts.canna Wed Mar 9 02:04:46 2005
+@@ -0,0 +1,2 @@
++unix
++localhost
+diff -Nru Canna37p3.orig/update-canna-dics-dir Canna37p3/update-canna-dics-dir
+--- Canna37p3.orig/update-canna-dics-dir Thu Jan 1 09:00:00 1970
++++ Canna37p3/update-canna-dics-dir Wed Mar 9 02:04:46 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
Index: canna.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils/canna.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- canna.info 11 Jan 2005 13:43:39 -0000 1.2
+++ canna.info 19 Apr 2005 14:34:25 -0000 1.3
@@ -1,75 +1,99 @@
Package: canna
-Version: 3.6p4
-Revision: 2
-GCC: 3.3
-BuildDepends: x11-dev
-Depends: %N-shlibs (= %v-%r), passwd
-Source: http://osdn.dl.sourceforge.jp/%n/6059/Canna36p4.tar.gz
-Source-MD5: 4798ca358e9ecdb37dbb1f5d986832e1
+Version: 3.7p3
+Revision: 1
+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
-ConfFiles: %p/etc/canna/default.canna
-CompileScript: xmkmf; make Makefile; make canna
+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/var/lib/canna/default.canna %i/etc/canna/default.canna
- ln -s %p/etc/canna/default.canna %i/var/lib/canna/default.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
-
- 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
+ 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.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)
+ %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: CHANGES* README* WHATIS*
+ DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
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: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
-DocFiles: CHANGES* README* WHATIS*
-DaemonicFile: <<
+SplitOff3: <<
+ Package: %N-server
+ Depends: %N-shlibs (= %v-%r), passwd, daemonic
+ Replaces: %N (<= 3.5b2-4)
+ 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 background="yes">%p/sbin/cannaserver</executable>
-<parameters>-u canna</parameters>
-<pidfile>%p/var/run/%n.pid</pidfile>
+<executable>%p/etc/canna/rc.canna</executable>
+<parameters>start</parameters>
</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
+SplitOff4: <<
+ Package: %N-utils
+ Depends: %N-shlibs (= %v-%r)
+ Conflicts: cannadic (<< 0.95a-1)
+ Replaces: %N (<= 3.5b2-4)
+ Files: bin share/man/man1
+ DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
<<
Description: Japanese input system
DescDetail: <<
@@ -78,6 +102,7 @@
communicates with a kana-to-kanji conversion server, which is a separate
process from the application program.
<<
+DocFiles: OCHANGES* CHANGES.jp README* WHATIS* RKCCONF.jp
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://canna.sourceforge.jp/
Index: cannadic.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils/cannadic.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cannadic.info 2 Nov 2004 01:19:45 -0000 1.1
+++ cannadic.info 19 Apr 2005 14:34:25 -0000 1.2
@@ -1,36 +1,38 @@
Package: cannadic
-Version: 0.94f
+Version: 0.95c
Revision: 1
-Depends: canna (>= 3.6-1)
+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: cc43614581554bfeec3bff904d3f5ba8
+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.t
%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.t(.swd) -gcannaf---" >>/%i/var/lib/canna/dics.d/01cannadic
+ echo "gcannaf.ctd(.swd) -gcannaf---" >>/%i/var/lib/canna/dics.d/01cannadic
<<
-DocFiles: COPYING README
+DocFiles: COPYING README.ja
PostInstScript: <<
- cannakill >/dev/null 2>&1 || true
+ %p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
update-canna-dics-dir
- cannaserver -u canna >/dev/null 2>&1 || true
+ %p/etc/canna/rc.canna start >/dev/null 2>&1 || true
<<
PreRmScript: <<
if [ "$1" != upgrade ]; then
- cannakill >/dev/null 2>&1 || true
+ %p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
update-canna-dics-dir 2>&1 || true
- cannaserver -u canna >/dev/null 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 Canna3.5b2. Currently main dictionary and suffix-
+distributed together with original Canna. Currently main dictionary and suffix-
and prefix-dictionary together contain over 140000 words.
<<
DescUsage: <<
--- NEW FILE: lha.patch ---
diff -Naur lha-114i/LICENSE lha-114i.fink/LICENSE
--- lha-114i/LICENSE Thu Jan 1 09:00:00 1970
+++ lha-114i.fink/LICENSE Sun Jun 27 21:19:26 2004
@@ -0,0 +1,27 @@
+This license explanation was derived from the copyright notice distributed
+with the Debian package maintained by Atsushi KAMOSHIDA <[EMAIL PROTECTED]>.
+
+Upstream Author: Tsugio Okamoto <[EMAIL PROTECTED]>
+
+Copyright:
+
+ Original License Statement (in Japanese EUC-JP):
+
+ �ʤ����ͥåȤǤ����դϼ�ͳ�Ǥ������ͥåȤ˥��������Ǥ��ʤ����ʻ��浪��ӡ�
+ CD-ROM �ʤɤˤ��ˤؤ����դϡ��������ˤ������ Inter-Net ������E-Mail
+ �� ���ꤤ���ޤ��� �ɤ������ˡ��Ǻܤ���Ȥ����ݤ�����з빽�Ǥ��Τǡ�
+ �ޤ�����������ʤ��ݤˤϡ����� E-Mail ��ɬ�����ꤤ���ޤ���
+
+ Translated License Statement (translated by GOTO Masanori <[EMAIL
PROTECTED]>):
+
+ It's free to distribute on the network, but if you distribute for
+ the people who cannot access the network (by magazine or CD-ROM),
+ please send E-Mail (Inter-Net address) to the author before the
+ distribution. That's well where this software is appeard.
+ If you cannot do, you must send me the E-Mail later.
+
+ Original Source Code License Statement:
+
+ /* Copyright (C) MCMLXXXIX Yooichi.Tagawa */
+ /* Modified Nobutaka Watazaki */
+ /* Thanks to H.Yoshizaki. (MS-DOS LHarc) */
\ No newline at end of file
diff -Naur lha-114i/Makefile lha-114i.fink/Makefile
--- lha-114i/Makefile Fri Dec 15 21:13:16 2000
+++ lha-114i.fink/Makefile Sun Jun 27 21:24:02 2004
@@ -20,7 +20,7 @@
#MACHINE = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
#MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE -DSYSV_SYSTEM_DIR
-MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME
+MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME
-DHAVE_NO_LCHOWN
#OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer
OPTIMIZE = -O2 -DSUPPORT_LH7 -DMKSTEMP
diff -Naur lha-114i/README lha-114i.fink/README
--- lha-114i/README Thu Jan 1 09:00:00 1970
+++ lha-114i.fink/README Sun Jun 27 21:28:51 2004
@@ -0,0 +1,22 @@
+LHarc for UNIX V 1.02 Copyright(C) 1989 Y.Tagawa
+LHx for MSDOS V C2.01 Copyright(C) 1990 H.Yoshizaki
+LHx(arc) for OSK V 2.01 Modified 1990 Momozou
+LHa for UNIX V 1.00 Copyright(C) 1992 Masaru Oki
+LHa for UNIX V 1.14 Modified 1995 Nobutaka Watazaki
+LHa for UNIX V 1.14i Modified 2000 Tsugio Okamoto
+usage: lha [-]{axelvudmcp[q[num]][vnfodizg012]}[w=<dir>] archive_file [file...]
+commands: options:
+ a Add(or replace) to archive q{num} quiet (num:quiet mode)
+ x,e EXtract from archive v verbose
+ l,v List / Verbose List n not execute
+ u Update newer files to archive f force (over write at extract)
+ d Delete from archive t FILES are TEXT file
+ m Move to archive (means 'ad') o[567] compression method (a/u)
+ c re-Construct new archive w=<dir> specify extract directory
(a/u/m/x/e)
+ p Print to STDOUT from archive d delete FILES after (a/u/c)
+ t Test file CRC in archive i ignore directory path (x/e)
+ z files not compress (a/u)
+ g Generic format (for compatibility)
+ or not convert case when extracting
+ 0/1/2 header level (a/u)
+ e TEXT code convert from/to EUC
--- NEW FILE: cocot.info ---
Package: cocot
Version: 20041220
Revision: 2
Depends: libiconv
BuildDepends: libiconv-dev
Source: http://iwa.ath.cx/software/cygwin/cocot-%v.tar.bz2
Source-MD5: 25f40806da5f822c92b7e2cfcf393bcd
Description: COde COnverter on Tty
ConfigureParams: --with-default-term-code=UTF-8 --with-default-proc-code=EUC-JP
DocFiles: README* NEWS UNICODE_MEMO AUTHORS COPYING
License: BSD
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://iwa.ath.cx/software/cygwin/cocot.html
-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
