From 81aac40a7b3ca91a6b41f03ec49644c0c76a1b1b Mon Sep 17 00:00:00 2001 From: sakamoto Date: Fri, 27 Aug 1999 04:09:27 +0000 Subject: Japanese input tty frontend for Canna using uum by Osamu OISHI . --- japanese/canuum/Makefile | 39 ++++++++++++++++ japanese/canuum/files/md5 | 3 ++ japanese/canuum/files/patch-sum | 6 +++ japanese/canuum/patches/patch-aa | 99 ++++++++++++++++++++++++++++++++++++++++ japanese/canuum/patches/patch-ac | 40 ++++++++++++++++ japanese/canuum/patches/patch-ae | 89 ++++++++++++++++++++++++++++++++++++ japanese/canuum/patches/patch-af | 13 ++++++ japanese/canuum/pkg/COMMENT | 1 + japanese/canuum/pkg/DESCR | 1 + japanese/canuum/pkg/PLIST | 3 ++ 10 files changed, 294 insertions(+) create mode 100644 japanese/canuum/Makefile create mode 100644 japanese/canuum/files/md5 create mode 100644 japanese/canuum/files/patch-sum create mode 100644 japanese/canuum/patches/patch-aa create mode 100644 japanese/canuum/patches/patch-ac create mode 100644 japanese/canuum/patches/patch-ae create mode 100644 japanese/canuum/patches/patch-af create mode 100644 japanese/canuum/pkg/COMMENT create mode 100644 japanese/canuum/pkg/DESCR create mode 100644 japanese/canuum/pkg/PLIST diff --git a/japanese/canuum/Makefile b/japanese/canuum/Makefile new file mode 100644 index 00000000000..b1dedb08cca --- /dev/null +++ b/japanese/canuum/Makefile @@ -0,0 +1,39 @@ +# $NetBSD: Makefile,v 1.1.1.1 1999/08/27 04:09:27 sakamoto Exp $ +# + +DISTNAME= canuum-1.0 +CATEGORIES= japanese +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/ + +DEPENDS= Canna-lib-3.5b2:../../japanese/canna-lib + +MANLANG= ja +MAN1= canuum.1 +MAKE_ARGS= PREFIX=${PREFIX} +WRKSRC= ${WRKDIR}/Canna35b2/canuum + +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}; 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/japanese/canuum/files/md5 b/japanese/canuum/files/md5 new file mode 100644 index 00000000000..76fa78ca5c1 --- /dev/null +++ b/japanese/canuum/files/md5 @@ -0,0 +1,3 @@ +$NetBSD: md5,v 1.1.1.1 1999/08/27 04:09:27 sakamoto Exp $ +MD5 (Uum4.109.tar.gz) = f7b322ad8d3a98fc22f598c129ab42bb +MD5 (Canna35b2.tar.gz) = 09ae4dd3a5d33168ba17470ad9242cf3 diff --git a/japanese/canuum/files/patch-sum b/japanese/canuum/files/patch-sum new file mode 100644 index 00000000000..a6ff47826e6 --- /dev/null +++ b/japanese/canuum/files/patch-sum @@ -0,0 +1,6 @@ +$NetBSD: patch-sum,v 1.1.1.1 1999/08/27 04:09:27 sakamoto Exp $ + +MD5 (patch-aa) = 1880dca969f71e08cbf8ddf1f8bc9ee0 +MD5 (patch-ac) = 01c5c1cfb063dfaf4d6f31d28b734490 +MD5 (patch-ae) = 89d71a62de97ec53f6d8dc2af0ab6b9d +MD5 (patch-af) = 9cb91bea1ee13f95adee8bfcd4627e66 diff --git a/japanese/canuum/patches/patch-aa b/japanese/canuum/patches/patch-aa new file mode 100644 index 00000000000..59ee04dd7a6 --- /dev/null +++ b/japanese/canuum/patches/patch-aa @@ -0,0 +1,99 @@ +$NetBSD: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ + +--- Canna.conf.orig Thu Nov 28 19:27:01 1996 ++++ Canna.conf Fri Aug 27 10:04:28 1999 +@@ -128,27 +128,27 @@ + * $Id: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ + */ + +-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) + + pointerIntegerDef = + +-cannaDsoRev = 1 ++cannaDsoRev = 1.0 + /* SunOS 4.x をお使いの方で shared object を利用する場合には + cannaDsoRev = 1.1 + と指定してください。また、FreeBSD を利用する場合は、 +@@ -201,10 +201,9 @@ + * インストール済みの共有ライブラリを用いて Canna の + * コマンド類をリンクする時は、次を YES にしてくだい。 + */ +-/* #define UseInstalledLibCanna YES */ +-#define UseInstalledLibCanna NO ++#define UseInstalledLibCanna YES + +-DicDir = $(cannaLibDir)/dic ++DicDir = ${DICT_DIR}/canna + + #ifdef NeXT + #define NO_X_ENV +@@ -239,18 +238,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$(libCannaDir) -lcanna $(DLLIB) + #endif /* UseInstalledLibCanna */ + + #if UseInstalledLibCanna +@@ -259,14 +258,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$(libCannaDir) -lcanna16 $(DLLIB) + #endif /* UseInstalledLibCanna */ + + /* diff --git a/japanese/canuum/patches/patch-ac b/japanese/canuum/patches/patch-ac new file mode 100644 index 00000000000..37ace83a1fa --- /dev/null +++ b/japanese/canuum/patches/patch-ac @@ -0,0 +1,40 @@ +$NetBSD: patch-ac,v 1.1.1.1 1999/08/27 04:09:28 sakamoto 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/japanese/canuum/patches/patch-ae b/japanese/canuum/patches/patch-ae new file mode 100644 index 00000000000..a83b544206c --- /dev/null +++ b/japanese/canuum/patches/patch-ae @@ -0,0 +1,89 @@ +$NetBSD: patch-ae,v 1.1.1.1 1999/08/27 04:09:28 sakamoto 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 ++#endif + #ifdef SYSVR2 + # include + #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/japanese/canuum/patches/patch-af b/japanese/canuum/patches/patch-af new file mode 100644 index 00000000000..b746a7d16d9 --- /dev/null +++ b/japanese/canuum/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 1999/08/27 04:09:28 sakamoto 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 diff --git a/japanese/canuum/pkg/COMMENT b/japanese/canuum/pkg/COMMENT new file mode 100644 index 00000000000..e110d5b9ca0 --- /dev/null +++ b/japanese/canuum/pkg/COMMENT @@ -0,0 +1 @@ +Japanese input tty frontend for Canna using uum diff --git a/japanese/canuum/pkg/DESCR b/japanese/canuum/pkg/DESCR new file mode 100644 index 00000000000..83d03c9a51b --- /dev/null +++ b/japanese/canuum/pkg/DESCR @@ -0,0 +1 @@ +Canuum is a Japanese input frontend program from Wnn tty frontend uum. diff --git a/japanese/canuum/pkg/PLIST b/japanese/canuum/pkg/PLIST new file mode 100644 index 00000000000..e1cfd37ed60 --- /dev/null +++ b/japanese/canuum/pkg/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ +bin/canuum +man/ja_JP.EUC/man1/canuum.1 -- cgit v1.2.3