Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/utils
In directory usw-pr-cvs1:/tmp/cvs-serv9004
Added Files:
canna-3.6-1.info canna-3.6-1.patch
Log Message:
New upstream version.
--- NEW FILE: canna-3.6-1.info ---
Package: canna
Version: 3.6
Revision: 1
GCC: 3.1
Depends: %N-shlibs (= %v-%r)
Source: http://downloads.sourceforge.jp/%n/1425/Canna36.tar.gz
Source-MD5: 6c6698f1b6202d92d62b85aed599c519
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
ConfFiles: %p/etc/canna/default.canna
CompileScript: <<
xmkmf
make Makefile
make canna SHLIBLDFLAGS="-dynamiclib -undefined suppress -flat_namespace"
<<
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
( cd %i/var/lib/canna && ln -s ../../../etc/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.0.dylib %n (>= %v-%r)
%p/lib/libcanna16.1.0.dylib %n (>= %v-%r)
%p/lib/libRKC.1.0.dylib %n (>= %v-%r)
%p/lib/libRKC16.1.0.dylib %n (>= %v-%r)
<<
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: <<
daemonic install canna
daemonic enable canna
update-canna-dics-dir
cannakill >/dev/null 2>&1 || true
cannaserver -u canna >/dev/null 2>&1 || true
<<
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: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://canna.sourceforge.jp/
--- NEW FILE: canna-3.6-1.patch ---
diff -Naur Canna36.old/Canna.conf Canna36.new/Canna.conf
--- Canna36.old/Canna.conf Thu Oct 24 23:37:25 2002
+++ Canna36.new/Canna.conf Sat Oct 26 02:57:14 2002
@@ -132,29 +132,29 @@
/* root�ˤʤ餺�˥��ȡ��뤹����Ϥ����������Ʋ����� */
/* #define InstallAsUser */
-cannaPrefix = /usr/local/canna
+cannaPrefix = @PREFIX@
cannaExecPrefix = $(cannaPrefix)
cannaBinDir = $(cannaExecPrefix)/bin
-cannaSrvDir = $(cannaExecPrefix)/bin
-cannaLibDir = $(cannaPrefix)/lib
-cannaManDir = $(cannaPrefix)/man
+cannaSrvDir = $(cannaExecPrefix)/sbin
+cannaLibDir = $(cannaPrefix)/var/lib/canna
+cannaManDir = $(cannaPrefix)/share/man
cannaIncDir = $(cannaPrefix)/include/canna
#ifdef InstallAsUser
libCannaDir = $(cannaExecPrefix)/lib
ErrDir = $(cannaExecPrefix)/log
#else
-libCannaDir = /usr/lib
-ErrDir = /usr/spool/canna
+libCannaDir = $(cannaPrefix)/lib
+ErrDir = $(cannaPrefix)/var/log/canna
#endif
/* ����3�Ԥ��ѹ����ʤ��Ǥ������� */
wcharDefinition = -DCANNA_WCHAR
Wlib =
-JapaneseLocale = japanese
+JapaneseLocale = ja
-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = canna
+cannaGroup = canna
#ifdef InstallAsUser
cannaOwnerGroup =
@@ -164,7 +164,7 @@
pointerIntegerDef =
-cannaDsoRev = 1
+cannaDsoRev = 1.0
/* SunOS 4.x �Ȥ������� shared object �����Ѥ�����ˤ�
cannaDsoRev = 1.1
�Ȼ��ꤷ�Ƥ����������ޤ���FreeBSD �����Ѥ�����ϡ�
@@ -177,7 +177,7 @@
#elif defined(hpux)
sharedLibExtension = sl.$(cannaDsoRev)
#else
-sharedLibExtension = so.$(cannaDsoRev)
+sharedLibExtension = $(cannaDsoRev).dylib
#endif
/* iroha.t �ξ�����ꡣpubdic+ ������Ф��������ꤷ�ޤ��� */
@@ -188,16 +188,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 �Ǥϥ����Ȥ�Ϥ����ʤ��Ǥ������� */
@@ -231,7 +231,7 @@
/* #define UseInstalledLibCanna YES */
#define UseInstalledLibCanna NO
-DicDir = $(cannaLibDir)/dic
+DicDir = $(cannaPrefix)/var/lib/canna/dic
#ifdef NeXT
#define NO_X_ENV
diff -Naur Canna36.old/canna/protodefs.h Canna36.new/canna/protodefs.h
--- Canna36.old/canna/protodefs.h Sun Oct 20 17:20:33 2002
+++ Canna36.new/canna/protodefs.h Fri Oct 25 22:08:26 2002
@@ -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 Canna36.old/canna/widedef.h Canna36.new/canna/widedef.h
--- Canna36.old/canna/widedef.h Sat Oct 19 17:27:28 2002
+++ Canna36.new/canna/widedef.h Fri Oct 25 22:10:15 2002
@@ -35,7 +35,7 @@
#define WCHAR16
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
# include <machine/ansi.h>
#endif
@@ -61,7 +61,7 @@
#endif /* !nec_ews_svr2 */
#endif /* HAVE_WCHAR_OPERATION */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
# ifdef _BSD_WCHAR_T_
# undef _BSD_WCHAR_T_
# ifdef WCHAR16
diff -Naur Canna36.old/cmd/catdic/Imakefile Canna36.new/cmd/catdic/Imakefile
--- Canna36.old/cmd/catdic/Imakefile Sun Oct 20 13:10:25 2002
+++ Canna36.new/cmd/catdic/Imakefile Fri Oct 25 22:55:07 2002
@@ -75,23 +75,23 @@
$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cannakill.exe
#else
install::
- $(RM) $(cannaBinDir)/cpdic
- $(RM) $(cannaBinDir)/lsdic
- $(RM) $(cannaBinDir)/mkdic
- $(RM) $(cannaBinDir)/mvdic
- $(RM) $(cannaBinDir)/rmdic
- $(RM) $(cannaBinDir)/syncdic
- $(RM) $(cannaBinDir)/chmoddic
- $(RM) $(cannaBinDir)/addwords
- $(RM) $(cannaBinDir)/delwords
- $(RM) $(cannaBinDir)/cannakill
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mvdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/rmdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
- $(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
+ $(RM) $(DESTDIR)$(cannaBinDir)/cpdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/lsdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/mkdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/mvdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/rmdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/syncdic
+ $(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
+ $(RM) $(DESTDIR)$(cannaBinDir)/addwords
+ $(RM) $(DESTDIR)$(cannaBinDir)/delwords
+ $(RM) $(DESTDIR)$(cannaBinDir)/cannakill
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic cpdic)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic lsdic)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic mkdic)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic mvdic)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic rmdic)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic syncdic)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic chmoddic)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic addwords)
+ (cd $(DESTDIR)$(cannaBinDir); $(LN) catdic delwords)
#endif
diff -Naur Canna36.old/dic/ideo/grammar/Imakefile
Canna36.new/dic/ideo/grammar/Imakefile
--- Canna36.old/dic/ideo/grammar/Imakefile Sat Oct 19 17:27:34 2002
+++ Canna36.new/dic/ideo/grammar/Imakefile Fri Oct 25 22:11:32 2002
@@ -85,6 +85,6 @@
InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
install::
- $(CHGRP) $(cannaGroup) $(CANNADICDIR)
- $(CHOWN) $(cannaOwner) $(CANNADICDIR)
- $(CHMOD) ug+w $(CANNADICDIR)
+ $(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
+ $(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
+ $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
diff -Naur Canna36.old/dic/ideo/words/Imakefile Canna36.new/dic/ideo/words/Imakefile
--- Canna36.old/dic/ideo/words/Imakefile Sun Oct 20 13:10:29 2002
+++ Canna36.new/dic/ideo/words/Imakefile Fri Oct 25 22:12:38 2002
@@ -69,13 +69,13 @@
#endif
install::
- $(CHGRP) $(cannaGroup) $(CANNADICDIR)
- $(CHOWN) $(cannaOwner) $(CANNADICDIR)
- $(CHMOD) ug+w $(CANNADICDIR)
- $(CHGRP) $(cannaGroup) $(DicDir)
- $(CHOWN) $(cannaOwner) $(DicDir)
- $(CHMOD) ug+w $(DicDir)
- $(CHMOD) -w $(CANNADICDIR)/dics.dir
+ $(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
+ $(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
+ $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
+ $(CHGRP) $(cannaGroup) $(DESTDIR)$(DicDir)
+ $(CHOWN) $(cannaOwner) $(DESTDIR)$(DicDir)
+ $(CHMOD) ug+w $(DESTDIR)$(DicDir)
+ $(CHMOD) -w $(DESTDIR)$(CANNADICDIR)/dics.dir
#ifndef USE_OBSOLETE_STYLE_FILENAME
InstallNamedNonExec(necgaiji.t,necgaiji.ctd,$(CANNADICDIR))
diff -Naur Canna36.old/lib/RKC/rkc.c Canna36.new/lib/RKC/rkc.c
--- Canna36.old/lib/RKC/rkc.c Sun Oct 20 23:29:59 2002
+++ Canna36.new/lib/RKC/rkc.c Fri Oct 25 22:13:22 2002
@@ -241,7 +241,7 @@
int RkwSetUserInfo pro((char *, char *, char *));
-RkUserInfo *uinfo;
+static RkUserInfo *uinfo;
int
RkwSetUserInfo(user, group, topdir)
diff -Naur Canna36.old/server/misc.c Canna36.new/server/misc.c
--- Canna36.old/server/misc.c Mon Oct 21 03:00:22 2002
+++ Canna36.new/server/misc.c Sat Oct 26 01:41:56 2002
@@ -291,15 +291,12 @@
exit( 1 ) ;
}
if ( parent ) {
- signal(SIGTERM, parQUIT);
- pause() ;
exit( 0 ) ;
/* wait( (int *)0 ) ; */
}
- return parentid;
-#else
- return 0;
#endif
+
+ return 0;
}
void
diff -Naur Canna36.old/update-canna-dics-dir Canna36.new/update-canna-dics-dir
--- Canna36.old/update-canna-dics-dir Thu Jan 1 09:00:00 1970
+++ Canna36.new/update-canna-dics-dir Sat Oct 26 00:47:01 2002
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin
+
+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
-------------------------------------------------------
This SF.net email is sponsored by: ApacheCon, November 18-21 in
Las Vegas (supported by COMDEX), the only Apache event to be
fully supported by the ASF. http://www.apachecon.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
