summaryrefslogtreecommitdiff
path: root/japanese/canuum/patches
diff options
context:
space:
mode:
Diffstat (limited to 'japanese/canuum/patches')
-rw-r--r--japanese/canuum/patches/patch-aa99
-rw-r--r--japanese/canuum/patches/patch-ac40
-rw-r--r--japanese/canuum/patches/patch-ae89
-rw-r--r--japanese/canuum/patches/patch-af13
4 files changed, 241 insertions, 0 deletions
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 <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/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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 02:53:11 +0000