12 files changed, 386 insertions, 415 deletions

diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile
index 5552bd2adac8..5331648e15a8 100644
--- a/japanese/dserver/Makefile
+++ b/japanese/dserver/Makefile
@@ -3,39 +3,29 @@
 # Date created:		3 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1997/09/12 05:57:53 asami Exp $
+# $Id: Makefile,v 1.6 1997/09/14 21:34:32 max Exp $
 #
 
 DISTNAME=	dserver2.2betapl2
 PKGNAME=	ja-dserver-2.2.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.pu-toyama.ac.jp/pub/misc/ \
-		ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
+		ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
+		ftp://ftp.sra.co.jp/pub/net/ndtp/misc/
 DISTFILES=	dserver2.2betapl2.tar.gz dserver2.2betapl2.addtable.tar.gz \
-		diclookup-mule-2.3.0.add.tar.gz
+		kenjiro-ndtpd.diff kenjiro-dictlist.diff
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less \
-		${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11/etlfonts
-BUILD_DEPENDS=	mule:${PORTSDIR}/japanese/mule-wnn4
+RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
 
 EXTRACT_ONLY=	dserver2.2betapl2.tar.gz dserver2.2betapl2.addtable.tar.gz
 WRKSRC=		${WRKDIR}/dserver
 USE_GMAKE=	yes
 
-post-extract:
-	@( \
-	 cd  ${WRKSRC}/clients ; \
-	 tar xzf diclookup-mule.tar.gz ; \
-	 tar xzf ${DISTDIR}/diclookup-mule-2.3.0.add.tar.gz \
-	)
-
 pre-patch:
-	@( \
-	 cd  ${WRKSRC}/clients/diclookup-mule-2.3.0 ; \
-	 ${PATCH} --quiet < od-ccl.oxford.patch \
-	)
+	${PATCH} -d ${WRKSRC}/clients -E  < ${DISTDIR}/kenjiro-ndtpd.diff
+	${PATCH} -d ${WRKSRC}/clients -E  <  ${DISTDIR}/kenjiro-dictlist.diff
 
 post-install:
 	@${SED} s!PREFIX_DIR!${PREFIX}!g ${WRKSRC}/setup.sh.template \
diff --git a/japanese/dserver/distinfo b/japanese/dserver/distinfo
index 9cd83ab12073..176383208170 100644
--- a/japanese/dserver/distinfo
+++ b/japanese/dserver/distinfo
@@ -1,3 +1,4 @@
 MD5 (dserver2.2betapl2.tar.gz) = d060ac3965c383a40a7ecfa95470e922
 MD5 (dserver2.2betapl2.addtable.tar.gz) = c238b0189ce67b584c04f545cf52b65b
-MD5 (diclookup-mule-2.3.0.add.tar.gz) = e66a2e92fc486b9e0534bf036f4a3817
+MD5 (kenjiro-ndtpd.diff) = 6051d885869ea480f8aba388a6e838e5
+MD5 (kenjiro-dictlist.diff) = a1f85d031a298f7bd1858c24cb0521ac
diff --git a/japanese/dserver/files/README.FreeBSD-setup.euc b/japanese/dserver/files/README.FreeBSD-setup.euc
index 1198529fd923..e713bf371560 100644
--- a/japanese/dserver/files/README.FreeBSD-setup.euc
+++ b/japanese/dserver/files/README.FreeBSD-setup.euc
@@ -2,17 +2,18 @@
 
                                                              3.Nov.1996
 						Revised	    20.Dec.1996
+						Revised	    31.Jan.1998
                                          三田吉郎 <mita@jp.FreeBSD.org>
 	     Special thanks to MIHIRA Yoshiro <sanpei@yy.cs.keio.ac.jp>
 
 	目次
 	I. インストール
 	   I.1. setup.sh の具体的な作業
-	   I.2. 4: 辞書のコピー・マウント
-	   I.3. サーバの動作テスト
+	   I.2. 辞書のコピー・マウント
+	   I.3. dserver_access ファイルの整備
+	   I.4. サーバの動作テスト
 	II. 使う
 	   II.1. kenjiro
-	   II.2. diclookup-mule
 	III. 削除(uninstall)
 	IV. `inetd起動のdserver'を作る方法
 	    IV.1. `inetd起動のdserverとは何か'
@@ -20,10 +21,7 @@
 	    IV.3. inetd起動のdserverを作る．
 	    IV.4. 初期設定スクリプトの違い．
 	V. エラーとその対策
-	    V.1 muleで辞書を引こうとしたのですが，
-	        いつまでたっても切り替わりません．
-	    V.2. muleで，`process *ndtp* not running'というエラーが出ます．
-	    V.3. 辞書を10種類以上にしたら途端にBus Errorで落っこちます．
+	    V.1. 辞書を10種類以上にしたら途端にBus Errorで落っこちます．
 
 ※ 文中の${PREFIX}は，/usr/localに読み変えてください，portsを利用して
    コンパイルすると，${PREFIX}を/usr/local以外にも，自分の好みの
@@ -36,11 +34,10 @@ I. インストール
 
 	1: [/etc/services] に ndtp プロトコルのエントリを追加
 	2: dserver 起動用スクリプトの準備
-	3: mule クライアント diclookup-mule 用の初期設定
-	4: 辞書をコピーまたはマウント
+	3: 辞書をコピーまたはマウント
 
     これらの作業は, [${PREFIX}/lib/dserver/setup.sh] を起動すると, 1〜
-  3 までを自動的に設定してくれます．
+  2 までを自動的に設定してくれます．
 
   ※ ${PREFIX}
      ここで ${PREFIX} とは ports をコンパイル時の環境変数 PREFIX を
@@ -56,6 +53,7 @@ I.1. setup.sh の具体的な作業
 -----
 ndtp	2010/tcp	#Network Dictionary Transfer Protocol
 -----
+   ※ この行は, dserver を利用する*全てのマシン*に追加する必要があります.
 
 2: [${PREFIX}/etc/rc.d/dserver.sh] に次の行を追加します. 
 
@@ -65,28 +63,11 @@ ndtp	2010/tcp	#Network Dictionary Transfer Protocol
 # dserver - dictionary server
 if [ -f /usr/local/lib/dserver/dserver ] ; then
 	/usr/local/lib/dserver/dserver&
-	echo 'dserver'
+	echo -n 'dserver'
 fi
 -----
 
-3: [${PREFIX}/lib/mule/site-lisp/site-start.el] に次の行を追加します.
-
-   これにより, mule から特別な設定無しに利用できるようになります.
-
------
-;;; diclookup-mule: Online dictionary
-(autoload 'online-dictionary "diclookup-mule" "Online dictionary." t nil)
-(autoload 'od:lookup-pattern-edit "diclookup-mule" "Look up a word." t nil)
-(setq od-chujiten-flag t)       ; diclookup-mule
-(setq od-dictfile-list '("od-chujiten" "od-kojien")) ; diclookup-mule
-(setq dserver-server-list '("localhost")) ; diclookup-mule
-(setq od-frame-geometry "+0-0" od-hide-frame 'make-invisible) ; diclookup-mule
-(add-hook 'od-really-quit-hook 'od-delete-frame) ; diclookup-mule
-(define-key-after menu-bar-file-menu [dictionary] ; diclookup-mule
-        '("Online Dictionary" . online-dictionary) 'calendar) ; diclookup-mule
------
-
-I.2. 4: 辞書のコピー・マウント
+I.2. 辞書のコピー・マウント
 
     [${PREFIX}/share/dict/cdrom/] に，それぞれの辞書をマウントします．
   [${PREFIX}/lib/dserver/dserver_access] のエントリと整合性を持たせる
@@ -104,7 +85,57 @@ makedic [オリジナルの辞書ファイル名] [新しい辞書ファイル名]
     広辞苑は×，研究社の事典は○であるなどと，各社異なります．
  [${PREFIX}/lib/dserver/doc/README.dserver] を御覧下さい．
 
-I.3. サーバの動作テスト
+I.3. dserver_access ファイルの整備
+    dserver は, ${PREFIX}/lib/dserver/dserver_access というファイルで,
+        1. どのマシンからのアクセスを受け付けるか
+        2. どういう名前のファイルを辞書ファイルとして登録するか, 
+           その辞書ファイルへ何人のアクセスを同時に受けるか,
+           辞書内部に埋め込まれた外字を, どうやって真似て表示するか
+    といった情報を取得します.  従って, このファイルは自分で書く必要があります.
+
+   一行一行, 辞書エントリやアクセス許可ホスト名を並べて書きます.
+   順番はどうでもいいです.
+  附属の ${PREFIX}/lib/dserver/dserver_access が参考になるでしょう.
+   1. どのホストからのアクセスを受け付けるか
+        アクセスを受け付けるホスト名を書きます.
+
+-----
+localhost 
+-----
+
+        とするのが一般的で, こうすると dserver をインストールした
+        そのホストからアクセスできるようになります.  
+   2. 辞書のエントリ
+
+-----
+#DICT eiwa /cdrom/chujiten/data/honmon "研究社中英和" 25 600
+#DICT waei /cdrom/chujiten/data/honmon "研究社中和英" 25 600
+-----
+
+のように, #DICT につづけて, 辞書にアクセスするための名前,
+辞書本体のファイルのありか, 辞書名, 同時にアクセスできるユーザ数,
+タイムアウトまでの時間を記入します.  
+
+ところで, 以上の例は, 
+パシフィックハイテックさん htt://www.pht.co.jp/ が出している,
+FreeBSD Pro 2.2.6-R に付いてくる, EPWING 版 研究社新英和辞典6.4版
+用の設定です. それで, この辞書で, 別 port になっている diclookup-mule
+(ja-diclookup-mule*という名前です) 和英検索をするためには, 
+${PREFIX}/lib/dserver/waei.tbl というファイルの先頭の,
+
+-----
+#kana=hyouki
+-----
+
+という行のコメントを外して,
+
+-----
+kana=hyouki
+-----
+
+とする必要があります. 参考までに.
+
+I.4. サーバの動作テスト
 
     desrver を立ち上げると，dserver が使えるようになるはずです．次の
    ように打ち込んで，簡単な接続試験をしてみましょう．
@@ -143,7 +174,7 @@ $A
 --------
 
 	0-1) DNS が使える環境であるが, [/etc/host.conf] で bind より 
-           host を先に書いている場合. 
+           hosts を先に書いている場合. 
 
 	0-2) DNS を使えず [/etc/hosts] だけを参照する場合. 
 
@@ -189,38 +220,6 @@ II.1. kenjiro
     リストに無い辞書を読みたい場合は，ports を用意して make patch の
   後 [${WRKSRC}/clients/kenjiro/config.h] を書き換えてmakeし直します．
 
-II.2. diclookup-mule
-
-    私はこちらのクライアントを気に入っています．M-x
-  online-dictionary<リターン>で起動します．
-
-    [${PRFIX}/lib/mule/site-lisp/od-***.elc]が，それぞれの辞書に
-  対応した外字ファイルです，これをハックすれば大抵の辞書を読むことが
-  できるでしょう．
-
-    ハックするときに，外字の形をどうやって調べるかが問題ですが，ひな
-  がたを適当に作っておいて実際に辞書を読むと
------
-著作権表示
-外字１
-外字２
------
-  などとメニューが表示されます．ここで外字を選択すると，
-
-	1. この辞書で登録されている外字の文字コード
-	2. 外字のビットマップ(;)表示
-	3. 外字をXウィンドウとテキスト端末とでどう表示しているか
-
-  がわかりますので，それに合わせて外字テーブル(とそのコードの上位
-  8bitの数)を書き換えます．
-
-    この ports に入っている od-crown.elc(クラウン仏和，クラウ
-  ン独和)，od-italian.elc(現代イタリア語表現辞典)，od-oxford.el
-  (オクスフォード英英辞典，シソーラス類義語辞典)は，
-  od-chujiten.el(新英和和英)を上述の方法で私三田が hack 
-  したものです．なれれば一辞書を半日で対応できます．ぜひ対応させて，
-  本家に contribute しましょう．
-
 III. 削除(uninstall)
 
     削除は，インストールの逆を行えばよいわけですが，3-1 を自動的に行
@@ -299,50 +298,7 @@ IV.4. 初期設定スクリプトの違い．
    使い方はinetd, standalone用とも一緒です．
 
 V. エラーとその対策
-
-V.1. muleで辞書を引こうとしたのですが，いつまでたっても切り替わりません．
-
-    muleで，
------
-M-x online-dictionary
------
-    と入力すると，辞書用のフレームが新しく作られますが，その後いつまで
-    経ってもタイトルが表示されない症状です．
-
-    接続許可を正しく出しているかを疑ってみます．
-    I.3. サーバの動作テスト に従って，手動で接続してみます．
-    接続に失敗している場合は，${PREFIX}/dserver/dserver_accessファイルで
-    アクセス許可を正しく出します．
-
------接続に成功している例:
-% telnet localhost ndtp
-lavender: {1234} telnet localhost ndtp
-Trying 127.0.0.1...
-Connected to localhost.
-Escape character is '^]'.
-A
-$A
------
------接続に失敗している例:
-% telnet localhost ndtp
-lavender: {1234} telnet localhost ndtp
-Trying 127.0.0.1...
-Connected to localhost.
-Escape character is '^]'.
-A
-$N
------
-
-V.2. muleで，`process *ndtp* not running'というエラーが出ます．
-
-    standaloneの場合，dserverが何かの原因でこけたのでしょう．
-    もう一度dserverを立ちあげ直してみてください．
------
-%su root
-#/usr/local/lib/dserver/dserver&
------
-
-V.3. 辞書を10種類以上にしたら途端にBus Errorで落っこちます．
+V.1. 辞書を10種類以上にしたら途端にBus Errorで落っこちます．
 
     server2.2-pl2/config.hの，MAXDICTの値を10から増やして
     コンパイルし直しましょう．
diff --git a/japanese/dserver/files/deinstall.sh.inetd b/japanese/dserver/files/deinstall.sh.inetd
index d658ea4715f8..55e4c28ecc49 100644
--- a/japanese/dserver/files/deinstall.sh.inetd
+++ b/japanese/dserver/files/deinstall.sh.inetd
@@ -5,6 +5,3 @@ cp /etc/services /etc/services.bak
 echo "updating /etc/inetd.conf"
 cp /etc/inetd.conf /etc/inetd.conf.bak
 (grep -v '\bndtp\b' /etc/inetd.conf.bak) > /etc/inetd.conf
-echo "updating site-start.el"
-cp PREFIX_DIR/lib/mule/site-lisp/site-start.el PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak
-grep -v diclookup-mule PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak > PREFIX_DIR/lib/mule/site-lisp/site-start.el
diff --git a/japanese/dserver/files/deinstall.sh.standalone b/japanese/dserver/files/deinstall.sh.standalone
index a8e79d3b6112..841ea86cc426 100644
--- a/japanese/dserver/files/deinstall.sh.standalone
+++ b/japanese/dserver/files/deinstall.sh.standalone
@@ -4,6 +4,3 @@ cp /etc/services /etc/services.bak
 (grep -v '\bndtp\b' /etc/services.bak) > /etc/services
 echo "Removing PREFIX_DIR/etc/rc.d/dserver.sh"
 rm -f PREFIX_DIR/etc/rc.d/dserver.sh
-echo "updating site-start.el"
-cp PREFIX_DIR/lib/mule/site-lisp/site-start.el PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak
-grep -v diclookup-mule PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak > PREFIX_DIR/lib/mule/site-lisp/site-start.el
diff --git a/japanese/dserver/files/patch-aa b/japanese/dserver/files/patch-aa
index 763f1997ab99..f95b3cbfb1f8 100644
--- a/japanese/dserver/files/patch-aa
+++ b/japanese/dserver/files/patch-aa
@@ -1,18 +1,15 @@
---- Makefile.orig	Wed Nov  6 13:01:50 1996
-+++ Makefile	Wed Nov  6 13:02:12 1996
-@@ -0,0 +1,15 @@
+--- /dev/null	Sat Jan 31 09:42:25 1998
++++ Makefile	Sat Jan 31 09:43:12 1998
+@@ -0,0 +1,12 @@
 +PREFIX?=/usr/local
 +DOCDIR=${PREFIX}/lib/dserver/doc
 +all:
 +	(cd server2.2-pl2; ${MAKE} all)
 +	(cd clients/kenjiro; ${MAKE} all)
-+	(cd clients/diclookup-mule-2.3.0; ${MAKE} all)
 +install:
 +	if  [ ! -d ${DOCDIR} ] ; then mkdir -p ${DOCDIR} ; fi
 +	(cd server2.2-pl2; ${MAKE} install)
 +	(cd clients/kenjiro; ${MAKE} install)
-+	(cd clients/diclookup-mule-2.3.0; ${MAKE} install)
 +	cp ACKNOWLEDGMENT DICTIONARIES doc/*  ${PREFIX}/lib/dserver/doc
-+	cp clients/diclookup-mule-2.3.0/README ${DOCDIR}/README.diclookup-mule
 +	cp clients/kenjiro/Copyright ${DOCDIR}/Copyright.kenjiro
 +	cp clients/kenjiro/README ${DOCDIR}/README.kenjiro
diff --git a/japanese/dserver/files/patch-ab b/japanese/dserver/files/patch-ab
index b099214c108e..a8278a0941d6 100644
--- a/japanese/dserver/files/patch-ab
+++ b/japanese/dserver/files/patch-ab
@@ -1,6 +1,6 @@
 patches for server2.2-pl2
---- server2.2-pl2/daemon.c.orig	Sat Aug 10 02:10:32 1996
-+++ server2.2-pl2/daemon.c	Tue Jan 28 08:22:42 1997
+--- server2.2-pl2/daemon.c.orig	Sat Jan 31 09:53:47 1998
++++ server2.2-pl2/daemon.c	Sat Jan 31 09:53:20 1998
 @@ -13,6 +13,11 @@
  #include <sys/time.h>
  #include <ctype.h>
@@ -13,20 +13,15 @@ patches for server2.2-pl2
  #ifdef linux
  #include <string.h>
  #include <stdlib.h>
-@@ -34,10 +39,11 @@
+@@ -34,7 +39,6 @@
  #include "ndtp.h"
  #include "misc.h"
  
 -
-+#ifndef __FreeBSD__
  #ifdef DEBUG
  extern int debug;
  #endif
-+#endif
- 
- ENV env[MAXUSER];
- 
-@@ -104,8 +110,11 @@
+@@ -104,8 +108,11 @@
  #endif
  		exit(1);
  	}
@@ -39,9 +34,52 @@ patches for server2.2-pl2
  #ifdef SYSLOG
  		syslog(LOG_ERR,"Unable to bind address /iserver_init\n");
  #endif
---- server2.2-pl2/lookup.c.orig	Sat Aug 10 02:10:32 1996
-+++ server2.2-pl2/lookup.c	Tue Jan 28 08:22:42 1997
-@@ -501,6 +501,54 @@
+--- server2.2-pl2/lookup.c.orig	Fri Aug  9 19:10:32 1996
++++ server2.2-pl2/lookup.c	Sat Jan 31 11:29:09 1998
+@@ -267,13 +267,25 @@
+ 	}
+ }
+ 
+-dict_read(dict,ptr,size,count)
++static int
++dict_read_new(Dict *dict,char *ptr,int size,int count)
++/* dict_read only for showhonmon function */
++{
++  int	i;
++  size *= count;
++  for( i=0; i<size; i++,ptr++ ) {
++    *ptr = dic_getc(dict);
++  }
++}
++
++static int
++dict_read_old(dict,ptr,size,count)
+ Dict *dict;
+ char *ptr;
+ {
+ 	int s;
+ #ifdef DEBUG
+-  printf( "dict_read size[%d] mode[%d]\n", size, dict->compress_type );
++  printf( "dict_read_old size[%d] mode[%d]\n", size, dict->compress_type );
+ #endif
+ 	if (dict->compress_type == COMPRESS_TYPE_EDIC) {
+ 		size *= count;
+@@ -374,12 +386,12 @@
+ 
+ 	} else {
+ 		dict_seekframe(dict,1);
+-		if(dict_read(dict,index[0],BS,1)!=1) return -1;
++		if(dict_read_old(dict,index[0],BS,1)!=1) return -1;
+ 		e = TWOBYTEUINT(index[0]);
+ 		dict->index = NULL;
+ 
+ 		for(; e>0; e--) {
+-		    if(dict_read(dict,index[0],BS,1)!=1) return -1;
++		    if(dict_read_old(dict,index[0],BS,1)!=1) return -1;
+ 		    if(!bcmp(index[0],null,BS)) break;
+ 
+ 		    new = (Index *)calloc(1,sizeof(Index));
+@@ -501,6 +513,55 @@
  	else return q+6;
  }
  
@@ -75,6 +113,7 @@ patches for server2.2-pl2
 +	    ss = (*s);
 +	    tt = (*t);
 +	    if (n <= 0)  tt = 0; /* string terminate 95.2.8 by T.Motoda */
++	    if(tt==0x20 && *(t+1)==0)tt=0; /* Delete last ' ' */
 +	    
 +		if(r==SHORT && (ss=='*' || ss=='?')) {
 +			return 0;
@@ -96,7 +135,7 @@ patches for server2.2-pl2
  findentry_int(key,realkey,frm,env_p)
  unsigned char *key,*realkey;
  ENV *env_p;
-@@ -509,6 +557,9 @@
+@@ -509,6 +570,9 @@
  	unsigned char frame[FRAMESIZE+2];
  	static char msg[32];
  	Dict *dict;
@@ -106,7 +145,7 @@ patches for server2.2-pl2
  
  	dict=env_p->dict;
  
-@@ -542,12 +593,21 @@
+@@ -542,12 +606,21 @@
  				putnstr(q,s);
  				printf("\n");
  #endif
@@ -128,7 +167,7 @@ patches for server2.2-pl2
  			}
  		}
  		else if(frame[1]==0) {
-@@ -625,7 +685,11 @@
+@@ -625,7 +698,11 @@
  						putnstr(q,s);
  #endif
  						if(!match) {
@@ -140,7 +179,7 @@ patches for server2.2-pl2
  						}
  						q+=s;
  #ifdef DEBUG
-@@ -644,7 +708,11 @@
+@@ -644,7 +721,11 @@
  					putnstr(q,s);
  #endif
  					if(!match) {
@@ -152,8 +191,198 @@ patches for server2.2-pl2
  					}
  #ifdef DEBUG
  					putchar('\n');
---- server2.2-pl2/Makefile.orig	Sat Aug 10 02:12:05 1996
-+++ server2.2-pl2/Makefile	Tue Jan 28 08:22:43 1997
+@@ -722,6 +803,28 @@
+ #endif
+ }
+ 
++static void myGetHiLo( dict, env_p, hi, lo )
++Dict *dict;
++ENV *env_p;
++int *hi;	/*(out)*/
++int *lo;	/*(out)*/
++{
++  int	c;
++
++  c = dic_getc(dict);
++  if( c == 0x1f ||
++      dict_set[env_p->dict_num].code == FULL) {
++    *hi = c;
++    *lo = dic_getc(dict);
++  } else {
++    *lo = c;
++    if ( *lo < 32) {
++       *hi = *lo;
++       *lo = dic_getc(dict);
++    } else *hi = 0x23;
++  }
++}
++
+ showhonmon(frm,ofs,raw,env_p)
+ ENV *env_p;
+ {
+@@ -742,7 +845,6 @@
+ 	int half, height,width ,ref, count, fig,size;
+ 	int i,j;
+ 	char c;
+-
+ 	fig = FALSE;
+ 	half= dict_set[env_p->dict_num].code ? 1 : 0;
+ 	dict=env_p->dict;
+@@ -774,17 +876,20 @@
+ 
+ 	  if( dic_seek(dict,frm,ofs) ) return;
+ 
+-	  hi = dic_getc(dict);            /* Fetch */
+-          lo = dic_getc(dict);
++	/*hi = dic_getc(dict);            ** Fetch */
++	/*lo = dic_getc(dict);*/
++	  myGetHiLo( dict, env_p, &hi, &lo );
+ 	  while(!(hi==0x1f && lo==0x02) && 	/* if Doc start */
+ 	        !(hi==0x1f && lo==0x41) && 	/* if Key start */
+ 	        !(hi==0x1f && lo==0x45)) {	/* if Fig start */
++		if( hi!=0x1f ) { goto loop1; }
+ 		if(hi==0x1f && lo==0x09){        /* if not  /* if TAB  skip 2byte */
+                        	hi = dic_getc(dict);
+                        	lo = dic_getc(dict);
+                 }
+-		hi = dic_getc(dict);
+-		lo = dic_getc(dict);
++	      /*hi = dic_getc(dict);*/
++	      /*lo = dic_getc(dict);*/
++		myGetHiLo( dict, env_p, &hi, &lo );
+ 	  }
+ 	 /* Doc ,Key or Fig start */
+ 	  /* if Key start */
+@@ -799,7 +904,7 @@
+ 	     fig=TRUE;
+ 	  }
+ 
+-	    if (dict_set[env_p->dict_num].code == FULL) {
++	  /*if (dict_set[env_p->dict_num].code == FULL) {
+                 hi = dic_getc(dict);
+                 lo = dic_getc(dict);
+             } else {
+@@ -808,8 +913,9 @@
+                      hi = lo;
+                      lo = dic_getc(dict);
+                 } else hi = 0x23;
+-            }
+-	  
++            }*/
++	    myGetHiLo( dict, env_p, &hi, &lo );
++loop1:
+ 	  while(!(hi==0x00 && 
+ 		   lo==dict_set[env_p->dict_num].endcode &&
+ 		    TAB ) /* 1f09(tab)+0001 -> end */ 
+@@ -867,7 +973,7 @@
+ 	      case 0x31:	/* fig start */
+ 	 	hi = dic_getc(dict);
+ 	 	lo = dic_getc(dict);
+-		dict_read(dict,rbuf,4,1);
++		dict_read_new(dict,rbuf,4,1);
+ 		/* fread(rbuf,4,1,dict->stream); */
+ 		height = TWOBCDUINT(rbuf);
+ 		width  = TWOBCDUINT(rbuf+2);
+@@ -877,7 +983,7 @@
+ 	 		hi = dic_getc(dict);
+ 	 		lo = dic_getc(dict);
+ 	        } while(!(hi==0x1f && lo==0x51 ));
+-		dict_read(dict,rbuf,6,1);
++		dict_read_new(dict,rbuf,6,1);
+ 		/*fread(rbuf,6,1,dict->stream); */
+ 		frmtmp = FOURBCDUINT(rbuf);
+ 		ofstmp  = TWOBCDUINT(rbuf+4);
+@@ -903,7 +1009,7 @@
+ 	       case 0x44:	/* fig start */
+ 	 	hi = dic_getc(dict);
+ 	 	lo = dic_getc(dict);
+-		dict_read(dict,rbuf,8,1);
++		dict_read_new(dict,rbuf,8,1);
+ 		/* fread(rbuf,8,1,dict->stream); */
+ 		height = FOURBCDUINT(rbuf);
+ 		width  = FOURBCDUINT(rbuf+4);
+@@ -916,21 +1022,21 @@
+ 		  lo = dic_getc(dict);
+ 		break;
+ 	      case 0x48:	/*  music ref start */
+-		dict_read(dict,rbuf,10,1);
++		dict_read_new(dict,rbuf,10,1);
+ 		/*fread(rbuf,10,1,dict->stream); */
+ 		frmtmp=(unsigned long int)SIXBCDUINT(rbuf);
+ 		ofstmp=FOURBCDUINT(rbuf+6);
+ 		write(cur_s,buf,strlen(buf));
+ 		break;
+ 	      case 0x51:	/* pointer to fig page:offset(BCD)*/
+-		dict_read(dict,rbuf,6,1);
++		dict_read_new(dict,rbuf,6,1);
+ 		frmtmp=FOURBCDUINT(rbuf);
+ 		ofstmp=TWOBCDUINT(rbuf+4);
+ 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
+ 		write(cur_s,buf,strlen(buf));
+ 		break;
+ 	      case 0x52:	/* picture end with page:offset(BCD)*/
+-		dict_read(dict,rbuf,6,1);
++		dict_read_new(dict,rbuf,6,1);
+ 		frmtmp=FOURBCDUINT(rbuf);
+ 		ofstmp=TWOBCDUINT(rbuf+4);
+ 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
+@@ -939,7 +1045,7 @@
+ 	      case 0x53:	/* end with page:offset(BCD)*/
+ 		ref   = FALSE;
+ 		if(fig==FALSE){ 
+-		  dict_read(dict,rbuf,8,1);
++		  dict_read_new(dict,rbuf,8,1);
+ 		  frmtmp=FOURBCDUINT(rbuf);
+ 		  ofstmp=FOURBCDUINT(rbuf+4);
+ 		  sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
+@@ -958,7 +1064,7 @@
+ 	      case 0x62:	/* refrence end with page:offset(BCD) */
+ 	      case 0x63:	/* menu end with page:offset(BCD) */
+ 		ref   = FALSE;
+-		dict_read(dict,rbuf,6,1);
++		dict_read_new(dict,rbuf,6,1);
+ 		frmtmp=FOURBCDUINT(rbuf);
+ 		ofstmp=TWOBCDUINT(rbuf+4);
+ 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
+@@ -966,7 +1072,7 @@
+ 		break;
+ 	      case 0x64:	/* fig ref  end with page:offset(BCD) */
+ 		honmon = TRUE;
+-		dict_read(dict,rbuf,6,1);
++		dict_read_new(dict,rbuf,6,1);
+ 		frmtmp=FOURBCDUINT(rbuf);
+ 		ofstmp=TWOBCDUINT(rbuf+4);
+ 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
+@@ -998,7 +1104,7 @@
+ 	       puteucz2h(cur_s,hi,lo,env_p->dict_num);
+ 	    }
+ 
+-	    if (dict_set[env_p->dict_num].code == FULL) {
++	  /*if (dict_set[env_p->dict_num].code == FULL) {
+                 hi = dic_getc(dict);
+                 lo = dic_getc(dict);
+             } else {
+@@ -1007,7 +1113,8 @@
+                      hi = lo;
+                      lo = dic_getc(dict);
+                 } else hi = 0x23;
+-            }
++            }*/
++	    myGetHiLo( dict, env_p, &hi, &lo );
+ 	  }
+ 	}
+ 	write(cur_s,"\n",1);
+@@ -1108,7 +1215,7 @@
+     }
+   } else {
+     dict_seekframe(dict,frm);
+-    dict_read(dict, buff, FRAMESIZE, 1);
++    dict_read_old(dict, buff, FRAMESIZE, 1);
+   }
+   return 1;
+ 
+--- server2.2-pl2/Makefile.orig	Sat Jan 31 09:53:35 1998
++++ server2.2-pl2/Makefile	Sat Jan 31 09:53:20 1998
 @@ -2,33 +2,39 @@
  #CC=cc
  CC=gcc
