Subject: pkg/20208: Update inputmethod/canna-* packages
To: None <gnats-bugs@gnats.netbsd.org>
From: Toru TAKAMIZU <ttaka@earth.email.ne.jp>
List: netbsd-bugs
Date: 02/05/2003 12:26:13
>Number: 20208
>Category: pkg
>Synopsis: Update inputmethod/canna-* packages
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Tue Feb 04 20:06:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Toru TAKAMIZU
>Release: NetBSD 1.6.1_RC1
>Organization:
>Environment:
System: NetBSD localhost 1.6.1_RC1 NetBSD 1.6.1_RC1 (MIWA) #24: Wed Jan 29 14:44:41 JST 2003 toru@localhost:/usr/src/sys/arch/i386/compile/MIWA i386
Architecture: i386
Machine: i386
>Description:
The patches below provide the update to the latest(3.6p3) release.
Many bugs are fixed.
4 patches are included. You can separete them at "****" line for
each of the related packages.
====================================================================
2003-01-25 AIDA Shinra <aida-s@jcom.home.ne.jp>
* Canna.conf.dist: MANSUFF(X (thanks to nanashi san)
* canna/patchlevel.h: 3.6p3 release
2003-01-24 AIDA Shinra <aida-s@jcom.home.ne.jp>
* canna/patchlevel.h: 3.6p2 release
2003-01-23 AIDA Shinra <aida-s@jcom.home.ne.jp>
* Canna.conf: CannaDsoRev is now 1.1 in all platforms.
* CHANGES.jp: update
2003-01-21 AIDA Shinra <aida-s@jcom.home.ne.jp>
* [Canna-dev 153]: sample file problems (Thanks to Ikumi san)
* misc/initfiles/Imakefile: install default.canna to cannaLibDir
* misc/initfiles/default.ca: fix typo, 3.5 options
* misc/initfiles/sample.canna: ditto
* misc/initfiles/unix.canna: ditto
2003-01-17 AIDA Shinra <aida-s@jcom.home.ne.jp>
* lib/canna/henkan.c(TanPrintBunpou): correctly handle guidline clear
flags (Thanks to Ikumi san)
(TanPrintTime): ditto
(tanbunToYomiAll): avoid dereference of tan after tanbunCommitYomi
* lib/canna/romaji.c(howFarToGoBackward): character-based-move was
broken. Don't stop at HENKANSUMI && !SENTOU char. Instead we set
SENTOU flag in tango-touroku time.
(howFarToGoForward): ditto
* lib/canna/uldefine.c(uuT2TangoEveryTimeCatch): SENTOU flag on.
Now we can handle cursor in tango-touroku really properly.
2003-01-15 AIDA Shinra <aida-s@jcom.home.ne.jp>
* lib/canna/uldelete.c: delete words in group dictionaries (Thanks to
Ikumi san)
* cmd/crfreq/crfreq.c: avoid crash when filename and dicname are not
specified
* cmd/mkbindic/mkbindic.cpp: use .fq suffix if "-name foo.d" is
specified
* cmd/mkbindic/mkbindic.jmn: new filename, remove canvert(1)
* cmd/mkbindic/mkbindic.man: ditto, update examples, add $TMPDIR desc
* cmd/ctow/ctow.c: s/itow/ctow/ in comments, s/speach/speech/
* cmd/splitwd/splitwd.man: s/itow/ctow/
2003-01-13 AIDA Shinra <aida-s@jcom.home.ne.jp>
* cmd/dicar/dicar.man: correct typo(Thanks to NAKAMURA Takeshi san)
* cmd/mkbindic/mkbindic.cpp: change cpp check method, $TMPDIR (Thanks
to takasan san)
* Canna.conf.dist(MakeCannaConfigH): suppress echo
* misc/default.ca: already moved into initfiles; removed
* misc/Imakefile: remove default.ca
* misc/initfiles/default.ca: append old default.ca contents and
"nami" "nakaten" symbol defs as comment.
* misc/initfiles/unix.ca: add "nami" symbol
2003-01-10 AIDA Shinra <aida-s@jcom.home.ne.jp>
* Prevent wrong learning. It had occured in two situations:
1. bubun kakutei at bunsetsus (probably) except in jishu-henkan mode
2. bubun muhenkan
In both cases, all bunsetsus had been learned.
This commit is only a quick hack. tanbunContext should be removed
and new protocol should be added in future.
2003-01-06 AIDA Shinra <aida-s@jcom.home.ne.jp>
* [Canna-dev 119] chikuji input was broken
* lib/RKC/wconvert.c(SendType11Request): stop buffer overrun
2003-01-06 AIDA Shinra <aida-s@jcom.home.ne.jp>
* server/IR.h: define _WCHAR_t again after include "canna/RK.h"
2002-12-28 AIDA Shinra <aida-s@jcom.home.ne.jp>
* [canna-dev 97] [canna-dev 106] [canna-dev 107]
New direcroty hierarchy.
Currently old hierarchy is default on stable branch.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-dict/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 2002/12/29 01:03:21 1.4
+++ Makefile 2003/01/26 07:08:33
@@ -1,34 +1,27 @@
# $NetBSD: Makefile,v 1.4 2002/12/29 01:03:21 seb Exp $
-DISTNAME= Canna36p1
-PKGNAME= Canna-dict-3.6.1
+DISTNAME= Canna36p3
+PKGNAME= Canna-dict-3.6.3
CATEGORIES= japanese inputmethod
-MASTER_SITES= http://downloads.sourceforge.jp/canna/1722/
+MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/
MAINTAINER= tech-pkg-ja@jp.netbsd.org
HOMEPAGE= http://canna.sourceforge.jp/
COMMENT= Kana-Kanji conversion system (dictionary)
-BUILD_DEPENDS+= Canna-server-bin>=3.6.1:../canna-server-bin
+BUILD_DEPENDS+= Canna-server-bin>=3.6.3:../canna-server-bin
FILESDIR= ${.CURDIR}/../canna-lib/files
DISTINFO_FILE= ${.CURDIR}/../canna-lib/distinfo
PATCHDIR= ${.CURDIR}/../canna-lib/patches
-BUILD_DEFS+= USE_INET6
-#USE_X11BASE= yes
+OWN_DIRS= ${PREFIX}/canna
-.include "../../mk/bsd.prefs.mk"
NO_MTREE= yes
-.if 0 # defined(USE_INET6) && ${USE_INET6} == "YES"
-INET6= -DINET6
-.else
-INET6= # empty
-.endif
CANNAOWNER?= daemon
CANNAGROUP?= daemon
MAKE_ENV+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
- IMDICTDIR=${IMDICTDIR} INET6=${INET6}
+ IMDICTDIR=${IMDICTDIR}
EVAL_PREFIX+= CANNASERVERBINDIR=Canna-server-bin
.for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
@@ -54,6 +47,7 @@
@(cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install)
.include "../../devel/nbitools/nbitools.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
# Need to set this here _after_ bsd.pkg.mk
*******************************************************************
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 2002/12/27 08:41:24 1.5
+++ Makefile 2003/01/26 07:10:17
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2002/12/27 08:41:24 uebayasi Exp $
#
-DISTNAME= Canna36p1
-PKGNAME= Canna-lib-3.6.1
+DISTNAME= Canna36p3
+PKGNAME= Canna-lib-3.6.3
CATEGORIES= japanese inputmethod
-MASTER_SITES= http://downloads.sourceforge.jp/canna/1722/
+MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/
MAINTAINER= tech-pkg-ja@jp.netbsd.org
HOMEPAGE= http://canna.sourceforge.jp/
@@ -12,18 +12,9 @@
INSTALL_TARGET= install install.man
-BUILD_DEFS+= USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-.if 0 # defined(USE_INET6) && ${USE_INET6} == "YES"
-INET6= -DINET6
-.else
-INET6= # empty
-.endif
CANNAOWNER?= daemon
CANNAGROUP?= daemon
-MAKE_ENV+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
- INET6=${INET6}
+MAKE_ENV+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP}
# (1) Change SUBDIRS.
# (2) Don't install `forcpp', `kpdic'.
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- PLIST 2002/12/27 08:41:24 1.5
+++ PLIST 2003/01/26 07:11:03
@@ -6,19 +6,19 @@
lib/libRKC.a
lib/libRKC.so
lib/libRKC.so.1
-lib/libRKC.so.1.0
+lib/libRKC.so.1.1
lib/libRKC16.a
lib/libRKC16.so
lib/libRKC16.so.1
-lib/libRKC16.so.1.0
+lib/libRKC16.so.1.1
lib/libcanna.a
lib/libcanna.so
lib/libcanna.so.1
-lib/libcanna.so.1.0
+lib/libcanna.so.1.1
lib/libcanna16.a
lib/libcanna16.so
lib/libcanna16.so.1
-lib/libcanna16.so.1.0
+lib/libcanna16.so.1.1
man/ja_JP.EUC/man3/RkBgnBun.3
man/ja_JP.EUC/man3/RkCloseRoma.3
man/ja_JP.EUC/man3/RkCvtEuc.3
@@ -43,7 +43,7 @@
man/ja_JP.EUC/man3/RkLeft.3
man/ja_JP.EUC/man3/RkMapPhonogram.3
man/ja_JP.EUC/man3/RkMapRoma.3
-man/ja_JP.EUC/man3/RkMountD.3
+man/ja_JP.EUC/man3/RkMountDic.3
man/ja_JP.EUC/man3/RkNext.3
man/ja_JP.EUC/man3/RkNfer.3
man/ja_JP.EUC/man3/RkOpenRoma.3
@@ -85,7 +85,7 @@
man/man3/RkLeft.3
man/man3/RkMapPhonogram.3
man/man3/RkMapRoma.3
-man/man3/RkMountD.3
+man/man3/RkMountDic.3
man/man3/RkNext.3
man/man3/RkNfer.3
man/man3/RkOpenRoma.3
@@ -134,7 +134,6 @@
share/canna/dic/wx2+.cbp
share/canna/sample/1.1.canna
share/canna/sample/1.2.canna
-share/canna/sample/default.canna
share/canna/sample/fixer.canna
share/canna/sample/jdemon.canna
share/canna/sample/just.canna
Index: buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/buildlink2.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink2.mk
--- buildlink2.mk 2002/12/27 08:41:24 1.3
+++ buildlink2.mk 2003/01/26 07:11:20
@@ -4,7 +4,7 @@
CANNA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= canna
-BUILDLINK_DEPENDS.canna?= Canna-lib>=3.6.1
+BUILDLINK_DEPENDS.canna?= Canna-lib>=3.6.3
BUILDLINK_PKGSRCDIR.canna?= ../../inputmethod/canna-lib
EVAL_PREFIX+= BUILDLINK_PREFIX.canna=canna-lib
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 2002/12/27 08:41:24 1.5
+++ distinfo 2003/01/26 07:11:30
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.5 2002/12/27 08:41:24 uebayasi Exp $
-SHA1 (Canna36p1.tar.gz) = 3e08fc03e16298ad7941a923989ea35929cdf3ba
-Size (Canna36p1.tar.gz) = 1337483 bytes
-SHA1 (patch-aa) = 816a5fddac06c980eaa7f622b6872231741c76a5
+SHA1 (Canna36p3.tar.gz) = 183c4e160babd49d5d8c542fbf06db980e3965da
+Size (Canna36p3.tar.gz) = 1441598 bytes
+SHA1 (patch-aa) = 8250f43c96fe27a73bffa9b739fa02082df12973
SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
SHA1 (patch-ac) = 8f9f999eb8abd9c8e3d3e5c66cf55150ce700919
SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa 2002/12/27 08:41:24 1.4
+++ patches/patch-aa 2003/01/26 07:11:59
@@ -1,33 +1,29 @@
$NetBSD: patch-aa,v 1.4 2002/12/27 08:41:24 uebayasi Exp $
---- Canna.conf.orig Thu Dec 5 22:25:03 2002
-+++ Canna.conf Thu Dec 5 22:51:29 2002
-@@ -132,11 +132,11 @@
-
+--- Canna.conf.orig Sat Jan 25 17:47:47 2003
++++ Canna.conf Sun Jan 26 14:41:27 2003
+@@ -133,18 +133,18 @@
/* root$B$K$J$i$:$K%$%s%9%H!<%k$9$k;~$O$3$l$rDj5A$7$F2<$5$$(B */
/* #define InstallAsUser */
--cannaPrefix = /usr/local/canna
-+cannaPrefix = ${PREFIX}
- cannaExecPrefix = $(cannaPrefix)
- cannaBinDir = $(cannaExecPrefix)/bin
--cannaSrvDir = $(cannaExecPrefix)/bin
--cannaLibDir = $(cannaPrefix)/lib
-+cannaSrvDir = $(cannaExecPrefix)/sbin
-+cannaLibDir = $(cannaPrefix)/share/canna
- cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
-
-@@ -144,17 +144,19 @@
- libCannaDir = $(cannaExecPrefix)/lib
- ErrDir = $(cannaExecPrefix)/log
- #else
--libCannaDir = /usr/lib
--ErrDir = /usr/spool/canna
-+libCannaDir = $(cannaPrefix)/lib
-+ErrDir = ${CANNA_SPOOL}
+ /* $B=>Mh$H8_49$N%G%#%l%/%H%j9=B$$K$9$k>l9g$O$3$l$rDj5A$7$F$/$@$5$$(B */
+-#define ObsoleteInstallDir
++/* #define ObsoleteInstallDir */
+ #ifdef InstallAsUser
+ # define DefCannaPrefix $(HOME)/canna
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else
+-# define DefCannaPrefix /usr/local/canna
++# define DefCannaPrefix ${PREFIX}
+ # ifdef ObsoleteInstallDir
+ # define DefErrDir /usr/spool/canna
+ # define DefLibCannaDir /usr/lib
+ # else
+-# define DefErrDir /var/log
++# define DefErrDir ${CANNA_SPOOL}
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
#endif
-
-+INET6_DEFS = ${INET6}
-+
+@@ -173,10 +173,10 @@
/* $B<!$N(B3$B9T$OJQ99$7$J$$$G$/$@$5$$(B */
wcharDefinition = -DCANNA_WCHAR
Wlib =
@@ -41,16 +37,7 @@
#ifdef InstallAsUser
cannaOwnerGroup =
-@@ -164,7 +166,7 @@
-
- pointerIntegerDef =
-
--cannaDsoRev = 1
-+cannaDsoRev = 1.0
- /* SunOS 4.x $B$r$*;H$$$NJ}$G(B shared object $B$rMxMQ$9$k>l9g$K$O(B
- cannaDsoRev = 1.1
- $B$H;XDj$7$F$/$@$5$$!#$^$?!"(BFreeBSD $B$rMxMQ$9$k>l9g$O!"(B
-@@ -229,7 +231,7 @@
+@@ -246,7 +246,7 @@
* $B%3%^%s%IN`$r%j%s%/$9$k;~$O!"<!$r(B YES $B$K$7$F$/$@$$!#(B
*/
/* #define UseInstalledLibCanna YES */
@@ -59,7 +46,7 @@
DicDir = $(cannaLibDir)/dic
-@@ -274,18 +276,18 @@
+@@ -291,18 +291,18 @@
DEPCANNALIB = $(libCannaDir)/libcanna.a
#endif
# endif
@@ -83,7 +70,7 @@
#endif /* UseInstalledLibCanna */
#if UseInstalledLibCanna
-@@ -294,14 +296,14 @@
+@@ -311,14 +311,14 @@
# else
DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
# endif
@@ -102,7 +89,7 @@
#endif /* UseInstalledLibCanna */
/*
-@@ -318,7 +320,7 @@
+@@ -335,7 +335,7 @@
SCRIPTS_DEFINES =
#ifdef JAPANESEMAN
Index: files/canna
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/files/canna,v
retrieving revision 1.4
diff -u -r1.4 canna
--- files/canna 2002/08/25 19:22:55 1.4
+++ files/canna 2003/01/26 07:14:47
@@ -13,7 +13,7 @@
name="canna"
rcvar=$name
command="@PREFIX@/sbin/cannaserver"
-stop_cmd="@PREFIX@/bin/cannakill"
+stop_cmd="@PREFIX@/sbin/cannakill"
if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
then
*******************************************************************
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-server-bin/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 2002/12/27 08:41:25 1.4
+++ Makefile 2003/01/26 07:17:06
@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.4 2002/12/27 08:41:25 uebayasi Exp $
-DISTNAME= Canna36p1
-PKGNAME= Canna-server-bin-3.6.1
+DISTNAME= Canna36p3
+PKGNAME= Canna-server-bin-3.6.3
CATEGORIES= japanese inputmethod
-MASTER_SITES= http://downloads.sourceforge.jp/canna/1722/
+MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/
MAINTAINER= tech-pkg-ja@jp.netbsd.org
HOMEPAGE= http://canna.sourceforge.jp/
@@ -13,22 +13,17 @@
DISTINFO_FILE= ${.CURDIR}/../canna-lib/distinfo
PATCHDIR= ${.CURDIR}/../canna-lib/patches
-BUILD_DEFS+= USE_INET6
+RCD_SCRIPTS= canna
+OWN_DIRS= ${CANNA_SPOOL}
USE_BUILDLINK2= YES
-.include "../../mk/bsd.prefs.mk"
-.if 0 # ${USE_INET6} == "YES"
-INET6= -DINET6
-.else
-INET6= # empty
-.endif
CANNAOWNER?= daemon
CANNAGROUP?= daemon
CANNA_SPOOL= /var/spool/canna
CANNA_MODE= 0755
MAKE_ENV+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
- CANNA_SPOOL=${CANNA_SPOOL} IMDICTDIR=${IMDICTDIR} INET6=${INET6}
+ CANNA_SPOOL=${CANNA_SPOOL} IMDICTDIR=${IMDICTDIR}
PLIST_SUBST+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
CANNA_SPOOL=${CANNA_SPOOL} CANNA_MODE=${CANNA_MODE}
@@ -59,4 +54,5 @@
.include "../../devel/nbitools/buildlink2.mk"
.include "../../inputmethod/canna-lib/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-server-bin/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST 2002/12/27 08:41:25 1.2
+++ PLIST 2003/01/26 07:17:20
@@ -2,7 +2,6 @@
bin/addwords
bin/canlisp
bin/cannacheck
-bin/cannakill
bin/cannastat
bin/catdic
bin/chmoddic
@@ -73,9 +72,9 @@
man/man1/rmdic.1
man/man1/splitword.1
man/man1/wtoc.1
+sbin/cannakill
sbin/cannaserver
@exec ${MKDIR} ${CANNA_SPOOL}
@exec ${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
@exec ${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
@unexec ${RMDIR} ${CANNA_SPOOL}
-
*******************************************************************
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-server/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 2002/12/27 08:41:25 1.4
+++ Makefile 2003/01/26 07:18:24
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2002/12/27 08:41:25 uebayasi Exp $
-DISTNAME= Canna-server-3.6.1
+DISTNAME= Canna-server-3.6.3
CATEGORIES= japanese inputmethod
MASTER_SITES= # empty
DISTFILES= # empty
@@ -8,8 +8,8 @@
MAINTAINER= tech-pkg-ja@jp.netbsd.org
COMMENT= Kana-Kanji conversion system (server)
-DEPENDS+= Canna-server-bin>=3.6.1:../canna-server-bin
-DEPENDS+= Canna-dict>=3.6.1:../canna-dict
+DEPENDS+= Canna-server-bin>=3.6.3:../canna-server-bin
+DEPENDS+= Canna-dict>=3.6.3:../canna-dict
EXTRACT_ONLY= # empty
NO_BUILD= YES
>Release-Note:
>Audit-Trail:
>Unformatted: