Reimport of package canuum from japanese/canuum into inputmethod/canuum.

This is part of the japanese category retirement.
CATEGORIES and pathnames to japanese/ adjusted.

8 files changed, 288 insertions, 0 deletions

diff --git a/inputmethod/canuum/DESCR b/inputmethod/canuum/DESCR
new file mode 100644
index 00000000000..83d03c9a51b
--- /dev/null
+++ b/inputmethod/canuum/DESCR
@@ -0,0 +1 @@
+Canuum is a Japanese input frontend program from Wnn tty frontend uum. 
diff --git a/inputmethod/canuum/Makefile b/inputmethod/canuum/Makefile
new file mode 100644
index 00000000000..195e6638e37
--- /dev/null
+++ b/inputmethod/canuum/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+#
+
+DISTNAME=	canuum-1.0
+CATEGORIES=	japanese inputmethod
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
+DISTFILES=	Uum4.109.tar.gz Canna35b2.tar.gz
+EXTRACT_ONLY=	Uum4.109.tar.gz
+
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.nec.co.jp/japanese/product/computer/soft/canna/
+COMMENT=	Japanese input tty frontend for Canna using uum
+
+DEPENDS=	Canna-lib>=3.5.2:../../inputmethod/canna-lib
+
+MANLANG=	ja
+MAN1=		canuum.1
+MAKE_ARGS=	PREFIX=${PREFIX}
+WRKSRC=		${WRKDIR}/Canna35b2/canuum
+USE_X11BASE=	yes
+
+post-extract:
+	@${GTAR} -xzf ${DISTDIR}/Canna35b2.tar.gz -C ${WRKDIR} \
+		Canna35b2/Canna.conf Canna35b2/canuum
+	@${MV} ${WRKDIR}/Canna35b2/Canna.conf ${WRKSRC}/
+	@${CP} ${WRKDIR}/Uum4.109/* ${WRKSRC}
+
+pre-patch:
+	@(cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < Canuum.patch)
+
+do-configure:
+	@(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} ${MAKE_ARGS} Makefile; \
+	${MAKE} ${MAKE_ARGS} cannaconf.h; ${MAKE} ${MAKE_ARGS} depend)
+
+do-build:
+	@(cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} all)
+
+post-install:
+	@${INSTALL_MAN} ${WRKSRC}/canuum.jmn ${PREFIX}/man/ja_JP.EUC/man1/canuum.1
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canuum/PLIST b/inputmethod/canuum/PLIST
new file mode 100644
index 00000000000..69e9733dd2e
--- /dev/null
+++ b/inputmethod/canuum/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+bin/canuum
+man/ja_JP.EUC/man1/canuum.1
diff --git a/inputmethod/canuum/distinfo b/inputmethod/canuum/distinfo
new file mode 100644
index 00000000000..48f42a775f3
--- /dev/null
+++ b/inputmethod/canuum/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+
+SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e
+Size (Uum4.109.tar.gz) = 43738 bytes
+SHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
+Size (Canna35b2.tar.gz) = 1333329 bytes
+SHA1 (patch-aa) = 84e341fabc592fc5579d0c8b258b6e13809e8473
+SHA1 (patch-ac) = 8bcd6abc9d36305c86cf4f5993c4895a1e7c86e1
+SHA1 (patch-ae) = 1ef38a6651f2f619c15d68032787be694a2fa970
+SHA1 (patch-af) = 5860402e3dc72e0d6ddaffc6cf33c017c7e19a34
diff --git a/inputmethod/canuum/patches/patch-aa b/inputmethod/canuum/patches/patch-aa
new file mode 100644
index 00000000000..3e96615edfd
--- /dev/null
+++ b/inputmethod/canuum/patches/patch-aa
@@ -0,0 +1,91 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+
+--- Canna.conf.orig	Thu Nov 28 11:27:01 1996
++++ Canna.conf	Wed Dec  8 10:14:38 1999
+@@ -129,19 +129,19 @@
+  */
+ 
+-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}/share/canna
++cannaManDir = ${PREFIX}/man/ja_JP.EUC
++cannaIncDir = ${PREFIX}/include/canna
++libCannaDir = ${PREFIX}/lib
+ 
+-ErrDir  = /usr/spool/canna
++ErrDir  = ${CANNA_SPOOL}
+ 
+ wcharDefinition = -DCANNA_WCHAR
+ Wlib =
+-JapaneseLocale = japanese
++JapaneseLocale = ja_JP.eucJP
+ 
+-cannaOwner = bin
+-cannaGroup = bin
++cannaOwner = ${CANNAOWNER}
++cannaGroup = ${CANNAGROUP}
+ 
+ cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
+@@ -149,5 +149,5 @@
+ pointerIntegerDef =
+ 
+-cannaDsoRev = 1
++cannaDsoRev = 1.0
+     /* SunOS 4.x をお使いの方で shared object を利用する場合には
+             cannaDsoRev = 1.1
+@@ -202,8 +202,7 @@
+  * コマンド類をリンクする時は、次を YES にしてくだい。
+  */
+-/* #define UseInstalledLibCanna YES */
+-#define UseInstalledLibCanna NO
++#define UseInstalledLibCanna YES
+ 
+-DicDir   = $(cannaLibDir)/dic
++DicDir   = ${DICT_DIR}/canna
+ 
+ #ifdef NeXT
+@@ -240,16 +239,16 @@
+ #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$(libCannaDir) -lcanna $(DLLIB)
+ #endif /* UseInstalledLibCanna */
+ 
+@@ -260,12 +259,12 @@
+     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$(libCannaDir) -lcanna16 $(DLLIB)
+ #endif /* UseInstalledLibCanna */
+ 
diff --git a/inputmethod/canuum/patches/patch-ac b/inputmethod/canuum/patches/patch-ac
new file mode 100644
index 00000000000..1a89673b3c1
--- /dev/null
+++ b/inputmethod/canuum/patches/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+
+--- 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/inputmethod/canuum/patches/patch-ae b/inputmethod/canuum/patches/patch-ae
new file mode 100644
index 00000000000..8089d56e34b
--- /dev/null
+++ b/inputmethod/canuum/patches/patch-ae
@@ -0,0 +1,89 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+
+--- 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 */
+   }
+ }
+ 
diff --git a/inputmethod/canuum/patches/patch-af b/inputmethod/canuum/patches/patch-af
new file mode 100644
index 00000000000..329b60249cc
--- /dev/null
+++ b/inputmethod/canuum/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+
+--- sheader.h.orig	Tue Aug 17 17:47:04 1999
++++ sheader.h	Tue Aug 17 17:48:00 1999
+@@ -336,7 +336,7 @@
+ extern void set_keypad_on();
+ extern void set_keypad_off();
+ extern void set_scroll_region();
+-#if defined(linux) || defined(__FreeBSD__) || defined(__MACHTEN__)
++#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MACHTEN__)
+ #define HAVE_SETENV
+ #endif
+ #ifndef HAVE_SETENV