@@ -227,9 +456,9 @@ patches for server2.2-pl2
  #include <net/if.h>
  #include <sys/ioctl.h>
  
---- server2.2-pl2/table/dserver_access.orig	Sat Aug 10 02:10:27 1996
-+++ server2.2-pl2/table/dserver_access	Tue Jan 28 08:22:43 1997
-@@ -1,14 +1,20 @@
+--- server2.2-pl2/table/dserver_access.orig	Sat Jan 31 09:53:59 1998
++++ server2.2-pl2/table/dserver_access	Sat Jan 31 09:53:20 1998
+@@ -1,14 +1,22 @@
 -#DICT kojien /usr/local/etc/CDdict/yrrs096/koujien/start. "広辞苑第４版" 1  600
 -##DICT eiwa /usr/local/etc/CDdict/yrrs118/chujiten/start. "研究社中英和" 25 600
 -##DICT eiwa /usr/local/etc/CDdict/yrrs118/chujiten/start.comp "研究社中英和" 25 600
@@ -241,26 +470,28 @@ patches for server2.2-pl2
 -#DICT readers /usr/local/etc/CDdict/yrrs172/readers/start. "リーダーズ英和" 1  600
 -#DICTROOT /usr/local/etc/CDdict 2 500
 +#DICT kojien PREFIX_DIR/share/dict/cdrom/yrrs096/koujien/start "広辞苑第４版" 1  600
