Japanese input tty frontend for Canna using uum.

PR:		ports/9629
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

3 files changed, 210 insertions, 0 deletions

diff --git a/japanese/canuum/files/patch-aa b/japanese/canuum/files/patch-aa
new file mode 100644
index 000000000000..4c7ea6ae2d6f
--- /dev/null
+++ b/japanese/canuum/files/patch-aa
@@ -0,0 +1,85 @@
+--- Canna.conf.orig	Wed Apr 12 22:15:03 1995
++++ Canna.conf	Fri Jan 22 13:48:26 1999
+@@ -115,18 +115,18 @@
+  */
+ 
+-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
++cannaBinDir = ${PREFIX}/bin
++cannaSrvDir = ${PREFIX}/sbin
++cannaLibDir = ${PREFIX}/lib/canna
++cannaManDir = ${PREFIX}/man
++cannaIncDir = ${PREFIX}/include/canna
++libCannaDir = ${PREFIX}/lib
+ 
+-ErrDir  = /usr/spool/canna
+-LockDir = /usr/spool/canna/lock
++ErrDir  = /var/log
++LockDir = /var/run/canna
+ 
+ wcharDefinition = -DCANNA_WCHAR
+-Wlib =
+-JapaneseLocale = japanese
++Wlib = -lxpg4
++JapaneseLocale = ja_JP.EUC
+ 
+ cannaOwner = bin
+ cannaGroup = bin
+@@ -135,7 +135,7 @@
+ 
+ pointerIntegerDef =
+ 
+-cannaDsoRev = 1
++cannaDsoRev = 1.0
+ sharedLibExtension = so.$(cannaDsoRev)
+ 
+ /* 以下の３つは root にならないでインストールするのであれば echo に
+@@ -148,7 +148,7 @@
+ #define JAPANESEMAN
+ 
+ /* locale ディレクトリを持っている場合は以下を記述する */
+-/* #define LOCALE_DIR /usr/lib/locale */
++#define LOCALE_DIR /usr/share/locale
+ 
+ /* エンジンスイッチ機能を使うのであればコメントをはずす */
+ /* #define engineSwitch */
+@@ -174,11 +174,11 @@
+  * インストール済みの共有ライブラリを用いて Canna の
+  * コマンド類をリンクする時は、次を YES にしてくだい。
+  */
+-/* #define UseInstalledLibCanna YES */
+-#define UseInstalledLibCanna NO
++#define UseInstalledLibCanna YES
++/*#define UseInstalledLibCanna NO */
+ 
+ DicDir   = $(cannaLibDir)/dic
+-LockFile = .CANNALOCK
++LockFile = Canna.pid
+ 
+ #ifdef NeXT
+ #define NO_X_ENV
+@@ -311,13 +311,13 @@
+ #endif
+ #define InstallLibManPageAliases(file,destdir,aliases)			@@\
+ install.man::								@@\
+-        @(TMP=/tmp/tmp.$$$$; \						@@\
+-        $(RM) $${TMP}; \						@@\
+-        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
+-        for i in aliases; do (set -x; \					@@\
+-        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
+-        done; \								@@\
+-        $(RM) $${TMP})
++	@(TMP=/tmp/tmp.$$$$; \						@@\
++	$(RM) $${TMP}; \						@@\
++	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
++	for i in aliases; do (set -x; \					@@\
++	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
++	done; \								@@\
++	$(RM) $${TMP})
+ #ifndef MakeDirectoriesLong
+ #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
+ step::									@@\
diff --git a/japanese/canuum/files/patch-ac b/japanese/canuum/files/patch-ac
new file mode 100644
index 000000000000..10bde17865d4
--- /dev/null
+++ b/japanese/canuum/files/patch-ac
@@ -0,0 +1,38 @@
+--- Imakefile.orig	Tue Apr 19 20:38:45 1994
++++ Imakefile	Fri Jan 22 00:50:46 1999
+@@ -2,4 +1,4 @@
+-#include "../Canna.conf"
++#include "./Canna.conf"
+ 
+ #if SystemV || SystemV4
+ SYS_LIBRARIES = -lcurses
+@@ -7,11 +7,12 @@
+ SYS_LIBRARIES = -ltermcap
+ #endif
+ 
+-    CANNAROOT = ..
++    CANNAROOT = .
+ INSTUGIDFLAGS = -m 4755 -o root
+-     CANNASRC = $(CANNAROOT)/lib/canna16
++     CANNASRC = $(CANNAROOT)
+       DEFINES = -DCANNA -DJAPANESE $(SIGNAL_DEFINES)
+-     INCLUDES = -I$(CANNAROOT)/include
++     INCLUDES = -I$(CANNAROOT) -I${PREFIX}/include
++    LDOPTIONS = ${CANNALIB16}
+ 
+          SRCS = header.c printf.c termio.c termcap.c ttyfdslot.c setutmp.c \
+ 		screen.c cursor.c jhlp.c xutoj.c canna.c
+@@ -21,8 +22,12 @@
+             TARGET = canuum
+ 
+ AllTarget($(TARGET))
+-NormalProgramTarget($(TARGET),$(OBJS),$(DEPCANNALIB16),$(CANNALIB16),)
++NormalProgramTarget($(TARGET),$(OBJS),,,)
+ InstallMultipleFlags($(TARGET),$(cannaBinDir),$(INSTUGIDFLAGS))
+ InstallManPage($(TARGET),$(cannaManDir))
+ DependTarget()
+ LintTarget()
++MakeCannaConfigH(cannaconf.h)
++
++clean::
++	$(RM) -f cannaconf.h
diff --git a/japanese/canuum/files/patch-ae b/japanese/canuum/files/patch-ae
new file mode 100644
index 000000000000..13f9adb2ed51
--- /dev/null
+++ b/japanese/canuum/files/patch-ae
@@ -0,0 +1,87 @@
+--- jhlp.c.orig	Thu Jan 21 21:52:56 1999
++++ jhlp.c	Thu Jan 21 21:56:35 1999
+@@ -76,6 +76,9 @@
+ 
+ jmp_buf kk_env;
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
+ #ifdef SYSVR2
+ #	include <sys/param.h>
+ #endif /* SYSVR2 */
+@@ -285,9 +288,11 @@
+ 
+ 
+ #if defined(BSD42) && !defined(DGUX)
++#if !(defined(BSD) && (BSD >= 199306))
+     if (saveutmp() < 0) {
+ 	puts("Can't save utmp\n");
+     }
++#endif
+ #endif /* BSD42 */
+ 
+ 
+@@ -781,7 +786,12 @@
+ #endif
+     int pid;
+ 
+-    if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
++/*
++ * Remove warning.
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
++ */
++/*  if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { */
++    if ((pid = wait3((int *)&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
+ 	if (WIFSTOPPED(status)) {
+ #ifdef SIGCONT
+ 	    kill(pid, SIGCONT);
+@@ -1174,9 +1184,11 @@
+ 	setpgrp(0, pid);
+ #endif /* BSD42 */
+ 
++#if !(defined(BSD) && (BSD >= 199306))
+ 	if (setutmp(ttypfd) == ERROR) {
+ 	    puts("Can't set utmp.");
+ 	} 
++#endif
+ 
+ #ifdef linux
+ 	setsid();
+@@ -1634,9 +1646,11 @@
+ 	perror(prog);
+     }
+ 
++#if !(defined(BSD) && (BSD >= 199306))
+     if (resetutmp(ttypfd) == ERROR) {
+ 	printf("Can't reset utmp.");
+     }
++#endif
+ #ifdef TIOCSSIZE
+     pty_rowcol.ts_lines = 0;
+     pty_rowcol.ts_cols = 0;
+@@ -1706,11 +1720,24 @@
+ char *b, *pty;
+ int no;
+ {
++/*
++ * Change pseudo-devices.
++ * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v].
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
++ */
+   if (no < 0x10 * ('z' - 'p' + 1)) {
++#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */
++    sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
++#else /* ! 4.4BSD-Lite */
+     sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f);
++#endif /* ! 4.4BSD-Lite */
+   } else {
+     no -= 0x10 * ('z' - 'p' + 1);
++#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */
++    sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
++#else /* ! 4.4BSD-Lite */
+     sprintf(b, "%s%1c%1x", pty, 'P' + (no >> 4), no & 0x0f);
++#endif /* ! 4.4BSD-Lite */
+   }
+ }
+