From 82fb117ba8c861cd1e91cb7b0771c87b953f79ce Mon Sep 17 00:00:00 2001 From: Masafumi Max NAKANE Date: Mon, 11 Nov 2002 23:53:57 +0000 Subject: Upgrade to 3.6. --- japanese/Canna/Makefile | 32 ++++++------------- japanese/Canna/distinfo | 5 +-- japanese/Canna/files/canna.sh.in | 7 +++- japanese/Canna/files/patch-ac | 69 ++++++++++++++++++---------------------- japanese/Canna/files/patch-af | 22 ------------- japanese/Canna/files/patch-ak | 22 ------------- japanese/Canna/files/patch-bzero | 56 -------------------------------- japanese/Canna/pkg-descr | 7 ++-- japanese/Canna/pkg-message | 6 ++++ japanese/Canna/pkg-plist | 3 +- 10 files changed, 60 insertions(+), 169 deletions(-) delete mode 100644 japanese/Canna/files/patch-af delete mode 100644 japanese/Canna/files/patch-ak delete mode 100644 japanese/Canna/files/patch-bzero create mode 100644 japanese/Canna/pkg-message (limited to 'japanese/Canna') diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 15fc3bca1d0e..ceb61b8d7604 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -7,21 +7,11 @@ # PORTNAME= Canna -PORTVERSION= 3.5b2 -PORTREVISION= 4 +PORTVERSION= 3.6 CATEGORIES= japanese -MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \ - ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \ - ftp://ftp.sra.co.jp/pub/misc/canna/ \ - ftp://ftp.habi.or.jp/pub/Tools/Canna/Canna35/ \ - ftp://ftp.hans.or.jp/pub/Tools/Canna/Canna35/ +MASTER_SITES= http://downloads.sourceforge.jp/canna/1425/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -PATCH_SITES= http://www.jaist.ac.jp/~fujieda/canna/ -PATCHFILES= Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \ - Canna35b2-hack1.patch.gz -PATCH_DIST_STRIP= -p1 - MAINTAINER= max@FreeBSD.org USE_IMAKE= yes @@ -29,6 +19,7 @@ USE_X_PREFIX= no ALL_TARGET= canna INSTALLS_SHLIB= yes +MANLANG=ja "" MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \ dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \ @@ -46,23 +37,20 @@ XFREE86_HTML_MAN= no MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 \ uilib.3 jrKanjiControl.3 uilib.3 jrKanjiString.3 -STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/canna.sh - post-build: @${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \ s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \ - > ${WRKDIR}/canna.sh + > ${WRKDIR}/canna.sh.sample post-install: .for f in user user/user group - ${MKDIR} ${PREFIX}/lib/canna/dic/$f - ${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f - ${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f + @${MKDIR} ${PREFIX}/lib/canna/dic/$f + @${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f + @${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f .endfor - if [ ! -f ${STARTUP_SCRIPT} ]; then \ - ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ - ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ - fi + @${ECHO} "Installing a sample startup script as ${PREFIX}/etc/rc.d/canna.sh.sample." + @${INSTALL_SCRIPT} ${WRKDIR}/canna.sh.sample ${PREFIX}/etc/rc.d/canna.sh.sample @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${CAT} ${PKGMESSAGE} .include diff --git a/japanese/Canna/distinfo b/japanese/Canna/distinfo index f505d5a8f499..02c6cd02d1a8 100644 --- a/japanese/Canna/distinfo +++ b/japanese/Canna/distinfo @@ -1,4 +1 @@ -MD5 (Canna35b2.tar.gz) = 09ae4dd3a5d33168ba17470ad9242cf3 -MD5 (Canna35b2-unoff1.patch.gz) = 88de4ac6a46697e4f664f1a362ecd1d2 -MD5 (Canna35b2-unoff2.patch.gz) = 7253b322dd6224376e03a95bec8a1c8f -MD5 (Canna35b2-hack1.patch.gz) = a3969af8317798d1b586f7a68089ff4a +MD5 (Canna36.tar.gz) = 6c6698f1b6202d92d62b85aed599c519 diff --git a/japanese/Canna/files/canna.sh.in b/japanese/Canna/files/canna.sh.in index 950751f81cc2..6d2fdf5864e1 100644 --- a/japanese/Canna/files/canna.sh.in +++ b/japanese/Canna/files/canna.sh.in @@ -1,5 +1,10 @@ #!/bin/sh +OPTIONS= +# Uncomment the following if you want to use a TCP connection +# instead of a UNIX domain socket. +#OPTIONS="-inet" + if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then echo "$0: Cannot determine the PREFIX" >&2 exit 64 @@ -12,7 +17,7 @@ start) @RM@ -f /tmp/.iroha_unix/IROHA @TOUCH@ /var/log/CANNA0msgs @CHOWN@ bin:bin /var/log/CANNA0msgs - ${PREFIX}/sbin/cannaserver && echo -n ' canna' + ${PREFIX}/sbin/cannaserver ${OPTIONS} && echo -n ' canna' fi ;; stop) diff --git a/japanese/Canna/files/patch-ac b/japanese/Canna/files/patch-ac index 799c661ddeae..4f16834fa9b6 100644 --- a/japanese/Canna/files/patch-ac +++ b/japanese/Canna/files/patch-ac @@ -1,34 +1,36 @@ ---- Canna.conf.orig Thu Nov 28 19:27:01 1996 -+++ Canna.conf Tue Apr 2 05:36:35 2002 -@@ -128,14 +128,15 @@ - * $Id: Canna.conf,v 3.13 1996/11/28 10:27:01 kon Exp $ - */ +--- Canna.conf.orig Thu Oct 24 23:37:25 2002 ++++ Canna.conf Thu Nov 7 09:14:12 2002 +@@ -132,11 +132,12 @@ --cannaBinDir = /usr/local/canna/bin --cannaSrvDir = /usr/local/canna/bin --cannaLibDir = /usr/local/canna/lib --cannaManDir = /usr/local/canna/man --cannaIncDir = /usr/local/canna/include/canna --libCannaDir = /usr/lib + /* rootにならずにインストールする時はこれを定義して下さい */ + /* #define InstallAsUser */ +-cannaPrefix = /usr/local/canna +PREFIX?= /usr/local -+cannaBinDir = ${PREFIX}/bin -+cannaSrvDir = ${PREFIX}/sbin -+cannaLibDir = ${PREFIX}/lib/canna -+cannaManDir = ${PREFIX}/man -+cannaIncDir = ${PREFIX}/include/canna -+libCannaDir = ${PREFIX}/lib ++cannaPrefix = $(PREFIX) + cannaExecPrefix = $(cannaPrefix) + cannaBinDir = $(cannaExecPrefix)/bin +-cannaSrvDir = $(cannaExecPrefix)/bin +-cannaLibDir = $(cannaPrefix)/lib ++cannaSrvDir = $(cannaExecPrefix)/sbin ++cannaLibDir = $(cannaPrefix)/lib/canna + cannaManDir = $(cannaPrefix)/man + cannaIncDir = $(cannaPrefix)/include/canna +@@ -144,8 +145,8 @@ + libCannaDir = $(cannaExecPrefix)/lib + ErrDir = $(cannaExecPrefix)/log + #else +-libCannaDir = /usr/lib -ErrDir = /usr/spool/canna ++libCannaDir = $(cannaPrefix)/lib +ErrDir = /var/log + #endif - wcharDefinition = -DCANNA_WCHAR - Wlib = -@@ -143,12 +144,12 @@ - - cannaOwner = bin - cannaGroup = bin -- + /* 次の3行は変更しないでください */ +@@ -161,10 +162,11 @@ + #else cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup) + #endif +cannaOwnerDefinition = -DcannaOwner="\"$(cannaOwner)\"" pointerIntegerDef = @@ -38,16 +40,7 @@ /* SunOS 4.x をお使いの方で shared object を利用する場合には cannaDsoRev = 1.1 と指定してください。また、FreeBSD を利用する場合は、 -@@ -167,7 +168,7 @@ - CHMOD = chmod - - /* 日本語マニュアルを使わないのであればコメントアウト */ --#define JAPANESEMAN -+/* #define JAPANESEMAN */ - - /* locale ディレクトリを持っている場合は以下を記述する */ - /* #define LOCALE_DIR /usr/lib/locale */ -@@ -273,7 +274,7 @@ +@@ -308,7 +310,7 @@ * ここから下は変更しないようにしてください。 */ @@ -56,8 +49,8 @@ RK_DEFINES = $(pointerIntegerDef) RKC_DEFINES = $(wcharDefinition) UILIB_DEFINES = $(wcharDefinition) $(pointerIntegerDef) \ -@@ -378,6 +379,15 @@ - set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi \ @@\ +@@ -461,6 +463,15 @@ + set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi; \ @@\ done #endif /* MakeDirectories */ + @@ -70,5 +63,5 @@ + echo " cd" dir; cd dir && \ @@\ + for i in list; do (set -x; $(LN) -f sub/$$i .); done - /* 以下は IBM 基礎研の古畑さん(furuhata@trl.ibm.co.jp)により書かれました */ - #if defined(RsArchitecture) && DoSharedLib + /* libname-def.cppを作るのが面倒なのでXのSharedLibraryTargetを上書き */ + #ifdef CYGWIN_DLL diff --git a/japanese/Canna/files/patch-af b/japanese/Canna/files/patch-af deleted file mode 100644 index 360e5d011617..000000000000 --- a/japanese/Canna/files/patch-af +++ /dev/null @@ -1,22 +0,0 @@ ---- server/misc.c.orig Wed Nov 27 16:30:30 1996 -+++ server/misc.c Thu Aug 8 13:44:03 2002 -@@ -649,12 +649,19 @@ - - if (client->username && client->username[0]) { - if (client->groupname && client->groupname[0]) { -+ if (strlen(DDUSER) + strlen(client->username) + -+ strlen(DDGROUP) + strlen(client->groupname) + -+ strlen(DDPATH) + 4 >= 256) -+ return ( -1 ); - sprintf(dichome, "%s/%s:%s/%s:%s", - DDUSER, client->username, - DDGROUP, client->groupname, - DDPATH); - } - else { -+ if (strlen(DDUSER) + strlen(client->username) + -+ strlen(DDPATH) + 2 >= 256) -+ return ( -1 ); - sprintf(dichome, "%s/%s:%s", - DDUSER, client->username, - DDPATH); diff --git a/japanese/Canna/files/patch-ak b/japanese/Canna/files/patch-ak deleted file mode 100644 index 752be56506e3..000000000000 --- a/japanese/Canna/files/patch-ak +++ /dev/null @@ -1,22 +0,0 @@ ---- dic/ideo/pubdic/k.p.orig Fri Jan 11 10:20:14 2002 -+++ dic/ideo/pubdic/k.p Fri Jan 11 10:31:53 2002 -@@ -7801,7 +7801,7 @@ - こつ コツ #T35 2 - こつこつ こつこつ #F14 2 - こつこつ コツコツ #F14 2 --こつずい 骨随 #T35 0 -+こつずい 骨髄 #T35 0 - こつつぼ 骨壷 #T35 0 - こつにく 骨肉 #T35 0 - こつばん 骨盤 #T35 0 ---- dic/ideo/pubdic/a.p.orig Sat Jan 12 11:46:46 2002 -+++ dic/ideo/pubdic/a.p Sat Jan 12 11:49:07 2002 -@@ -3705,7 +3705,7 @@ - えんじん エンジン #T35 28 - えんすい 円錐 #T35 1 - えんすいだい 円錐台 #T35 2 --えんずい 延随 #T35 0 -+えんずい 延髄 #T35 0 - えんせい 厭世 #T30 0 - えんせい 遠征 #T30 1 - えんせき 宴席 #T35 0 diff --git a/japanese/Canna/files/patch-bzero b/japanese/Canna/files/patch-bzero deleted file mode 100644 index 7a86d56cf123..000000000000 --- a/japanese/Canna/files/patch-bzero +++ /dev/null @@ -1,56 +0,0 @@ ---- ccustom/canna.h.orig Thu Nov 7 10:21:45 1996 -+++ ccustom/canna.h Tue Apr 2 00:09:52 2002 -@@ -46,4 +46,6 @@ - # endif -+# if 0 - # define bzero(buf, size) memset((char *)(buf), 0x00, (size)) - # define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size)) -+# endif - #endif ---- lib/RK/RKintern.h.orig Tue Apr 2 00:03:01 2002 -+++ lib/RK/RKintern.h Tue Apr 2 00:10:41 2002 -@@ -107,4 +107,6 @@ - # ifndef __EMX__ -+# if 0 - # define bzero(buf, size) memset((char *)(buf), 0x00, (size)) - # define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size)) -+# endif - # endif ---- lib/RK/ngram.c.orig Tue Apr 2 00:03:01 2002 -+++ lib/RK/ngram.c Tue Apr 2 00:11:03 2002 -@@ -48,4 +48,6 @@ - # endif -+# if 0 - # define bzero(buf, size) memset((char *)(buf), 0x00, (size)) - # define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size)) -+# endif - #endif ---- lib/RKC/rkc.h.orig Wed Nov 27 16:21:35 1996 -+++ lib/RKC/rkc.h Tue Apr 2 00:11:35 2002 -@@ -48,2 +48,3 @@ - # ifndef __EMX__ -+# if 0 - # ifndef bzero -@@ -53,2 +54,3 @@ - # define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size)) -+# endif - # endif ---- lib/canna/canna.h.orig Mon Dec 2 11:20:15 1996 -+++ lib/canna/canna.h Tue Apr 2 00:11:58 2002 -@@ -112,4 +112,6 @@ - # ifndef __EMX__ -+# if 0 - # define bzero(buf, size) memset((char *)(buf), 0x00, (size)) - # define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size)) -+# endif - # endif ---- server/IR.h.orig Wed Nov 27 16:24:56 1996 -+++ server/IR.h Tue Apr 2 00:12:30 2002 -@@ -34,2 +34,3 @@ - # ifndef __EMX__ -+# if 0 - # ifndef bcopy -@@ -39,2 +40,3 @@ - # define bzero(buf, size) memset((char *)(buf), 0x00, (size)) -+# endif - # endif diff --git a/japanese/Canna/pkg-descr b/japanese/Canna/pkg-descr index 16e586f12733..21bb848df32a 100644 --- a/japanese/Canna/pkg-descr +++ b/japanese/Canna/pkg-descr @@ -1,6 +1,7 @@ Canna is a Kana-Kanji conversion server. -Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method, -cannum front end and some others. +Supports Mule(Multi-lingual extention Emacs), kinput2 X11 input +method, etc. + To use from Mule (CANNA version), add the following to your .emacs file: @@ -12,4 +13,6 @@ cannum front end and some others. Then use the `C-o' key to begin kana-kanji conversion. Refer to the Info file and the documents for more detail. +WWW: http://canna.sourceforge.jp/ + - Max diff --git a/japanese/Canna/pkg-message b/japanese/Canna/pkg-message new file mode 100644 index 000000000000..a5d66bc6769f --- /dev/null +++ b/japanese/Canna/pkg-message @@ -0,0 +1,6 @@ + +Now the cannaserver uses a UNIX domain scoekt by default. If you need +to use a TCP connection, please edit your startup script +(e.g. /usr/local/etc/rc.d/canna.sh) and add the -inet command-line +option to the cannaserver execution. + diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist index ca5fbe3b89ce..f13d9712f589 100644 --- a/japanese/Canna/pkg-plist +++ b/japanese/Canna/pkg-plist @@ -27,7 +27,7 @@ bin/rmdic bin/splitword bin/syncdic bin/wtoc -etc/rc.d/canna.sh +etc/rc.d/canna.sh.sample include/canna/RK.h include/canna/jrkanji.h include/canna/keydef.h @@ -63,7 +63,6 @@ lib/canna/dic/sokuon.cbp lib/canna/dic/tut.cbp lib/canna/dic/vje.cbp lib/canna/dic/wx2+.cbp -lib/canna/engine.cf lib/canna/sample/1.1.canna lib/canna/sample/1.2.canna lib/canna/sample/default.canna -- cgit v1.2.3