-+#DICT kojien-furoku PREFIX_DIR/share/dict/cdrom/yrrs096/furoku/start "広辞苑第４版付録" 1  600
-+#DICT waei PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "研究社中和英" 25 600
-+#DICT eiwa PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "研究社中和英" 25 600
-+#DICT readers PREFIX_DIR/share/dict/cdrom/yrrs172/readers/start "リーダーズ英和" 1  600
-+#DICT crfre PREFIX_DIR/share/dict/cdrom/yrrs091/crfre/start "三省堂クラウン仏和" 1  600
-+#DICT crger PREFIX_DIR/share/dict/cdrom/yrrs092/crger/start "三省堂クラウン独和" 1  600
-+#DICT italian /usr/local/share/dict/cdrom/yrrs214/jiten/start "現代イタリア語表現辞典" 1  600
-+#DICT italian-j /usr/local/share/dict/cdrom/yrrs214/jiten/start "現代イタリア語表現辞典" 1  600
-+#DICT oxford /usr/local/share/dict/cdrom/san042/oxford/start "OxfordEnglishDictionary" 1  600
-+#DICT CDkojien PREFIX_DIR/share/dict/cdrom/cdkouji/koujien/data/honmon "広辞苑ＣＤ版" 1  600
++##DICT kojien-furoku PREFIX_DIR/share/dict/cdrom/yrrs096/furoku/start "広辞苑第４版付録" 1  600
++##DICT waei PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "研究社中和英" 25 600
++##DICT eiwa PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "研究社中和英" 25 600
++##DICT readers PREFIX_DIR/share/dict/cdrom/yrrs172/readers/start "リーダーズ英和" 1  600
++##DICT crfre PREFIX_DIR/share/dict/cdrom/yrrs091/crfre/start "三省堂クラウン仏和" 1  600
++##DICT crger PREFIX_DIR/share/dict/cdrom/yrrs092/crger/start "三省堂クラウン独和" 1  600
++##DICT italian /usr/local/share/dict/cdrom/yrrs214/jiten/start "現代イタリア語表現辞典" 1  600
++##DICT italian-j /usr/local/share/dict/cdrom/yrrs214/jiten/start "現代イタリア語表現辞典" 1  600
++##DICT oxford /usr/local/share/dict/cdrom/san042/oxford/start "OxfordEnglishDictionary" 1  600
++##DICT CDkojien PREFIX_DIR/share/dict/cdrom/cdkouji/koujien/data/honmon "広辞苑ＣＤ版" 1  600
++##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "研究社中英和" 25 600
++##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "研究社中英和" 25 600
++##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "研究社中英和" 25 600
++##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "研究社中和英" 25 600
++##DICT daijirin PREFIX_DIR/share/dict/cdrom/yrrs082/dgx01/start "大辞林" 1 600
++#
 +#DICTROOT PREFIX_DIR/share/dict/cdrom 2 500
  ## access controle
  #
 -topics
 +localhost
  #
