1 files changed, 17 insertions, 82 deletions
diff --git a/japanese/FreeWnn-lib/files/patch-aa b/japanese/FreeWnn-lib/files/patch-aa
index f7bd47d50fc8..2ac4202cc650 100644
--- a/japanese/FreeWnn-lib/files/patch-aa
+++ b/japanese/FreeWnn-lib/files/patch-aa
@@ -75,50 +75,6 @@ diff -arcN ../Xsi.org/Wnn/pubdic/Imakefile ./Wnn/pubdic/Imakefile
   InstallMultiple($(FZK_SRC),$(JWNNFZKSRCDIR))
   
   depend::
-diff -arcN ../Xsi.org/Wnn/uum/jhlp.c ./Wnn/uum/jhlp.c
-*** ../Xsi.org/Wnn/uum/jhlp.c	Fri Aug 19 10:32:12 1994
---- ./Wnn/uum/jhlp.c	Wed Aug 21 20:19:26 1996
-***************
-*** 771,777 ****
-  #endif
-      int pid;
-  
-!     if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
-  	if (WIFSTOPPED(status)) {
-  #ifdef SIGCONT
-  	    kill(pid, SIGCONT);
---- 771,782 ----
-  #endif
-      int pid;
-  
-! /*
-!  * 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);
-***************
-*** 1636,1642 ****
---- 1641,1656 ----
-  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
-+  */
-+ #ifdef __FreeBSD__
-+     sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
-+ #else /* ! __FreeBSD__ */
-      sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f);
-+ #endif /* ! __FreeBSD__ */
-  }
-  #endif /* !sgi */
-  
 diff -arcN ../Xsi.org/config/Project.tmpl ./config/Project.tmpl
 *** ../Xsi.org/config/Project.tmpl	Mon Aug 29 17:40:17 1994
 --- ./config/Project.tmpl	Wed Aug 21 20:07:05 1996
@@ -175,43 +131,22 @@ diff -arcN ../Xsi.org/config/Project.tmpl ./config/Project.tmpl
   
   #define WnnInstallDicMultiple(list,dest)				@@\
 ***************
-*** 1134,1150 ****
-  		$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \			@@\
-  	done
-  
-  #ifndef BuildWnn
-  #define BuildWnn	YES
-  #endif
-  #ifndef BuildCWnn
-! #define BuildCWnn	YES
-  #endif
-  #ifndef BuildKWnn
-! #define BuildKWnn	YES
-  #endif
-  #ifndef BuildXwnmo
-! #define BuildXwnmo	YES
-  #endif
-  
-  #ifndef BuildJserver
---- 1145,1165 ----
-  		$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \			@@\
-  	done
-  
-+ /*
-+  *  Only Japanese
-+  *    - Satoshi
-+  */
-  #ifndef BuildWnn
-  #define BuildWnn	YES
-  #endif
-  #ifndef BuildCWnn
-! #define BuildCWnn	NO
-  #endif
-  #ifndef BuildKWnn
-! #define BuildKWnn	NO
+*** 1236,1243 ****
+  #else
+            IMTOP = $(CONTRIBSRC)/programs/Xsi
   #endif
-  #ifndef BuildXwnmo
-! #define BuildXwnmo	NO
+!       WNNWNNDIR = /usr/local/lib/wnn
+!       WNNBINDIR = /usr/local/bin
+        WNNINCDIR = $(INCROOT)
+        WNNLIBDIR = $(USRLIBDIR)
+      WNNTERM_LIB = termLibrary
+--- 1251,1259 ----
+  #else
+            IMTOP = $(CONTRIBSRC)/programs/Xsi
   #endif
-  
-  #ifndef BuildJserver
+!          PREFIX = /usr/local
+!       WNNWNNDIR = ${PREFIX}/lib/wnn
+!       WNNBINDIR = ${PREFIX}/bin
+        WNNINCDIR = $(INCROOT)
+        WNNLIBDIR = $(USRLIBDIR)
+      WNNTERM_LIB = termLibrary