diff options
Diffstat (limited to 'japanese/Canna/files')
-rw-r--r-- | japanese/Canna/files/patch-aa | 216 | ||||
-rw-r--r-- | japanese/Canna/files/patch-ab | 19 | ||||
-rw-r--r-- | japanese/Canna/files/patch-ac | 86 | ||||
-rw-r--r-- | japanese/Canna/files/patch-ad | 152 |
4 files changed, 324 insertions, 149 deletions
diff --git a/japanese/Canna/files/patch-aa b/japanese/Canna/files/patch-aa index 603875c8bca1..d649f0f8b812 100644 --- a/japanese/Canna/files/patch-aa +++ b/japanese/Canna/files/patch-aa @@ -1,149 +1,67 @@ -Index: canna/Canna.conf -diff -u canna/Canna.conf:1.1.1.1 canna/Canna.conf:1.2 ---- canna/Canna.conf:1.1.1.1 Tue Jun 20 09:45:46 1995 -+++ canna/Canna.conf Tue Jun 20 09:59:41 1995 -@@ -119,10 +119,10 @@ - cannaLibDir = /usr/local/canna/lib - cannaManDir = /usr/local/canna/man - cannaIncDir = /usr/local/canna/include/canna --libCannaDir = /usr/lib -+libCannaDir = /usr/local/lib - --ErrDir = /usr/spool/canna --LockDir = /usr/spool/canna/lock -+ErrDir = /var/spool/canna -+LockDir = /var/spool/canna/lock - - wcharDefinition = -DCANNA_WCHAR - Wlib = -@@ -135,7 +135,7 @@ - - pointerIntegerDef = - --cannaDsoRev = 1 -+cannaDsoRev = 1.0 - sharedLibExtension = so.$(cannaDsoRev) - - /* 以下の3つは root にならないでインストールするのであれば echo に -@@ -145,7 +145,7 @@ - CHMOD = chmod - - /* 日本語マニュアルを使わないのであればコメントアウト */ --#define JAPANESEMAN -+/* #define JAPANESEMAN */ - - /* locale ディレクトリを持っている場合は以下を記述する */ - /* #define LOCALE_DIR /usr/lib/locale */ -Index: canna/canna/protodefs.h -diff -u canna/canna/protodefs.h:1.1.1.1 canna/canna/protodefs.h:1.2 ---- canna/canna/protodefs.h:1.1.1.1 Tue Jun 20 09:45:47 1995 -+++ canna/canna/protodefs.h Tue Jun 20 09:59:47 1995 -@@ -77,6 +77,7 @@ - #define I16toI32(x) (x) - #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x)) - -+#if 0 - #ifdef HTONS /* hir, 1993.1.2 */ - #undef HTONS - #endif -@@ -85,6 +86,7 @@ - work = htons( (len) ) ; \ - bcopy( (char *)&work, (char *)(data), sizeof( short ) ) ; \ - } -+#endif - - #ifndef MIN - #define MIN( n, m ) ( ((unsigned)(n) > (unsigned)(m)) ? (m) : (n) ) -Index: canna/canna/widedef.h -diff -u canna/canna/widedef.h:1.1.1.1 canna/canna/widedef.h:1.2 ---- canna/canna/widedef.h:1.1.1.1 Tue Jun 20 09:45:48 1995 -+++ canna/canna/widedef.h Tue Jun 20 09:59:48 1995 -@@ -27,6 +27,10 @@ - #ifndef _WIDEDEF_H_ - #define _WIDEDEF_H_ - -+#if defined(__FreeBSD__) || defined(__NetBSD__) -+# include <machine/ansi.h> -+#endif -+ - #if __STDC__ || defined(SVR4) || defined(sun) /* This may be wrong. */ - # if !defined(WCHAR16) && !defined(CANNA_WCHAR) - # define HAVE_WCHAR_OPERATION -@@ -40,6 +44,18 @@ - #endif - #endif /* HAVE_WCHAR_OPERATION */ - -+#if defined(__FreeBSD__) || defined(__NetBSD__) -+# ifdef _BSD_WCHAR_T_ -+# undef _BSD_WCHAR_T_ -+# ifdef WCHAR16 -+# define _BSD_WCHAR_T_ unsigned short -+# else -+# define _BSD_WCHAR_T_ unsigned long -+# endif -+# include <stddef.h> -+# define _WCHAR_T -+# endif -+#else - #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \ - && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) - # ifdef WCHAR16 -@@ -54,5 +70,6 @@ - # define __WCHAR_T - # define _GCC_WCHAR_T - #endif -+#endif /* __FreeBSD__ || __NetBSD__ */ - - #endif /* _WIDEDEF_H_ */ -Index: canna/lib/RKC/Imakefile -diff -u canna/lib/RKC/Imakefile:1.1.1.1 canna/lib/RKC/Imakefile:1.2 ---- canna/lib/RKC/Imakefile:1.1.1.1 Tue Jun 20 09:46:30 1995 -+++ canna/lib/RKC/Imakefile Tue Jun 20 10:00:01 1995 -@@ -26,7 +26,7 @@ - - #if ProjectX > 5 - #define LibName RKC --#define SoRev cannaDsoRev -+#define SoRev cannaDsoRev - #define SHLIBDIR libCannaDir - #define USRLIBDIR libCannaDir - #define LibHeaders 0 -Index: canna/lib/RKC16/Imakefile -diff -u canna/lib/RKC16/Imakefile:1.1.1.1 canna/lib/RKC16/Imakefile:1.2 ---- canna/lib/RKC16/Imakefile:1.1.1.1 Tue Jun 20 09:46:31 1995 -+++ canna/lib/RKC16/Imakefile Tue Jun 20 10:00:03 1995 -@@ -23,7 +23,7 @@ - - #if ProjectX > 5 - #define LibName RKC16 --#define SoRev cannaDsoRev -+#define SoRev cannaDsoRev - #define SHLIBDIR libCannaDir - #define USRLIBDIR libCannaDir - #define LibHeaders 0 -Index: canna/lib/canna/Imakefile -diff -u canna/lib/canna/Imakefile:1.1.1.1 canna/lib/canna/Imakefile:1.2 ---- canna/lib/canna/Imakefile:1.1.1.1 Tue Jun 20 09:46:33 1995 -+++ canna/lib/canna/Imakefile Tue Jun 20 10:00:06 1995 -@@ -56,7 +56,7 @@ - - #if ProjectX > 5 - #define LibName canna --#define SoRev cannaDsoRev -+#define SoRev cannaDsoRev - #define SHLIBDIR libCannaDir - #define USRLIBDIR libCannaDir - #define LibHeaders 0 -Index: canna/lib/canna16/Imakefile -diff -u canna/lib/canna16/Imakefile:1.1.1.1 canna/lib/canna16/Imakefile:1.2 ---- canna/lib/canna16/Imakefile:1.1.1.1 Tue Jun 20 09:46:43 1995 -+++ canna/lib/canna16/Imakefile Tue Jun 20 10:00:08 1995 -@@ -58,7 +58,7 @@ - - #if ProjectX > 5 - #define LibName canna16 --#define SoRev cannaDsoRev -+#define SoRev cannaDsoRev - #define SHLIBDIR libCannaDir - #define USRLIBDIR libCannaDir - #define LibHeaders 0 +*** canna/protodefs.h.orig Wed Mar 9 16:01:53 1994 +--- canna/protodefs.h Sun Aug 11 06:54:35 1996 +*************** +*** 77,82 **** +--- 77,83 ---- + #define I16toI32(x) (x) + #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x)) + ++ #if 0 + #ifdef HTONS /* hir, 1993.1.2 */ + #undef HTONS + #endif +*************** +*** 85,90 **** +--- 86,92 ---- + work = htons( (len) ) ; \ + bcopy( (char *)&work, (char *)(data), sizeof( short ) ) ; \ + } ++ #endif + + #ifndef MIN + #define MIN( n, m ) ( ((unsigned)(n) > (unsigned)(m)) ? (m) : (n) ) +*** canna/widedef.h.orig Mon Jul 5 20:11:01 1993 +--- canna/widedef.h Sun Aug 11 06:54:35 1996 +*************** +*** 27,32 **** +--- 27,36 ---- + #ifndef _WIDEDEF_H_ + #define _WIDEDEF_H_ + ++ #if defined(__FreeBSD__) || defined(__NetBSD__) ++ # include <machine/ansi.h> ++ #endif ++ + #if __STDC__ || defined(SVR4) || defined(sun) /* This may be wrong. */ + # if !defined(WCHAR16) && !defined(CANNA_WCHAR) + # define HAVE_WCHAR_OPERATION +*************** +*** 40,45 **** +--- 44,61 ---- + #endif + #endif /* HAVE_WCHAR_OPERATION */ + ++ #if defined(__FreeBSD__) || defined(__NetBSD__) ++ # ifdef _BSD_WCHAR_T_ ++ # undef _BSD_WCHAR_T_ ++ # ifdef WCHAR16 ++ # define _BSD_WCHAR_T_ unsigned short ++ # else ++ # define _BSD_WCHAR_T_ unsigned long ++ # endif ++ # include <stddef.h> ++ # define _WCHAR_T ++ # endif ++ #else + #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \ + && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) + # ifdef WCHAR16 +*************** +*** 54,58 **** +--- 70,75 ---- + # define __WCHAR_T + # define _GCC_WCHAR_T + #endif ++ #endif /* __FreeBSD__ || __NetBSD__ */ + + #endif /* _WIDEDEF_H_ */ diff --git a/japanese/Canna/files/patch-ab b/japanese/Canna/files/patch-ab new file mode 100644 index 000000000000..9a734c3b8142 --- /dev/null +++ b/japanese/Canna/files/patch-ab @@ -0,0 +1,19 @@ +*** misc/Imakefile.orig Fri Jan 28 14:36:42 1994 +--- misc/Imakefile Sun Aug 11 09:02:42 1996 +*************** +*** 37,43 **** + #endif /* nec_ews_svr4 */ + + InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir)) +! InstallNamedNonExec(Readme,Readme,$(LockDir)) + InstallNonExec(is.c,$(cannaLibDir)/sample/src) + InstallNonExec(premountdics,$(DicDir)) + +--- 37,43 ---- + #endif /* nec_ews_svr4 */ + + InstallNamedNonExec(default.ca,default.canna,$(cannaLibDir)) +! /* InstallNamedNonExec(Readme,Readme,$(LockDir)) */ + InstallNonExec(is.c,$(cannaLibDir)/sample/src) + InstallNonExec(premountdics,$(DicDir)) + diff --git a/japanese/Canna/files/patch-ac b/japanese/Canna/files/patch-ac new file mode 100644 index 000000000000..ae6d5ad8aa87 --- /dev/null +++ b/japanese/Canna/files/patch-ac @@ -0,0 +1,86 @@ +*** Canna.conf.orig Wed Apr 12 22:15:03 1995 +--- Canna.conf Wed Sep 18 07:05:18 1996 +*************** +*** 114,128 **** + * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao 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 + +! ErrDir = /usr/spool/canna +! LockDir = /usr/spool/canna/lock + + wcharDefinition = -DCANNA_WCHAR + Wlib = +--- 114,128 ---- + * $Id: Canna.conf,v 2.10.1.2 1995/04/12 13:15:03 misao Exp $ + */ + +! cannaBinDir = ${PREFIX}/bin +! cannaSrvDir = ${PREFIX}/sbin +! cannaLibDir = ${PREFIX}/lib/canna +! cannaManDir = ${PREFIX}/man +! cannaIncDir = ${PREFIX}/include/canna +! libCannaDir = ${PREFIX}/lib + +! ErrDir = /var/log +! LockDir = /var/run + + wcharDefinition = -DCANNA_WCHAR + Wlib = +*************** +*** 135,141 **** + + pointerIntegerDef = + +! cannaDsoRev = 1 + sharedLibExtension = so.$(cannaDsoRev) + + /* 以下の3つは root にならないでインストールするのであれば echo に +--- 135,141 ---- + + pointerIntegerDef = + +! cannaDsoRev = 1.0 + sharedLibExtension = so.$(cannaDsoRev) + + /* 以下の3つは root にならないでインストールするのであれば echo に +*************** +*** 145,151 **** + CHMOD = chmod + + /* 日本語マニュアルを使わないのであればコメントアウト */ +! #define JAPANESEMAN + + /* locale ディレクトリを持っている場合は以下を記述する */ + /* #define LOCALE_DIR /usr/lib/locale */ +--- 145,151 ---- + CHMOD = chmod + + /* 日本語マニュアルを使わないのであればコメントアウト */ +! /* #define JAPANESEMAN */ + + /* locale ディレクトリを持っている場合は以下を記述する */ + /* #define LOCALE_DIR /usr/lib/locale */ +*************** +*** 178,184 **** + #define UseInstalledLibCanna NO + + DicDir = $(cannaLibDir)/dic +! LockFile = .CANNALOCK + + #ifdef NeXT + #define NO_X_ENV +--- 178,184 ---- + #define UseInstalledLibCanna NO + + DicDir = $(cannaLibDir)/dic +! LockFile = Canna.pid + + #ifdef NeXT + #define NO_X_ENV diff --git a/japanese/Canna/files/patch-ad b/japanese/Canna/files/patch-ad new file mode 100644 index 000000000000..ee597a8a40f7 --- /dev/null +++ b/japanese/Canna/files/patch-ad @@ -0,0 +1,152 @@ +*** cmd/cannakill/cannakill.man.orig Thu Jan 27 19:45:37 1994 +--- cmd/cannakill/cannakill.man Wed Aug 14 14:19:25 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $ + .TH CANNAKILL 1M + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: cannakill.man,v 1.5 1994/01/27 10:45:37 misao Exp $ + .TH CANNAKILL 1M + .SH "NAME" +*** cmd/catdic/addwords.man.orig Mon May 16 19:12:49 1994 +--- cmd/catdic/addwords.man Wed Aug 14 14:21:02 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $ + .TH ADDWORDS 1 + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: addwords.man,v 1.4 1994/05/16 10:12:49 hamada Exp $ + .TH ADDWORDS 1 + .SH "NAME" +*** cmd/catdic/delwords.man.orig Thu Oct 6 17:52:32 1994 +--- cmd/catdic/delwords.man Wed Aug 14 14:21:54 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $ + .TH DELWORDS 1 + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: delwords.man,v 1.4 1994/10/06 08:52:32 misao Exp $ + .TH DELWORDS 1 + .SH "NAME" +*** cmd/catdic/mvdic.man.orig Thu Jan 27 19:46:54 1994 +--- cmd/catdic/mvdic.man Wed Aug 14 14:23:06 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $ + .TH MVDIC 1 + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: mvdic.man,v 1.2 1994/01/27 10:46:54 misao Exp $ + .TH MVDIC 1 + .SH "NAME" +*** cmd/catdic/cpdic.man.orig Thu Jan 27 19:46:34 1994 +--- cmd/catdic/cpdic.man Wed Aug 14 14:23:37 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $ + .TH CPDIC 1 + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: cpdic.man,v 1.2 1994/01/27 10:46:34 misao Exp $ + .TH CPDIC 1 + .SH "NAME" +*** cmd/catdic/catdic.man.orig Thu Jan 27 19:46:29 1994 +--- cmd/catdic/catdic.man Wed Aug 14 14:24:25 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $ + .TH CATDIC 1 + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: catdic.man,v 1.2 1994/01/27 10:46:29 misao Exp $ + .TH CATDIC 1 + .SH "NAME" +*** cmd/catdic/mkdic.man.orig Thu Jan 27 19:46:50 1994 +--- cmd/catdic/mkdic.man Wed Aug 14 14:25:02 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $ + .TH MKDIC 1 + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: mkdic.man,v 1.2 1994/01/27 10:46:50 misao Exp $ + .TH MKDIC 1 + .SH "NAME" +*** cmd/catdic/lsdic.man.orig Thu Jan 27 19:46:45 1994 +--- cmd/catdic/lsdic.man Wed Aug 14 14:25:32 1996 +*************** +*** 18,24 **** + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! + .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $ + .TH LSDIC 1 + .SH "NAME" +--- 18,24 ---- + .\" USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + .\" OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + .\" PERFORMANCE OF THIS SOFTWARE. +! .\" + .\" $Id: lsdic.man,v 1.2 1994/01/27 10:46:45 misao Exp $ + .TH LSDIC 1 + .SH "NAME" |