-+##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "研究社中英和" 25 600
-+##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "研究社中英和" 25 600
-+##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "研究社中英和" 25 600
-+##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "研究社中和英" 25 600
 --- server2.2-pl2/compress/Makefile.orig	Sat Aug 10 02:10:29 1996
 +++ server2.2-pl2/compress/Makefile	Tue Jan 28 08:22:43 1997
 @@ -11,11 +11,15 @@
diff --git a/japanese/dserver/files/patch-ac b/japanese/dserver/files/patch-ac
index 6e940c15d700..8f9a7e49e910 100644
--- a/japanese/dserver/files/patch-ac
+++ b/japanese/dserver/files/patch-ac
@@ -1,15 +1,4 @@
 patch files for kenjiro
---- clients/kenjiro/kenjiro.h.orig	Tue Jun 27 01:21:31 1995
-+++ clients/kenjiro/kenjiro.h	Tue Jan 28 15:39:36 1997
-@@ -41,7 +41,7 @@
- #define F(n) (1 << n)
- 
- typedef struct {
--	char name[10];
-+	char name[16];
- 	unsigned char prompt[25];
- 	int inputmode;
- 	int filter;
 --- clients/kenjiro/sub.c.orig	Tue Jun 27 01:21:31 1995
 +++ clients/kenjiro/sub.c	Tue Jan 28 15:39:36 1997
 @@ -1,6 +1,11 @@
@@ -105,29 +94,6 @@ patch files for kenjiro
  	struct winsize ws;
  
  	ioctl(0, TIOCGWINSZ, &ws);
---- clients/kenjiro/config.h.orig	Tue Jun 27 01:21:34 1995
-+++ clients/kenjiro/config.h	Tue Jan 28 15:39:36 1997
-@@ -1,7 +1,7 @@
--#define PAGER		"/usr/local/bin/less"	/* pager program */
-+#define PAGER		"/usr/local/bin/jless"	/* pager program */
- #define HISTSIZE	20		/* history size */
- #define	KOUHO		10		/* number of kouho  (0 < n <= 10) */
--#define SERVER		"dserver"	/* hostname with server */
-+#define SERVER		"localhost"	/* hostname with server */
- #define SERVICE		"ndtp"		/* service name */
- #define KANJICODE	JIS		/* default kanji code (JIS,EUC,SJIS)*/
- /*#define PORT		2010*/		/* port of service */
-@@ -15,6 +15,9 @@
- 	{ "eiwa"   , "研究社英和"	, ENG ,  },
- 	{ "waei"   , "研究社和英"	, JPN ,  },
- 	{ "kojien" , "広辞苑"		, JPN ,  },
-+	{ "kojien-furoku" , "広辞苑付録", JPN ,  },
- 	{ "CDkojien" , "CD広辞苑"		, JPN ,  },
--	{ "readers" , "リーダーず英和"		, ENG ,  },
-+	{ "readers" , "リーダーズ英和"		, ENG ,  },
-+	{ "crfre"   , "三省堂クラウン仏和"	, ENG ,  },
-+	{ "crger"   , "三省堂クラウン独和"	, ENG ,  },
- };
 --- clients/kenjiro/Makefile.orig	Tue Jun 27 01:21:31 1995
 +++ clients/kenjiro/Makefile	Tue Jan 28 15:39:36 1997
 @@ -1,5 +1,6 @@
