fix jserverrc installation probrem (lib -> server-bin).

5 files changed, 48 insertions, 8 deletions

diff --git a/inputmethod/ja-freewnn-lib/PLIST b/inputmethod/ja-freewnn-lib/PLIST
index 67cac340007..d7bfe5d3256 100644
--- a/inputmethod/ja-freewnn-lib/PLIST
+++ b/inputmethod/ja-freewnn-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/10 10:03:33 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/06/20 08:55:50 sakamoto Exp $
 include/wnn/commonhd.h
 include/wnn/config.h
 include/wnn/cplib.h
@@ -176,7 +176,6 @@ share/wnn/cvt_key_tbl.kt
 share/wnn/cvt_key_tbl.mv
 share/wnn/cvt_key_tbl.vt
 share/wnn/ja_JP/hinsi.data
-share/wnn/ja_JP/jserverrc
 share/wnn/ja_JP/libwnn.msg
 share/wnn/ja_JP/rk.vi/1B_newTOUPPER
 share/wnn/ja_JP/rk.vi/2A_CTRL
diff --git a/inputmethod/ja-freewnn-lib/distinfo b/inputmethod/ja-freewnn-lib/distinfo
index 65fa104b38d..75572f269cf 100644
--- a/inputmethod/ja-freewnn-lib/distinfo
+++ b/inputmethod/ja-freewnn-lib/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.2 2002/06/10 10:03:33 sakamoto Exp $
+$NetBSD: distinfo,v 1.3 2002/06/20 08:55:50 sakamoto Exp $
 
 SHA1 (freewnn/FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034
 Size (freewnn/FreeWnn-1.10.tar.gz) = 3468613 bytes
 SHA1 (freewnn/patch-1.1.0-a01.gz) = 7aafc2c23af6ba3c195d7b22f743f469adae09e8
 Size (freewnn/patch-1.1.0-a01.gz) = 5706 bytes
-SHA1 (patch-aa) = 7133cce5fc4c0fc808e9498bc838f81e71f027ee
+SHA1 (patch-aa) = eb37740879d43ab7000ebfd7786d0e75629e1d84
 SHA1 (patch-ab) = 8e5f51132c9f5ba5e05f03ae4b69920634ce7ad8
 SHA1 (patch-ac) = 7de643962ca2155d5bbe69e0684e235d5c61a15e
 SHA1 (patch-ad) = b92228c7a2b24f3ed4b8c39a5893e65731120c56
 SHA1 (patch-ae) = d0b4c079859603c42ae957c7b413f4272a054f58
 SHA1 (patch-af) = 26d45af3c65df5af5299c837a123129ec5919bd4
 SHA1 (patch-ag) = c70655f9057f0372cc9f0208535e0f39281f82aa
+SHA1 (patch-ah) = 1795d35ffc0bdbc3d082c46afb86d616bef52d68
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-aa b/inputmethod/ja-freewnn-lib/patches/patch-aa
index 22fd42058c6..9532a4477c7 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-aa
+++ b/inputmethod/ja-freewnn-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-aa,v 1.3 2002/06/20 08:55:51 sakamoto Exp $
 
 --- Wnn/Makefile.in.orig	Tue Mar 23 21:10:52 1999
 +++ Wnn/Makefile.in	Mon May 20 03:04:12 2002
@@ -22,8 +22,8 @@ $NetBSD: patch-aa,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
 -SUBDIRS = $(JDDIR) $(JSERVERDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR)         $(PUBDICDIR) $(WNNCONSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
 +.if (${WNN_TARGET} == "SERVER")
 +WNNMANDIR = man/2.env man/4.cmd man/6.jutil
-+SUBDIRS_INST = $(JSERVERDIR) $(WNNJUTILDIR) $(WNNMANDIR)
-+SUBDIRS = $(JDDIR) $(SUBDIRS_INST)
++SUBDIRS_INST = $(JDDIR) $(JSERVERDIR) $(WNNJUTILDIR) $(WNNMANDIR)
++SUBDIRS = $(SUBDIRS_INST)
 +.elif (${WNN_TARGET} == "DICT")
 +SUBDIRS_INST = $(PUBDICDIR) $(WNNCONSDIR) 
 +SUBDIRS = $(JDDIR) $(SUBDIRS_INST)
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ah b/inputmethod/ja-freewnn-lib/patches/patch-ah
new file mode 100644
index 00000000000..db230295e0a
--- /dev/null
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ah
@@ -0,0 +1,39 @@
+$NetBSD: patch-ah,v 1.1 2002/06/20 08:55:51 sakamoto Exp $
+
+--- Wnn/jd/Makefile.in.orig	Tue Mar 23 21:11:01 1999
++++ Wnn/jd/Makefile.in
+@@ -624,7 +624,7 @@
+ 
+ SUBDIRS = rk rk.vi
+ 
+-SERVERCDS = jserverrc hinsi.data
++SERVERCDS = jserverrc
+ 
+ HINSILINKS = hinsi.data
+ 
+@@ -767,6 +767,7 @@
+ clean::
+ 	$(RM) cvt_key_tbl.vt
+ 
++.if (${WNN_TARGET} == "SERVER")
+ install::  $(SERVERCDS)
+ 	@if [ -d $(DESTDIR)$(JWNNWNNDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNWNNDIR)); fi
+@@ -775,7 +776,9 @@
+ 	for i in  $(SERVERCDS); do \
+ 	(set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$i $(DESTDIR)$(JWNNWNNDIR)); \
+ 	done
++.endif
+ 
++.if (${WNN_TARGET} == "LIBRARY")
+ install::  $(CLIENTJDS1)
+ 	@if [ -d $(DESTDIR)$(JWNNWNNDIR) ]; then set +x; \
+ 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNWNNDIR)); fi
+@@ -811,6 +814,7 @@
+ 	for i in  $(LIBJDS2); do \
+ 	(set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$i $(DESTDIR)$(WNNWNNDIR)); \
+ 	done
++.endif
+ 
+ depend::
+ 
diff --git a/inputmethod/ja-freewnn-server-bin/PLIST b/inputmethod/ja-freewnn-server-bin/PLIST
index 5fd743ef5e3..cce47099ee3 100644
--- a/inputmethod/ja-freewnn-server-bin/PLIST
+++ b/inputmethod/ja-freewnn-server-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/10 09:13:31 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/20 08:55:52 sakamoto Exp $
 etc/rc.d/ja_freewnn
 man/ja_JP.EUC/man1/atod.1
 man/ja_JP.EUC/man1/atof.1
@@ -36,3 +36,4 @@ sbin/wdreg
 sbin/wnnkill
 sbin/wnnstat
 sbin/wnntouch
+share/wnn/ja_JP/jserverrc