* Move Canna-server from inputmethod/canna-server to here.

* Put Makefile.common and Makefile.include for common definitions and
  inclusions.

* Update to 3.6p3.  From Toru Takamizu in PR#20208.

  Random summary of changes since 3.6p1.

	* CHANGES.jp: update
	* Fix sample files.
	* Install default.canna to cannaLibDir.
	* Fix cursor handling in tango-touroku.
	* Add "nami" symbol.
	* 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.
	* lib/RKC/wconvert.c(SendType11Request): stop buffer overrun
	* server/IR.h: define _WCHAR_t again after include "canna/RK.h"
	  New direcroty hierarchy.
	  Currently old hierarchy is default on stable branch.

  And document/code bug fixes.

12 files changed, 278 insertions, 0 deletions

diff --git a/inputmethod/canna/DESCR b/inputmethod/canna/DESCR
new file mode 100644
index 00000000000..bd470e7e7eb
--- /dev/null
+++ b/inputmethod/canna/DESCR
@@ -0,0 +1,13 @@
+Canna is a Kana-Kanji conversion server.
+Support Mule (Multi-lingal extention Emacs), kinput2 X11 input method,
+cannum front end and some others.
+
+  To use from Mule (CANNA version), in .emacs file:
+
+     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
+        (progn
+         (load-library "canna")
+         (canna) ))
+
+  Then kana-kanji conversion begin to `C-o' key.  Show more detail
+Info, and/or documents.
diff --git a/inputmethod/canna/Makefile b/inputmethod/canna/Makefile
new file mode 100644
index 00000000000..fab8efb7bf4
--- /dev/null
+++ b/inputmethod/canna/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2003/05/31 07:24:38 uebayasi Exp $
+#
+.include "Makefile.common"
+
+CANNA_MODULE=	server
+
+DEPENDS+=	Canna-server-bin>=${CANNA_VERSION}:../canna-server-bin
+DEPENDS+=	Canna-dict>=${CANNA_VERSION}:../canna-dict
+
+EXTRACT_ONLY=	# empty
+NO_CHECKSUM=	YES
+NO_BUILD=	YES
+
+do-patch:	# empty
+do-install:	# empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
new file mode 100644
index 00000000000..c9c75ce4a3d
--- /dev/null
+++ b/inputmethod/canna/Makefile.common
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile.common,v 1.1 2003/05/31 07:24:38 uebayasi Exp $
+#
+# Canna common makefile.
+#
+
+DISTNAME=	Canna${CANNA_VERSION:S|.||}
+PKGNAME=	Canna-${CANNA_MODULE}-${CANNA_VERSION}
+CATEGORIES=	japanese inputmethod
+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 (${CANNA_MODULE})
+
+FILESDIR=	${.CURDIR}/../canna/files
+DISTINFO_FILE=	${.CURDIR}/../canna/distinfo
+PATCHDIR=	${.CURDIR}/../canna/patches
+
+# To be done.
+#USE_BUILDLINK2=	# defined
+
+CANNA_VERSION=	3.6p3
+
+CANNA_OWNER?=    daemon
+CANNA_GROUP?=    daemon
+CANNA_SPOOL=	${DESTDIR}/var/spool/canna
+CANNA_MODE=	0755
+
+_CANNA_VERS=	\
+		CANNA_OWNER=${CANNA_OWNER} \
+		CANNA_GROUP=${CANNA_GROUP} \
+		CANNA_SPOOL=${CANNA_SPOOL} \
+		CANNA_MODE=${CANNA_MODE} \
+		IMDICTDIR=${IMDICTDIR}
+MAKE_ENV+=	${_CANNA_VERS}
+PLIST_SUBST+=	${_CANNA_VERS}
+
+# XXX IPv6 support.  To be done.
+#BUILD_DEFS+=	USE_INET6
+#.include "../../mk/bsd.prefs.mk"
+#.if 0	# defined(USE_INET6) && ${USE_INET6} == "YES"
+#INET6=		-DINET6
+#.else
+#INET6=		# empty
+#.endif
+#MAKE_ENV+=	INET6=${INET6}
diff --git a/inputmethod/canna/Makefile.include b/inputmethod/canna/Makefile.include
new file mode 100644
index 00000000000..e52f96aff52
--- /dev/null
+++ b/inputmethod/canna/Makefile.include
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile.include,v 1.1 2003/05/31 07:24:39 uebayasi Exp $
+#
+
+.include "../../devel/nbitools/nbitools.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna/PLIST b/inputmethod/canna/PLIST
new file mode 100644
index 00000000000..2d3164acab0
--- /dev/null
+++ b/inputmethod/canna/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2003/05/31 07:24:39 uebayasi Exp $
diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo
new file mode 100644
index 00000000000..1af377da2a4
--- /dev/null
+++ b/inputmethod/canna/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2003/05/31 07:24:39 uebayasi Exp $
+
+SHA1 (Canna36p3.tar.gz) = 183c4e160babd49d5d8c542fbf06db980e3965da
+Size (Canna36p3.tar.gz) = 1441598 bytes
+SHA1 (patch-aa) = 6f5bf45212cf1127cb8b2f8f0c5eb0c778e1a908
+SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
+SHA1 (patch-ac) = 8f9f999eb8abd9c8e3d3e5c66cf55150ce700919
+SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c
+SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10
diff --git a/inputmethod/canna/files/canna b/inputmethod/canna/files/canna
new file mode 100644
index 00000000000..f44c2a385e7
--- /dev/null
+++ b/inputmethod/canna/files/canna
@@ -0,0 +1,25 @@
+#! /bin/sh
+#
+# $NetBSD: canna,v 1.1 2003/05/31 07:24:40 uebayasi Exp $
+#
+# PROVIDE: canna
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="canna"
+rcvar=$name
+command="@PREFIX@/sbin/cannaserver"
+stop_cmd="@PREFIX@/sbin/cannakill"
+
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
+then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	@ECHO@ -n ' ${name}'
+	${command} ${canna_flags} ${command_args}
+fi
diff --git a/inputmethod/canna/patches/patch-aa b/inputmethod/canna/patches/patch-aa
new file mode 100644
index 00000000000..3851c767739
--- /dev/null
+++ b/inputmethod/canna/patches/patch-aa
@@ -0,0 +1,101 @@
+$NetBSD: patch-aa,v 1.1 2003/05/31 07:24:41 uebayasi Exp $
+
+--- Canna.conf.orig	Sat Jan 25 17:47:47 2003
++++ Canna.conf
+@@ -133,18 +133,18 @@
+ /* rootにならずにインストールする時はこれを定義して下さい */
+ /* #define InstallAsUser */
+ /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */
+-#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
+@@ -173,10 +173,10 @@
+ /* 次の3行は変更しないでください */
+ wcharDefinition = -DCANNA_WCHAR
+ Wlib =
+-JapaneseLocale = japanese
++JapaneseLocale = ja_JP.eucJP
+ 
+-cannaOwner = bin
+-cannaGroup = bin
++cannaOwner = ${CANNA_OWNER}
++cannaGroup = ${CANNA_GROUP}
+ 
+ #ifdef InstallAsUser
+ cannaOwnerGroup =
+@@ -246,7 +246,7 @@
+  * コマンド類をリンクする時は、次を YES にしてくだい。
+  */
+ /* #define UseInstalledLibCanna YES */
+-#define UseInstalledLibCanna NO
++#define UseInstalledLibCanna YES
+ 
+ DicDir   = $(cannaLibDir)/dic
+ 
+@@ -291,18 +291,18 @@
+     DEPCANNALIB = $(libCannaDir)/libcanna.a
+ #endif
+ # endif
+-       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
++       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
+ #else /* ! UseInstalledLibCanna */
+ # if DoSharedLib
+-    DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
++    DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
+ # else
+ #ifdef __EMX__
+-    DEPCANNALIB = $(CANNASRC)/canna.a
++    DEPCANNALIB = $(libCannaDir)/canna.a
+ #else
+-    DEPCANNALIB = $(CANNASRC)/libcanna.a
++    DEPCANNALIB = $(libCannaDir)/libcanna.a
+ #endif
+ # endif
+-       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
++       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB)
+ #endif /* UseInstalledLibCanna */
+ 
+ #if UseInstalledLibCanna
+@@ -311,14 +311,14 @@
+ # else
+     DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
+ # endif
+-       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
++       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
+ #else /* ! UseInstalledLibCanna */
+ # if DoSharedLib
+-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
++    DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
+ # else
+-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
++    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
+ # endif
+-       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
++       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB)
+ #endif /* UseInstalledLibCanna */
+ 
+ /*
+@@ -335,7 +335,7 @@
+      SCRIPTS_DEFINES = 
+ 
+ #ifdef JAPANESEMAN
+-JMNLOCALE = ja
++JMNLOCALE = ja_JP.EUC
+ #endif
+ 
+ /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */
diff --git a/inputmethod/canna/patches/patch-ab b/inputmethod/canna/patches/patch-ab
new file mode 100644
index 00000000000..fda4bd146b6
--- /dev/null
+++ b/inputmethod/canna/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2003/05/31 07:24:41 uebayasi Exp $
+--- Imakefile.orig	Thu Dec  5 22:39:41 2002
++++ Imakefile	Thu Dec  5 22:40:03 2002
+@@ -60,7 +60,7 @@
+ 	for i in $(SERVERDIR) ;\
+ 	do \
+ 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+-		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ 	done
+ 
+ instclient::
+@@ -68,7 +68,7 @@
+ 	for i in $(CLIENTDIR) ;\
+ 	do \
+ 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+-		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ 	done
+ 
+ instsgs::
diff --git a/inputmethod/canna/patches/patch-ac b/inputmethod/canna/patches/patch-ac
new file mode 100644
index 00000000000..6adf2a6c4d3
--- /dev/null
+++ b/inputmethod/canna/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2003/05/31 07:24:42 uebayasi Exp $
+
+--- dic/phono/Imakefile.orig	Wed Nov 27 16:15:14 1996
++++ dic/phono/Imakefile	Fri Jul 30 19:57:02 1999
+@@ -27,7 +27,7 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
++               DICDIR = $(DicDir)
++            SAMPLEDIR = $(DicDir)/sample
++         SAMPLESRCDIR = $(DicDir)/sample/src
+
diff --git a/inputmethod/canna/patches/patch-ad b/inputmethod/canna/patches/patch-ad
new file mode 100644
index 00000000000..2679255fdf7
--- /dev/null
+++ b/inputmethod/canna/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2003/05/31 07:24:42 uebayasi Exp $
+--- dic/ideo/pubdic/Imakefile.orig	Thu Dec  5 23:43:40 2002
++++ dic/ideo/pubdic/Imakefile	Thu Dec  5 23:43:52 2002
+@@ -9,7 +9,7 @@
+       CANNAROOT = ../../..
+     CANNACMDDIR = $(CANNAROOT)/cmd
+           MERGE = $(CANNACMDDIR)/mergewd/mergeword
+-       INCLUDES = -I$(CANNAROOT)/include
++       INCLUDES = -I$(CANNAROOT)/canna
+ #endif
+         TARGETS = iroha.t
+         PUBDICS = a.p k.p s.p t.p n.p h.p m.p y.p r.p w.p x.p
diff --git a/inputmethod/canna/patches/patch-af b/inputmethod/canna/patches/patch-af
new file mode 100644
index 00000000000..8a8dfc610f5
--- /dev/null
+++ b/inputmethod/canna/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/05/31 07:24:42 uebayasi Exp $
+
+--- lib/RKC/convert.c.orig	Wed May 22 22:02:57 1996
++++ lib/RKC/convert.c
+@@ -32,7 +32,7 @@
+ #ifndef WIN
+ #include "sglobal.h"
+ #endif
+-#include "IRproto.h"
++#include "../server/IRproto.h"
+ 
+ #include <errno.h>
+ #include <sys/types.h>