@@ -158,31 +124,15 @@ patch files for kenjiro
 +	rm -f *.o *.out kenjiro.l* kenjiro core typescript
  
  # DO NOT DELETE
---- clients/diclookup-mule-2.3.0/Makefile.orig	Mon Jul 24 16:01:57 1995
-+++ clients/diclookup-mule-2.3.0/Makefile	Tue Jan 28 15:39:36 1997
-@@ -1,13 +1,13 @@
- EMACS = mule
- 
--LISPDIR = /usr/local/lib/mule/site-lisp
-+LISPDIR = ${PREFIX}/lib/mule/site-lisp
- 
- RM = rm -f
- 
- UTILS = cclc.elc
- 
- ELCS = diclookup-mule.elc \
--	od-eiwa.elc od-chujiten.elc od-kojien.elc
-+	od-eiwa.elc od-chujiten.elc od-kojien.elc od-crown.elc od-oxford.elc od-italian.elc od-readers.elc
- 
- PROGRAMS = $(UTILS) $(ELCS)
- 
-@@ -19,7 +19,9 @@
- all: $(PROGRAMS)
- 
- install: $(ELCS)
-+	cp *.el $(LISPDIR)
- 	cp $(ELCS) $(LISPDIR)
-+	cp README ${PREFIX}/lib/dserver/doc/README.diclookup-mule
- 
- clean:
- 	$(RM) $(PROGRAMS)
+--- clients/kenjiro/config.h.orig	Wed Jul 22 08:53:06 1998
++++ clients/kenjiro/config.h	Wed Jul 22 08:53:22 1998
+@@ -1,7 +1,7 @@
+-#define PAGER		"/usr/local/bin/less"	/* pager program */
++#define PAGER		"/usr/local/bin/jless"	/* pager program */
+ #define HISTSIZE	20		/* history size */
+ #define	KOUHO		10		/* number of kouho  (0 < n <= 10) */
+-#define SERVER		"dserver"	/* hostname with server */
++#define SERVER		"localhost"	/* hostname with server */
+ #define SERVICE		"ndtp"		/* service name */
+ #define KANJICODE	JIS		/* default kanji code (JIS,EUC,SJIS)*/
+ /*#define PORT		2010*/		/* port of service */
diff --git a/japanese/dserver/files/setup.sh.inetd b/japanese/dserver/files/setup.sh.inetd
index d31b3649bca3..6b0b6a6853e8 100644
--- a/japanese/dserver/files/setup.sh.inetd
+++ b/japanese/dserver/files/setup.sh.inetd
@@ -69,71 +69,5 @@ case x${ans} in
 	;;
 esac
 
