From: masa-k@sag.hitachi-sk.co.jp (Masayuki Koba)
Subject: Canna22b2 patch for 386BSD 0.1
Organization: Hitachi Software Engineering Co.,Ltd., Yokohama, Japan
Distribution: fj
Date: Tue, 26 Jan 1993 03:04:04 GMT

$@!!8E>l$H?=$7$^$9!#(J

$@!!$+$s$J(J Version 2.2 $@&B(J2 (Canna22b2) $@$r(J 386BSD 0.1 $@>e$GF0$+$9$3$H$,(J
$@$G$-$^$7$?$N$G!"%Q%C%A$rN.$7$^$9!#(J

# kinput2 $@$b!"C`<!<+F0JQ49%b!<%I$G%5%/%5%/F0$-$^$9$h!#(J:-)

::::::::

$@!Z(JCanna22b2 $@$N!"(J386BSD 0.1 $@$X$N%$%s%9%H!<%kJ}K!![(J

(1) $@<!$N%Q%C%A$r(J /usr/include/stddef.h $@$K$"$F$^$9!#(J

----$@!!(J/usr/include/stddef.h $@$X$N%Q%C%A(J ($@$3$3$+$i(J)$@!!(J----
*** stddef.h-	Sat Feb 29 09:13:17 1992
--- stddef.h	Sat Jan 23 17:51:51 1993
***************
*** 45,53 ****
--- 45,60 ----
  #undef	_SIZE_T_
  #endif
  
+ #if 0
  #ifdef	_WCHAR_T_
  typedef	_WCHAR_T_	wchar_t;
  #undef	_WCHAR_T_
+ #endif
+ #else
+ #ifndef	_WCHAR_T
+ #define	_WCHAR_T
+ typedef	unsigned long	wchar_t;
+ #endif
  #endif
  
  #ifndef	NULL
----$@!!(J/usr/include/stddef.h $@$X$N%Q%C%A(J ($@$3$3$^$G(J)$@!!(J----

(2) cmd/itoc/lex.l $@$H(J ccustom/lex.l $@$r#W#S>e$N(J lex $@$KDL$7$F(J
$@!!(Jcmd/itoc/lex.yy.c $@$H(J ccustom/lex.yy.c $@$r:n$j!"(J386BSD $@$K(J
$@!!;}$C$F9T$-$^$9!#(J

(3) Canna22b2 $@$K0J2<$N%Q%C%A$r$"$F$^$9!#8e$O(JINSTALL.j $@$K=>$C$F(J
$@!!2<$5$$!#(J(xmkmf; make canna $@$7$?8e$K(J make install $@$9$l$P$*$7(J
$@!!$^$$$G$9!#(J)

$@Cm(J1: imake $@$=$NB>$r;H$&4X78>e!"(JXFree86 1.1 $@$N4D6-$OI,?\$G$9!#(J

$@Cm(J2: config.sh $@$K$"$k(J
	libCannaDir = /usr/local/lib
     $@$H(J
	JapaneseLocale = ja_JP.mscode
     $@$O!";d$N<qL#$G$9!#(J:-)

----$@!!(JCanna22b2 $@$X$N%Q%C%A(J ($@$3$3$+$i(J)$@!!(J----
*** config.sh-	Fri Dec 11 13:16:47 1992
--- config.sh	Thu Jan 21 15:54:56 1993
***************
*** 58,72 ****
  cannaSrvDir = /usr/local/canna/bin
  cannaLibDir = /usr/local/canna/lib
  cannaIncDir = /usr/local/canna/include/canna
! libCannaDir = /usr/lib
  DicDir = $(cannaLibDir)/dic
! ErrDir = /usr/spool/canna
! LockDir = /usr/spool/canna/lock
  LockFile = .CANNALOCK
  
  wcharDefinition = -DCANNA_WCHAR
  Wlib =
! JapaneseLocale = japanese
  
  sharedLibExtention = so.1
  
--- 58,72 ----
  cannaSrvDir = /usr/local/canna/bin
  cannaLibDir = /usr/local/canna/lib
  cannaIncDir = /usr/local/canna/include/canna
! libCannaDir = /usr/local/lib
  DicDir = $(cannaLibDir)/dic
! ErrDir = /var/spool/canna
! LockDir = /var/spool/canna/lock
  LockFile = .CANNALOCK
  
  wcharDefinition = -DCANNA_WCHAR
  Wlib =
! JapaneseLocale = ja_JP.mscode
  
  sharedLibExtention = so.1
  
*** canna/jrkanji.h-	Mon Jan 11 20:54:12 1993
--- canna/jrkanji.h	Fri Jan 22 15:34:31 1993
***************
*** 32,39 ****
  #define _JR_KANJI_H_
  
  #ifndef _WCHAR_T
! # if defined(WCHAR_T) || defined(_WCHAR_T_) || defined(__WCHAR_T) \
!   || defined(_GCC_WCHAR_T)
  #  define _WCHAR_T
  # endif
  #endif
--- 32,39 ----
  #define _JR_KANJI_H_
  
  #ifndef _WCHAR_T
! # if (defined(WCHAR_T) || defined(_WCHAR_T_) || defined(__WCHAR_T) \
!   || defined(_GCC_WCHAR_T)) && !defined(__386BSD__)
  #  define _WCHAR_T
  # endif
  #endif
*** lib/canna/lisp.c-	Wed Nov  4 21:20:40 1992
--- lib/canna/lisp.c	Sat Jan 23 17:25:36 1993
***************
*** 28,35 ****
  ** main program of lisp 
  */
  
- #include <signal.h>
  #include "lisp.h"
  
  extern char *malloc(), *calloc(), *realloc();
  
--- 28,35 ----
  ** main program of lisp 
  */
  
  #include "lisp.h"
+ #include <signal.h>
  
  extern char *malloc(), *calloc(), *realloc();
  
*** lib/RKC/Imakefile-	Fri Nov 27 21:52:27 1992
--- lib/RKC/Imakefile	Thu Jan 21 15:59:49 1993
***************
*** 31,34 ****
  
  DependTarget()
  
! /**/ # LinkFileList(includes,$(HEADER), $(CANNAROOT)/include,../lib/RKC)
--- 31,34 ----
  
  DependTarget()
  
! /**/# LinkFileList(includes,$(HEADER), $(CANNAROOT)/include,../lib/RKC)
*** lib/RK/RK.h-	Wed Jan 13 12:04:41 1993
--- lib/RK/RK.h	Fri Jan 22 14:44:45 1993
***************
*** 8,15 ****
  #define		_RK_h
  
  #ifndef _WCHAR_T
! # if defined(WCHAR_T) || defined(_WCHAR_T_) || defined(__WCHAR_T) \
!   || defined(_GCC_WCHAR_T)
  #  define _WCHAR_T
  # endif
  #endif
--- 8,15 ----
  #define		_RK_h
  
  #ifndef _WCHAR_T
! # if (defined(WCHAR_T) || defined(_WCHAR_T_) || defined(__WCHAR_T) \
!   || defined(_GCC_WCHAR_T)) && !defined(__386BSD__)
  #  define _WCHAR_T
  # endif
  #endif
*** lib/RK/RKngram.c-	Wed Dec  2 15:02:18 1992
--- lib/RK/RKngram.c	Thu Jan 21 16:08:00 1993
***************
*** 28,34 ****
--- 28,36 ----
  
  /* LINTLIBRARY */
  #include	<stdio.h>
+ #if !(defined(__386BSD__) || defined(sony_news))
  #include	<malloc.h>
+ #endif
  #ifdef SVR4
  #include	<unistd.h>
  #endif
*** lib/RK/RKpermdic.c-	Wed Dec  2 15:02:20 1992
--- lib/RK/RKpermdic.c	Thu Jan 21 16:07:08 1993
***************
*** 29,35 ****
--- 29,37 ----
  
  /* LINTLIBRARY */
  #include	<stdio.h>
+ #if !(defined(__386BSD__) || defined(sony_news))
  #include	<malloc.h>
+ #endif
  #ifdef SVR4
  #include	<unistd.h>
  #endif
*** dic/romdic/Imakefile-	Wed Dec  2 13:24:47 1992
--- dic/romdic/Imakefile	Thu Jan 21 15:58:46 1993
***************
*** 79,90 ****
  InstallNonExec(sokuon.kpdef,$(SAMPLESRCDIR))
  InstallNonExec(english.kpdef,$(SAMPLESRCDIR))
  
! /**/ #InstallNonExec(default.rdef,$(SAMPLESRCDIR))
! /**/ #InstallNonExec(jdaemon.rdef,$(SAMPLESRCDIR))
! /**/ #InstallNonExec(just.rdef,$(SAMPLESRCDIR))
! /**/ #InstallNonExec(kana.rdef,$(SAMPLESRCDIR))
! /**/ #InstallNonExec(newjis.rdef,$(SAMPLESRCDIR))
! /**/ #InstallNonExec(romaji.rdef,$(SAMPLESRCDIR))
  
  clean::
  	$(RM) $(ROMKANA_TABLES)
--- 79,90 ----
  InstallNonExec(sokuon.kpdef,$(SAMPLESRCDIR))
  InstallNonExec(english.kpdef,$(SAMPLESRCDIR))
  
! /**/#InstallNonExec(default.rdef,$(SAMPLESRCDIR))
! /**/#InstallNonExec(jdaemon.rdef,$(SAMPLESRCDIR))
! /**/#InstallNonExec(just.rdef,$(SAMPLESRCDIR))
! /**/#InstallNonExec(kana.rdef,$(SAMPLESRCDIR))
! /**/#InstallNonExec(newjis.rdef,$(SAMPLESRCDIR))
! /**/#InstallNonExec(romaji.rdef,$(SAMPLESRCDIR))
  
  clean::
  	$(RM) $(ROMKANA_TABLES)
*** dic/cadic/grammar/Imakefile-	Tue Jan 12 22:40:22 1993
--- dic/cadic/grammar/Imakefile	Sun Jan 24 12:22:25 1993
***************
*** 7,13 ****
--- 7,15 ----
           FORCPP = $(CANNACMDDIR)/forcpp/forcpp
          FORSORT = $(CANNACMDDIR)/forsort/forsort
             SORT = sort
+ #ifndef	__386BSD__
              CPP = /lib/cpp
+ #endif
  
          CRXGRAM = $(CANNACMDDIR)/crxgram/crxgram
           CRXDIC = $(CANNACMDDIR)/crxdic/crxdic
*** cmd/mkromdic/Imakefile-	Mon Jan 11 19:57:53 1993
--- cmd/mkromdic/Imakefile	Thu Jan 21 16:19:28 1993
***************
*** 8,13 ****
--- 8,16 ----
  #else
          DEFINES = $(SCRIPTS_DEFINES)
  #endif
+ #ifdef	__386BSD__
+    INSTPGMFLAGS =
+ #endif
  
  AllTarget($(PROGRAMS))
  
*** cmd/mkbindic/Imakefile-	Mon Jan 11 19:56:28 1993
--- cmd/mkbindic/Imakefile	Thu Jan 21 16:18:58 1993
***************
*** 8,13 ****
--- 8,16 ----
  #else
          DEFINES = $(SCRIPTS_DEFINES)
  #endif
+ #ifdef	__386BSD__
+    INSTPGMFLAGS =
+ #endif
  
  AllTarget($(PROGRAMS))
  
*** cmd/dpbindic/Imakefile-	Mon Jan 11 19:55:34 1993
--- cmd/dpbindic/Imakefile	Thu Jan 21 16:17:24 1993
***************
*** 8,13 ****
--- 8,16 ----
  #else
          DEFINES = $(SCRIPTS_DEFINES)
  #endif
+ #ifdef	__386BSD__
+    INSTPGMFLAGS =
+ #endif
  
  AllTarget($(PROGRAMS))
  
*** cmd/canvert/Imakefile-	Mon Jan 11 19:53:38 1993
--- cmd/canvert/Imakefile	Thu Jan 21 16:16:14 1993
***************
*** 8,13 ****
--- 8,16 ----
  #else
          DEFINES = $(SCRIPTS_DEFINES)
  #endif
+ #ifdef	__386BSD__
+    INSTPGMFLAGS =
+ #endif
  
  AllTarget($(PROGRAMS))
  
*** cmd/cannakill/Imakefile-	Mon Jan 11 19:52:52 1993
--- cmd/cannakill/Imakefile	Thu Jan 21 16:38:08 1993
***************
*** 8,13 ****
--- 8,16 ----
  #else
          DEFINES = $(SCRIPTS_DEFINES)
  #endif
+ #ifdef	__386BSD__
+    INSTPGMFLAGS =
+ #endif
  
  AllTarget($(PROGRAMS))
  
*** cmd/itoc/Imakefile-	Fri Jun  5 10:44:04 1992
--- cmd/itoc/Imakefile	Sun Jan 24 12:24:55 1993
***************
*** 14,23 ****
--- 14,31 ----
  	mv y.tab.h gram.h
  	mv y.tab.c gram.c
  
+ #ifndef	__386BSD__
  lex.c: gram.o lex.l
  
  clean::
  	$(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c
+ #else	/* __386BSD__ */
+ lex.c: gram.o lex.yy.c
+ 	cp lex.yy.c lex.c
+ 
+ clean::
+ 	$(RM) y.tab.h y.tab.c gram.h gram.c lex.c
+ #endif	/* __386BSD__ */
  
  SingleProgramTarget(itoc,$(OBJS),,$(SYS_LIBRARIES))
  InstallProgram(itoc,$(cannaBinDir))
*** ccustom/Imakefile-	Wed Jun 17 10:27:19 1992
--- ccustom/Imakefile	Sun Jan 24 12:26:25 1993
***************
*** 31,44 ****
  
  depend:: gram.h gram.c lex.c
  gram.h gram.c:  gram.y iroha.h mfdef.h
!         yacc -d gram.y
!         mv y.tab.h gram.h
!         mv y.tab.c gram.c
  
  lex.c: gram.o lex.l
  
  clean::
          $(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c
  
  AllTarget(ccustom)
  NormalProgramTarget(ccustom,$(OBJS),,,$(SYS_LIBRARIES))
--- 31,52 ----
  
  depend:: gram.h gram.c lex.c
  gram.h gram.c:  gram.y iroha.h mfdef.h
! 	yacc -d gram.y
! 	mv y.tab.h gram.h
! 	mv y.tab.c gram.c
  
+ #ifndef	__386BSD__
  lex.c: gram.o lex.l
  
  clean::
          $(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c
+ #else	/* __386BSD__ */
+ lex.c: gram.o lex.yy.c
+ 	cp lex.yy.c lex.c
+ 
+ clean::
+         $(RM) y.tab.h y.tab.c gram.h gram.c lex.c
+ #endif	/* __386BSD__ */
  
  AllTarget(ccustom)
  NormalProgramTarget(ccustom,$(OBJS),,,$(SYS_LIBRARIES))
----$@!!(JCanna22b2 $@$X$N%Q%C%A(J ($@$3$3$^$G(J)$@!!(J----

-- 
$@8E>l(J $@@59T(J ($@$3$P(J $@$^$5$f$-(J)              (((((((
  E-mail: masa-k@sag.hitachi-sk.co.jp   )$@"_(J $@"_(J)
                                       (  v  __
                                        $@!5(J-$@!R(J/
Newsgroups: fj.os.386bsd