diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-09-27 05:07:14 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-09-27 05:07:14 +0000 |
| commit | 40ac7bbee89102bc480d4a80efd37c1203cd9aec (patch) | |
| tree | cdc7d87f0ea83852a9439c6f47cf63ef64617a33 /japanese/onew/files | |
| parent | Broken on ELF boxes. (diff) | |
Fix for 3.0-current. (Caused by regex.h difference)
PR: ports/7747
Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
Notes
Notes:
svn path=/head/; revision=13443
Diffstat (limited to 'japanese/onew/files')
| -rw-r--r-- | japanese/onew/files/ONEW_CONF-for-canna+wnn6 | 2 | ||||
| -rw-r--r-- | japanese/onew/files/ONEW_CONF-for-wnn6 | 2 | ||||
| -rw-r--r-- | japanese/onew/files/patch-aa | 12 | ||||
| -rw-r--r-- | japanese/onew/files/patch-ab | 12 |
4 files changed, 26 insertions, 2 deletions
diff --git a/japanese/onew/files/ONEW_CONF-for-canna+wnn6 b/japanese/onew/files/ONEW_CONF-for-canna+wnn6 index 719a053d75e5..0cbb7a50735a 100644 --- a/japanese/onew/files/ONEW_CONF-for-canna+wnn6 +++ b/japanese/onew/files/ONEW_CONF-for-canna+wnn6 @@ -1,7 +1,7 @@ WNNINC = -I%X11BASE%/include/wnn WNNLIB = -L%X11BASE%/lib -ljd WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan tankan3 zip ikeiji symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' +WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' CANNAINC = -I%LOCALBASE%/include CANNAOBJ = Canna.o CannaRk.o diff --git a/japanese/onew/files/ONEW_CONF-for-wnn6 b/japanese/onew/files/ONEW_CONF-for-wnn6 index d62d5ad33ae5..c335244a06bd 100644 --- a/japanese/onew/files/ONEW_CONF-for-wnn6 +++ b/japanese/onew/files/ONEW_CONF-for-wnn6 @@ -1,7 +1,7 @@ WNNINC = -I%X11BASE%/include/wnn WNNLIB = -L%X11BASE%/lib -ljd WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan tankan3 zip ikeiji symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' +WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' RKKLIBS = $(WNNLIB) RKKOBJS = $(WNNOBJ) diff --git a/japanese/onew/files/patch-aa b/japanese/onew/files/patch-aa new file mode 100644 index 000000000000..b6c74d038948 --- /dev/null +++ b/japanese/onew/files/patch-aa @@ -0,0 +1,12 @@ +--- sys/regex.c.orig Fri Jun 30 13:56:01 1995 ++++ ./sys/regex.c Wed Aug 26 03:14:57 1998 +@@ -41,6 +41,9 @@ + #include <stdio.h> + #include <sys/types.h> + #endif ++#if __FreeBSD__ >= 3 ++#include <sys/types.h> ++#endif + #include <regex.h> + + static regex_t REXP; diff --git a/japanese/onew/files/patch-ab b/japanese/onew/files/patch-ab new file mode 100644 index 000000000000..0ba76c0afe2c --- /dev/null +++ b/japanese/onew/files/patch-ab @@ -0,0 +1,12 @@ +--- conf.c.~1~ Thu Jun 23 11:42:33 1994 ++++ conf.c Mon Sep 14 15:48:41 1998 +@@ -220,7 +220,8 @@ + #define IR(func) (romkan_select() ? func : 0) + #define ONEWromkan_ready(rkpath) IR((*RP->rk_ready)(rkpath)) + #define ONEWromkan_modesw(mode) IR((*RP->rk_modesw)(mode)) +-#define ONEWromkan_clear() IR((*RP->rk_gotch)()) ++/*#define ONEWromkan_clear() IR((*RP->rk_gotch)())*/ ++#define ONEWromkan_clear() IR((*RP->rk_clear)()) + #define ONEWromkan_getc() IR((*RP->rk_getc)()) + #define ONEWromkan_next() IR((*RP->rk_next)()) + #define ONEWromkan_dispmode() IR((*RP->rk_dispmode)()) |