-# Hack PREFIX_DIR/lib/mule/site-lisp/site-start.el
-rm -f /tmp/hack-site-start.el
-echo "(defun hack-site-start ()" >> /tmp/hack-site-start.el
-echo "  (interactive)" >> /tmp/hack-site-start.el
-echo "  (message \"Updating site-start.el.  \")" >> /tmp/hack-site-start.el
-echo "  (let* ((args command-line-args-left)" >> /tmp/hack-site-start.el
-echo "	 (fname (expand-file-name (nth 0 args)))" >> /tmp/hack-site-start.el
-echo "	 (dir (nth 1 args)))" >> /tmp/hack-site-start.el
-echo "    (setq command-line-args-left (cdr (cdr command-line-args-left)))" >> /tmp/hack-site-start.el
-echo "    (set-buffer (get-buffer-create \" *x*\"))" >> /tmp/hack-site-start.el
-echo "    (erase-buffer)" >> /tmp/hack-site-start.el
-echo "    (if (file-exists-p fname)" >> /tmp/hack-site-start.el
-echo "	(insert-file-contents fname))" >> /tmp/hack-site-start.el
-echo "    (goto-char (point-min))" >> /tmp/hack-site-start.el
-echo "    (if (search-forward \";;; diclookup-mule: Online dictionary\" nil t)" >> /tmp/hack-site-start.el
-echo "	(message \"No changes made.\")" >> /tmp/hack-site-start.el
-echo "      (goto-char (point-max))" >> /tmp/hack-site-start.el
-echo "      (insert \"\n;;; diclookup-mule: Online dictionary\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(autoload 'online-dictionary \\\"diclookup-mule\\\" \")" >> /tmp/hack-site-start.el
-echo "      (insert \"\\\"Online dictionary.\\\" t nil)\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(autoload 'od:lookup-pattern-edit \\\"diclookup-mule\\\" \")" >> /tmp/hack-site-start.el
-echo "      (insert \"\\\"Look up a word.\\\" t nil)\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq od-chujiten-flag t)	; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq od-dictfile-list '(\\\"od-chujiten\\\" \\\"od-kojien\\\" \\\"od-readers\\\" \\\"od-crown\\\")) \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq dserver-server-list '(\\\"localhost\\\")) ; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq od-frame-geometry \\\"+0-0\\\" od-hide-frame \")" >> /tmp/hack-site-start.el
-echo "      (insert \"'make-invisible) ; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(add-hook 'od-really-quit-hook 'od-delete-frame) \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(define-key-after menu-bar-file-menu [dictionary] \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"	'(\\\"Online Dictionary\\\" . online-dictionary) 'calendar) \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (write-file fname))))" >> /tmp/hack-site-start.el
-
-# Hack site-start.el
-echo
-echo "Updating PREFIX_DIR/lib/mule/site-lisp/site-start.el"; 
-cp PREFIX_DIR/lib/mule/site-lisp/site-start.el PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak
-
-echo "Do you like to update site-start.el automatically? (y/n) [y]" ;
-read ans;
-case x${ans} in
-	xn*|xN*)
-	echo "Do you like to change site-start.el file by yourself?(y/n) [y]" ;
-	read choice ;
-	case x${choice} in 
-		xn*|xN*)
-		echo "Okay, Do nothing." 
-		rm -f PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak ;;
-		*)
-		 mule -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
-			PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
-		echo "Edit site-start.el file by yourself (Press Return)";
-		read dummy; 
-		vi -c /diclookup PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
-		echo "original file is saved in PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak";;
-		esac;;
-	*) 
-	 mule -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
-		PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
-	echo "original file is saved in PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak" ;;
-esac
-rm -f /tmp/hack-site-start.el
-
 echo "Now startup configuration is done."
 echo "Remember to mount cdrom to PREFIX_DIR/share/dict/cdrom."
diff --git a/japanese/dserver/files/setup.sh.standalone b/japanese/dserver/files/setup.sh.standalone
index 2798d868cc01..51dfe5d08ccc 100644
--- a/japanese/dserver/files/setup.sh.standalone
+++ b/japanese/dserver/files/setup.sh.standalone
@@ -66,71 +66,5 @@ case x${ans} in
 		echo "dserver.sh is added to PREFIX_DIR/etc/rc.d/"
 esac
 
-# Hack PREFIX_DIR/lib/mule/site-lisp/site-start.el
-rm -f /tmp/hack-site-start.el
-echo "(defun hack-site-start ()" >> /tmp/hack-site-start.el
-echo "  (interactive)" >> /tmp/hack-site-start.el
-echo "  (message \"Updating site-start.el.  \")" >> /tmp/hack-site-start.el
-echo "  (let* ((args command-line-args-left)" >> /tmp/hack-site-start.el
-echo "	 (fname (expand-file-name (nth 0 args)))" >> /tmp/hack-site-start.el
-echo "	 (dir (nth 1 args)))" >> /tmp/hack-site-start.el
-echo "    (setq command-line-args-left (cdr (cdr command-line-args-left)))" >> /tmp/hack-site-start.el
-echo "    (set-buffer (get-buffer-create \" *x*\"))" >> /tmp/hack-site-start.el
-echo "    (erase-buffer)" >> /tmp/hack-site-start.el
-echo "    (if (file-exists-p fname)" >> /tmp/hack-site-start.el
-echo "	(insert-file-contents fname))" >> /tmp/hack-site-start.el
-echo "    (goto-char (point-min))" >> /tmp/hack-site-start.el
-echo "    (if (search-forward \";;; diclookup-mule: Online dictionary\" nil t)" >> /tmp/hack-site-start.el
-echo "	(message \"No changes made.\")" >> /tmp/hack-site-start.el
-echo "      (goto-char (point-max))" >> /tmp/hack-site-start.el
-echo "      (insert \"\n;;; diclookup-mule: Online dictionary\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(autoload 'online-dictionary \\\"diclookup-mule\\\" \")" >> /tmp/hack-site-start.el
-echo "      (insert \"\\\"Online dictionary.\\\" t nil)\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(autoload 'od:lookup-pattern-edit \\\"diclookup-mule\\\" \")" >> /tmp/hack-site-start.el
-echo "      (insert \"\\\"Look up a word.\\\" t nil)\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq od-chujiten-flag t)	; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq od-dictfile-list '(\\\"od-chujiten\\\" \\\"od-kojien\\\" \\\"od-readers\\\" \\\"od-crown\\\")) \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq dserver-server-list '(\\\"localhost\\\")) ; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(setq od-frame-geometry \\\"+0-0\\\" od-hide-frame \")" >> /tmp/hack-site-start.el
-echo "      (insert \"'make-invisible) ; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(add-hook 'od-really-quit-hook 'od-delete-frame) \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"(define-key-after menu-bar-file-menu [dictionary] \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (insert \"	'(\\\"Online Dictionary\\\" . online-dictionary) 'calendar) \")" >> /tmp/hack-site-start.el
-echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
-echo "      (write-file fname))))" >> /tmp/hack-site-start.el
-
-# Hack site-start.el
-echo
-echo "Updating PREFIX_DIR/lib/mule/site-lisp/site-start.el"; 
-cp PREFIX_DIR/lib/mule/site-lisp/site-start.el PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak
-
-echo "Do you like to update site-start.el automatically? (y/n) [y]" ;
-read ans;
-case x${ans} in
-	xn*|xN*)
-	echo "Do you like to change site-start.el file by yourself?(y/n) [y]" ;
-	read choice ;
-	case x${choice} in 
-		xn*|xN*)
-		echo "Okay, Do nothing." 
-		rm -f PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak ;;
-		*)
-		 mule -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
-			PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
-		echo "Edit site-start.el file by yourself (Press Return)";
-		read dummy; 
-		vi -c /diclookup PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
-		echo "original file is saved in PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak";;
-		esac;;
-	*) 
-	 mule -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
-		PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
-	echo "original file is saved in PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak" ;;
-esac
-rm -f /tmp/hack-site-start.el
-
 echo "Now startup configuration is done."
 echo "Remember to mount cdrom to PREFIX_DIR/share/dict/cdrom."
diff --git a/japanese/dserver/pkg-descr b/japanese/dserver/pkg-descr
index c49cd9d07532..0d8994a6a729 100644
--- a/japanese/dserver/pkg-descr
+++ b/japanese/dserver/pkg-descr
@@ -5,6 +5,7 @@ specified in /usr/local/lib/dserver/dserver_access file.
 Refer /usr/local/lib/dserver/doc/README.FreeBSD-setup.euc (in Japanese)
 for configuration.
 
-'kenjiro', and 'diclookup-mule.el' are installed for client programs.
-type 'kenjiro' on command line, or 'ESC-x online-dictionary' on mule.
+'kenjiro', is installed for client programs. Type 'kenjiro' on command line.
+Dictionary looking up program for Mule is also available.  
+Install diclookup-mule package.
 Look at /usr/local/lib/dserver/doc/* for more information.
diff --git a/japanese/dserver/pkg-plist b/japanese/dserver/pkg-plist
index 45fffb5ce033..311129c7ea6f 100644
--- a/japanese/dserver/pkg-plist
+++ b/japanese/dserver/pkg-plist
@@ -1,53 +1,36 @@
-bin/kenjiro
 bin/makedic
-lib/dserver/CDkojien.tbl
-lib/dserver/cdchuji.tbl
-lib/dserver/chujiten.tbl
-lib/dserver/crfre.tbl
-lib/dserver/crger.tbl
-lib/dserver/deinstall.sh
-lib/dserver/dserver
-lib/dserver/dserver_access
-lib/dserver/eiwa.tbl
-lib/dserver/kojien.tbl
-lib/dserver/kojien3.tbl
-lib/dserver/oxford.tbl
-lib/dserver/readers.tbl
-lib/dserver/setup.sh
-lib/dserver/waei.tbl
-lib/dserver/yrrs007.tbl
-lib/dserver/yrrs009.tbl
-lib/dserver/yrrs096.tbl
-lib/dserver/yrrs118.tbl
-lib/dserver/yrrs172.tbl
-lib/dserver/doc/ACKNOWLEDGMENT
+bin/kenjiro
+lib/dserver/doc/newfeature.doc
 lib/dserver/doc/CHANGES
-lib/dserver/doc/Copyright.kenjiro
-lib/dserver/doc/DICTIONARIES
-lib/dserver/doc/README.FreeBSD-setup.euc
-lib/dserver/doc/README.diclookup-mule
 lib/dserver/doc/README.dserver
-lib/dserver/doc/README.kenjiro
 lib/dserver/doc/README.table
-lib/dserver/doc/newfeature.doc
-lib/dserver/doc/protocol
 lib/dserver/doc/protocol2
-lib/mule/site-lisp/cclc.el
-lib/mule/site-lisp/diclookup-mule.el
-lib/mule/site-lisp/diclookup-mule.elc
-lib/mule/site-lisp/od-ccl.el
-lib/mule/site-lisp/od-chujiten.el
-lib/mule/site-lisp/od-chujiten.elc
-lib/mule/site-lisp/od-crown.el
-lib/mule/site-lisp/od-crown.elc
-lib/mule/site-lisp/od-italian.el
-lib/mule/site-lisp/od-italian.elc
-lib/mule/site-lisp/od-eiwa.el
-lib/mule/site-lisp/od-eiwa.elc
-lib/mule/site-lisp/od-kojien.el
-lib/mule/site-lisp/od-kojien.elc
-lib/mule/site-lisp/od-oxford.el
-lib/mule/site-lisp/od-oxford.elc
-lib/mule/site-lisp/od-readers.el
-lib/mule/site-lisp/od-readers.elc
+lib/dserver/doc/protocol
+lib/dserver/doc/DICTIONARIES
+lib/dserver/doc/ACKNOWLEDGMENT
+lib/dserver/doc/Copyright.kenjiro
+lib/dserver/doc/README.kenjiro
+lib/dserver/doc/README.FreeBSD-setup.euc
+lib/dserver/dserver
+lib/dserver/CDkojien.tbl
+lib/dserver/yrrs172.tbl
+lib/dserver/yrrs118.tbl
+lib/dserver/yrrs096.tbl
+lib/dserver/yrrs009.tbl
+lib/dserver/yrrs007.tbl
+lib/dserver/waei.tbl
+lib/dserver/readers.tbl
+lib/dserver/oxford.tbl
+lib/dserver/kojien3.tbl
+lib/dserver/kojien.tbl
+lib/dserver/eiwa.tbl
+lib/dserver/crger.tbl
+lib/dserver/crfre.tbl
+lib/dserver/chujiten.tbl
+lib/dserver/cdchuji.tbl
+lib/dserver/dserver_access
+lib/dserver/setup.sh
+lib/dserver/deinstall.sh
 man/manl/kenjiro.l.gz
+@dirrm lib/dserver/doc
+@dirrm lib/dserver