The current japanese/sj3 (sj3-2.0.1.13) has a security bug of sj3serv.

sj3-2.0.1.20 has already been released. In the version one, the bug
was fixed.

PR:		ports/8093
Submitted by:	taoka@infonets.hiroshima-u.ac.jp

30 files changed, 327 insertions, 4281 deletions

diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index 8c41501dd59d..d48639a5f120 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	SJ3
-# Version required:	2.0.1.13
-# Date created:		10 Aug 1996
+# Version required:	2.0.1.20
+# Date created:		18 Aug 1998
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/09/14 21:35:56 max Exp $
+# $Id: Makefile,v 1.6 1998/06/06 03:45:04 itojun Exp $
 #
 
-DISTNAME=	sj3-2.0.1.13
-PKGNAME=	ja-sj3-2.0.1.13
+DISTNAME=	sj3-2.0.1.20
+PKGNAME=	ja-sj3-2.0.1.20
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
@@ -17,11 +17,27 @@ MAINTAINER=	hidekazu@cs.titech.ac.jp
 MAN1=		sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
 MANLANG=	ja
 
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/sj3.sh
+
 # This port requires xmkmf but installs in /usr/local
 #
 # NOTE : You must not use 'xmkmf -a', because the running 'make depend' caused a error.
 
 do-configure:
-	( cd $(WRKDIR)/sj3-2.0.1.13 ; xmkmf ; make Makefiles )
+	( cd $(WRKSRC) ; xmkmf ; make Makefiles )
+
+post-install:
+	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
+		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
+		${ECHO} 'sj3=${PREFIX}/bin/sj3serv' >> ${STARTUP_SCRIPT} ; \
+		${ECHO} 'if [ -f $$sj3 ]; then' >> ${STARTUP_SCRIPT} ;	\
+		${ECHO} '     $$sj3' >> ${STARTUP_SCRIPT} ;		\
+		${ECHO} "fi" >> ${STARTUP_SCRIPT} ;			\
+		chmod 755 ${STARTUP_SCRIPT} ;				\
+		chown bin.bin ${STARTUP_SCRIPT};			\
+	fi
+	${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/sj3-lib/distinfo b/japanese/sj3-lib/distinfo
index 9d39008a5ba1..31c66f8d7cec 100644
--- a/japanese/sj3-lib/distinfo
+++ b/japanese/sj3-lib/distinfo
@@ -1 +1 @@
-MD5 (sj3-2.0.1.13.tar.gz) = f29a04e72a657557f7436268ccdafe49
+MD5 (sj3-2.0.1.20.tar.gz) = 36cc23702e2295e4552271b9d481c863
diff --git a/japanese/sj3-lib/files/patch-aa b/japanese/sj3-lib/files/patch-aa
index 04d311632cd0..2ff33a40a0c8 100644
--- a/japanese/sj3-lib/files/patch-aa
+++ b/japanese/sj3-lib/files/patch-aa
@@ -1,348 +1,3 @@
-diff -arcN ../sj3-2.0.1.13.org/Imakefile ./Imakefile
-*** ../sj3-2.0.1.13.org/Imakefile	Tue May 30 21:30:16 1995
---- ./Imakefile	Mon Aug 12 11:34:47 1996
-***************
-*** 35,41 ****
-  #define IHaveSubdirs
-  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-  
-! SUBDIRS = dict kanakan server sj3lib sj3 sj3dic sj3stat demo
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
---- 35,46 ----
-  #define IHaveSubdirs
-  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-  
-! /*
-!  * Add make rules to install manpages and other documents.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! SUBDIRS = dict doc kanakan server sj3lib sj3 sj3dic sj3stat demo
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
-diff -arcN ../sj3-2.0.1.13.org/README ./README
-*** ../sj3-2.0.1.13.org/README	Thu Mar 21 14:59:47 1996
---- ./README	Tue Aug 13 03:10:23 1996
-***************
-*** 20,40 ****
-  
-  	Following files are installed after make install:
-  
-! 	/usr/dict/sj3/sj3main.dic	Main dictionary(used by sj3serv)
-! 	/usr/bin/sj3serv		Kana-Kanji conversion server
-! 	/usr/bin/sj3			Kana-Kanji conversion client
-! 	/usr/bin/sj3dic			User dictionary utility
-! 	/usr/bin/sj3mkdic		Dictionary converter
-! 	/usr/bin/sj3stat		Utility to show status of sj3serv
-! 	/usr/include/sj3lib.h		Header file for sj3lib
-! 	/usr/lib/libsj3lib.a		Kana-Kanji conversion library
-! 	/usr/lib/sj3/serverrc		Configuration file for sj3serv
-! 	/usr/lib/sj3/sjrc		Configuration file for sj3
-! 	/usr/lib/sj3/sjrk		Roma-Kana conversion file for sj3
-! 	/usr/lib/sj3/cvtkey.xterm	Mapping table between function key
-! 	/usr/lib/sj3/cvtkey.news	and escape sequence for sj3
-! 	/usr/lib/sj3/cvtkey.nws511
-! 	/usr/lib/sj3/cvtkey.nws517
-  
-  * Source tree
-  	dict/dict	Main dictionary(text file)
---- 20,49 ----
-  
-  	Following files are installed after make install:
-  
-! 	/usr/local/lib/sj3/dict/sj3main.dic	Main dictionary(used by sj3serv)
-! 	/usr/local/bin/sj3serv			Kana-Kanji conversion server
-! 	/usr/local/bin/sj3			Kana-Kanji conversion client
-! 	/usr/local/bin/sj3dic			User dictionary utility
-! 	/usr/local/bin/sj3mkdic			Dictionary converter
-! 	/usr/local/bin/sj3stat			Utility to show status of sj3serv
-! 	/usr/local/include/sj3lib.h		Header file for sj3lib
-! 	/usr/local/lib/libsj3lib.a		Kana-Kanji conversion library
-! 	/usr/local/man/ja/man1/sj3.1		sj3's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3dic.1		sj3dic's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3mkdic.1	sj3mkdic's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3serv.1	sj3serv's online manual(Japanese)
-! 	/usr/local/lib/sj3/serverrc		Configuration file for sj3serv
-! 	/usr/local/lib/sj3/sjrc			Configuration file for sj3
-! 	/usr/local/lib/sj3/sjrk			Roma-Kana conversion file for sj3
-! 	/usr/local/lib/sj3/cvtkey.xterm		Mapping table between function key
-! 	/usr/local/lib/sj3/cvtkey.news		and escape sequence for sj3
-! 	/usr/local/lib/sj3/cvtkey.nws511
-! 	/usr/local/lib/sj3/cvtkey.nws517
-! 	/usr/local/lib/sj3/Nihongo.ps.Z		Operation guide for SJ3(Japanese)
-! 	/usr/local/lib/sj3/hinsi.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/makedict.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/sj3lib.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/sj3serv.ms		Documents(Japanese)
-  
-  * Source tree
-  	dict/dict	Main dictionary(text file)
-diff -arcN ../sj3-2.0.1.13.org/README.eucJP ./README.eucJP
-*** ../sj3-2.0.1.13.org/README.eucJP	Thu Mar 21 15:00:11 1996
---- ./README.eucJP	Tue Aug 13 03:10:45 1996
-***************
-*** 28,48 ****
-  
-  	この操作によりインストールされるファイルをいかに示します。
-  
-! 	/usr/dict/sj3/sj3main.dic	sj3serv が使用するメイン辞書
-! 	/usr/bin/sj3serv		仮名漢字変換サーバ
-! 	/usr/bin/sj3			端末用仮名漢字変換クライアント
-! 	/usr/bin/sj3dic			ユーザ辞書ユーティリティ
-! 	/usr/bin/sj3mkdic		辞書生成ツール
-! 	/usr/bin/sj3stat		sj3serv への接続状況表示ユーティリティ
-! 	/usr/include/sj3lib.h		仮名漢字変換ライブラリのヘッダファイル
-! 	/usr/lib/libsj3lib.a		仮名漢字変換ライブラリ
-! 	/usr/lib/sj3/serverrc		sj3serv の設定ファイル
-! 	/usr/lib/sj3/sjrc		sj3 の設定ファイル
-! 	/usr/lib/sj3/sjrk		sj3 のローマ字仮名変換設定ファイル
-! 	/usr/lib/sj3/cvtkey.xterm	sj3 のファンクションキーとエスケープ
-! 	/usr/lib/sj3/cvtkey.news	シーケンスの対応を設定するファイル。
-! 	/usr/lib/sj3/cvtkey.nws511
-! 	/usr/lib/sj3/cvtkey.nws517
-  
-  
-  ・ディレクトリ構成
---- 28,57 ----
-  
-  	この操作によりインストールされるファイルをいかに示します。
-  
-! 	/usr/local/lib/sj3/dict/sj3main.dic	sj3serv が使用するメイン辞書
-! 	/usr/local/bin/sj3serv			仮名漢字変換サーバ
-! 	/usr/local/bin/sj3			端末用仮名漢字変換クライアント
-! 	/usr/local/bin/sj3dic			ユーザ辞書ユーティリティ
-! 	/usr/local/bin/sj3mkdic			辞書生成ツール
-! 	/usr/local/bin/sj3stat			sj3serv への接続状況表示ユーティリティ
-! 	/usr/local/include/sj3lib.h		仮名漢字変換ライブラリのヘッダファイル
-! 	/usr/local/lib/libsj3lib.a		仮名漢字変換ライブラリ
-! 	/usr/local/man/ja/man1/sj3.1		sj3 のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3dic.1		sj3dic のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3mkdic.1	sj3mkdic のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3serv.1	sj3serv のオンラインマニュアル
-! 	/usr/local/lib/sj3/serverrc		sj3serv の設定ファイル
-! 	/usr/local/lib/sj3/sjrc			sj3 の設定ファイル
-! 	/usr/local/lib/sj3/sjrk			sj3 のローマ字仮名変換設定ファイル
-! 	/usr/local/lib/sj3/cvtkey.xterm		sj3 のファンクションキーとエスケープ
-! 	/usr/local/lib/sj3/cvtkey.news		シーケンスの対応を設定するファイル。
-! 	/usr/local/lib/sj3/cvtkey.nws511
-! 	/usr/local/lib/sj3/cvtkey.nws517	
-! 	/usr/local/lib/sj3/Nihongo.ps.Z		SJ3 日本語入力ガイド
-! 	/usr/local/lib/sj3/hinsi.ms		ドキュメント
-! 	/usr/local/lib/sj3/makedict.ms		ドキュメント
-! 	/usr/local/lib/sj3/sj3lib.ms		ドキュメント
-! 	/usr/local/lib/sj3/sj3serv.ms		ドキュメント
-  
-  
-  ・ディレクトリ構成
-diff -arcN ../sj3-2.0.1.13.org/demo/sample.c ./demo/sample.c
-*** ../sj3-2.0.1.13.org/demo/sample.c	Fri Jun  3 17:00:16 1994
---- ./demo/sample.c	Mon Aug 12 12:30:29 1996
-***************
-*** 44,50 ****
-  #include "wchar16.h"
-  
-  #define	RETURN(c)	((c == '\n') || (c == '\r'))
-! #define	RKFILE		"/usr/lib/sj3/sjrk"
-  #define	LOCALHOST	"localhost"
-  #define	HBUFSIZ		512
-  #define	QBUFSIZ		256
---- 44,54 ----
-  #include "wchar16.h"
-  
-  #define	RETURN(c)	((c == '\n') || (c == '\r'))
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! #define	RKFILE		"/usr/local/lib/sj3/sjrk"
-  #define	LOCALHOST	"localhost"
-  #define	HBUFSIZ		512
-  #define	QBUFSIZ		256
-diff -arcN ../sj3-2.0.1.13.org/dict/dict/Imakefile ./dict/dict/Imakefile
-*** ../sj3-2.0.1.13.org/dict/dict/Imakefile	Fri Dec  9 20:27:05 1994
---- ./dict/dict/Imakefile	Tue Aug 13 03:14:31 1996
-***************
-*** 32,38 ****
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! DICTDIR         = /usr/dict/sj3
-  
-  TOOL_DIR      = ../tool
-  TOOL_NAME     = sj3mkdic
---- 32,43 ----
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DICTDIR         = /usr/local/lib/sj3/dict
-  
-  TOOL_DIR      = ../tool
-  TOOL_NAME     = sj3mkdic
-***************
-*** 44,52 ****
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= staff
-  #endif
-! INSTFLAGS	= -o root -g $(INSTGROUP) -m 444
-  
-! all:		$(OBJS)
-  
---- 49,57 ----
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= bin
-  #endif
-! INSTFLAGS	= -o bin -g $(INSTGROUP) -m 444
-  
-! all::		$(OBJS)
-  
-diff -arcN ../sj3-2.0.1.13.org/dict/tool/Imakefile ./dict/tool/Imakefile
-*** ../sj3-2.0.1.13.org/dict/tool/Imakefile	Fri Dec  9 20:27:05 1994
---- ./dict/tool/Imakefile	Mon Aug 12 11:38:02 1996
-***************
-*** 32,47 ****
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! DEST            = /usr/bin
-  
-  INCLUDES = -I../include -I../../include
-  #if SystemV4 || SystemV
-  INSTGROUP       = bin
-  #else
-! INSTGROUP       = staff
-  #endif
-  
-! INSTFLAGS       = -o root -g $(INSTGROUP) -m 755
-  
-  SRCS = \
-  	char.c \
---- 32,52 ----
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST            = /usr/local/bin
-  
-  INCLUDES = -I../include -I../../include
-  #if SystemV4 || SystemV
-  INSTGROUP       = bin
-  #else
-! INSTGROUP       = bin
-  #endif
-  
-! INSTFLAGS       = -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS = \
-  	char.c \
-diff -arcN ../sj3-2.0.1.13.org/doc/Imakefile ./doc/Imakefile
-*** ../sj3-2.0.1.13.org/doc/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/Imakefile	Mon Aug 12 11:34:22 1996
-***************
-*** 0 ****
---- 1,40 ----
-+ /*
-+  * Copyright (c) 1991-1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install manpages and other documents.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ #define IHaveSubdirs
-+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-+ 
-+ SUBDIRS = doc man
-+ 
-+ MakeSubdirs($(SUBDIRS))
-+ DependSubdirs($(SUBDIRS))
-diff -arcN ../sj3-2.0.1.13.org/doc/doc/Imakefile ./doc/doc/Imakefile
-*** ../sj3-2.0.1.13.org/doc/doc/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/doc/Imakefile	Mon Aug 12 11:34:34 1996
-***************
-*** 0 ****
---- 1,41 ----
-+ /*
-+  * Copyright (c) 1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install other documents.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ CONFDIR 	= /usr/local/lib/sj3
-+ DOCLIST		= Nihongo.ps.Z hinsi.ms makedict.ms sj3lib.ms sj3serv.ms
-+ 
-+ all::
-+ 
-+ depend::
-+ 
-+ InstallMultiple($(DOCLIST),$(CONFDIR))
 diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms
 *** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms	Fri Jun  3 17:00:49 1994
 --- ./doc/doc/sj3lib.ms	Tue Aug 13 03:17:26 1996
@@ -502,62 +157,6 @@ diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3serv.ms ./doc/doc/sj3serv.ms
   .RE
   .sp
   .NH 3
-diff -arcN ../sj3-2.0.1.13.org/doc/man/Imakefile ./doc/man/Imakefile
-*** ../sj3-2.0.1.13.org/doc/man/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/man/Imakefile	Mon Aug 12 11:34:15 1996
-***************
-*** 0 ****
---- 1,50 ----
-+ /*
-+  * Copyright (c) 1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install manpages.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ #ifndef JapaneseManLocale
-+ #define JapaneseManLocale	ja
-+ #endif
-+ JMANLOCALE = JapaneseManLocale
-+ 
-+ #ifndef JapaneseManDir
-+ #define JapaneseManDir		/usr/local/man/$(JMANLOCALE)/man1
-+ #endif
-+ 
-+ JMANDIR 	= JapaneseManDir
-+ MANLIST		= sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
-+ 
-+ all::
-+ 
-+ depend::
-+ 
-+ InstallMultipleFlags($(MANLIST),$(JMANDIR),$(INSTMANFLAGS))
 diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3.1 ./doc/man/sj3.1
 *** ../sj3-2.0.1.13.org/doc/man/sj3.1	Fri Jun  3 17:00:51 1994
 --- ./doc/man/sj3.1	Tue Aug 13 03:18:59 1996
@@ -760,321 +359,6 @@ diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3serv.1 ./doc/man/sj3serv.1
   かな漢字変換サーバ デフォルト辞書ディレクトリ
   .TP
       sj3main.dic
-diff -arcN ../sj3-2.0.1.13.org/include/Const.h ./include/Const.h
-*** ../sj3-2.0.1.13.org/include/Const.h	Fri Oct 21 13:16:19 1994
---- ./include/Const.h	Tue Aug 13 03:13:39 1996
-***************
-*** 33,38 ****
---- 33,42 ----
-   * $SonyDate: 1994/10/21 04:16:06 $
-   */
-  
-+ /*
-+  * Change some default values.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-  
-  
-  #define	HostNameLen		128			
-***************
-*** 54,66 ****
-  #define	MinClLen		512
-  #define	MaxClLen		0x7fff
-  
-! #define	RunCmdFile		"/usr/lib/sj3/serverrc"
-  #define	DebugOutFile		NULL	
-  #define	DebugLevel		0
-  #define	ForkFlag		1
-  #define	MaxClientNum		512
-  #define	ErrorOutFile		"/dev/console"
-! #define	DictRootDir		"/usr/dict/sj3"
-  #define	LogOutFile		NULL	
-  #define	PortName		"sj3"
-  #ifdef TLI
---- 58,85 ----
-  #define	MinClLen		512
-  #define	MaxClLen		0x7fff
-  
-! #define	RunCmdFile		"/usr/local/lib/sj3/serverrc"
-  #define	DebugOutFile		NULL	
-  #define	DebugLevel		0
-  #define	ForkFlag		1
-  #define	MaxClientNum		512
-+ /*
-+  * Change ErrotOutFile variable.
-+  * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+  * This error is "Cannot Open "/dev/console".". 
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  *
-+  * Change ErrotOutFile variable.
-+  * This default value is "/dev/null" in document.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
-+  */
-+ #if 0
-  #define	ErrorOutFile		"/dev/console"
-! #else
-! /* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
-! #define	ErrorOutFile		"/dev/null"
-! #endif
-! #define	DictRootDir		"/usr/local/lib/sj3/dict"
-  #define	LogOutFile		NULL	
-  #define	PortName		"sj3"
-  #ifdef TLI
-diff -arcN ../sj3-2.0.1.13.org/server/Imakefile ./server/Imakefile
-*** ../sj3-2.0.1.13.org/server/Imakefile	Fri Jun  3 17:02:50 1994
---- ./server/Imakefile	Mon Aug 12 11:38:51 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:02:49 $
-   */
-  
-! DEST	        = /usr/bin
-! CONFDIR 	= /usr/lib/sj3
-  CONFFILE        = $(CONFDIR)/serverrc
-  RKDIR           = ../sj3lib
-  
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:02:49 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-! CONFDIR 	= /usr/local/lib/sj3
-  CONFFILE        = $(CONFDIR)/serverrc
-  RKDIR           = ../sj3lib
-  
-***************
-*** 45,59 ****
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= staff
-  #endif
-  DEFINES          = $(ARCDEFS) $(SYSDEFS) $(USETLI) 
-  
-  CONVLIB         = ../kanakan/libkanakan.a
-  DEPLIBS         = $(CONVLIB)
-  LOCAL_LIBRARIES = $(CONVLIB)
-! INSTFLAGS	= -o root -g $(INSTGROUP) -m 4755
-! INSTFLAGS2	= -o root -g $(INSTGROUP) -m 444
-  
-  #MKDIRHIER       = ../util/mkdirh/mkdirh
-  
---- 50,64 ----
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= bin
-  #endif
-  DEFINES          = $(ARCDEFS) $(SYSDEFS) $(USETLI) 
-  
-  CONVLIB         = ../kanakan/libkanakan.a
-  DEPLIBS         = $(CONVLIB)
-  LOCAL_LIBRARIES = $(CONVLIB)
-! INSTFLAGS	= -o bin -g $(INSTGROUP) -m 4755
-! INSTFLAGS2	= -o bin -g $(INSTGROUP) -m 444
-  
-  #MKDIRHIER       = ../util/mkdirh/mkdirh
-  
-***************
-*** 80,83 ****
-  DependTarget()
-  LinkSourceFile(string.c,$(RKDIR))
-  InstallProgramWithFlags(sj3serv,$(DEST),$(INSTFLAGS))
-! InstallProgramWithFlags(serverrc,$(CONFDIR),$(INSTFLAGS2))
---- 85,88 ----
-  DependTarget()
-  LinkSourceFile(string.c,$(RKDIR))
-  InstallProgramWithFlags(sj3serv,$(DEST),$(INSTFLAGS))
-! InstallMultipleFlags(serverrc,$(CONFDIR),$(INSTFLAGS2))
-diff -arcN ../sj3-2.0.1.13.org/server/rc.sj3serv ./server/rc.sj3serv
-*** ../sj3-2.0.1.13.org/server/rc.sj3serv	Fri Jun  3 17:02:55 1994
---- ./server/rc.sj3serv	Mon Aug 12 11:48:07 1996
-***************
-*** 41,49 ****
-  CMDNAME=sj3serv
-  
-  PRINTNAME=$CMDNAME
-! CMDDIR=/usr/bin
-  BACKGROUND=
-! PATH=/usr/bin:/bin
-  CMDPATH=$CMDDIR/$CMDNAME
-  
-  RESTARTMESSAGE=
---- 41,49 ----
-  CMDNAME=sj3serv
-  
-  PRINTNAME=$CMDNAME
-! CMDDIR=/usr/local/bin
-  BACKGROUND=
-! PATH=/usr/local/bin:/usr/bin:/bin
-  CMDPATH=$CMDDIR/$CMDNAME
-  
-  RESTARTMESSAGE=
-***************
-*** 54,111 ****
-  #DOWNMESSAGE="Killed $PRINTNAME"
-  USAGEMESSAGE="Usage: $0 [start|stop]"
-  
-  if [ "$CMDNAME" = "sj3serv" ]
-  then
-! 	if [ ! -d /usr/bin ]
-! 	then                    # /usr not mounted
-  	        exit
-  	fi
-  
-- 	pid=`/sbin/findproc $CMDNAME`
-  	case "$1" in
-  	'start')
-! 		if [ $pid ] 
-! 		then	
-! 			kill -TERM $pid
-! 			sleep 1
-! 			pid=`/sbin/findproc $CMDNAME`
-! 			if [ $pid ] 
-! 			then
-! 				kill -9 $pid
-! 			fi
-! 			if [ -f $CMDPATH ]
-  			then
-! 				if [ "$RESTARTMESSAGE" ] 
-! 				then 
-! 					echo $RESTARTMESSAGE > /dev/console
-! 				fi
-! 				eval $CMDPATH $BACKGROUND
-  			fi	
-! 		else
-! 			if [ -f $CMDPATH ]
-! 			then 
-! 				if [ "$STARTMESSAGE" ]
-! 				then
-! 					echo $STARTMESSAGE >/dev/console 
-! 				fi	
-!                                 eval $CMDPATH $BACKGROUND
-! 			fi
-  		fi
-  		;;
-  	'stop')
-! 		if [ $pid ]
-! 		then
-! 			kill -TERM $pid
-! 			sleep 1
-! 			pid=`/sbin/findproc $CMDNAME`
-! 			if [ $pid ] 
-! 			then 
-! 				kill -9 $pid
-! 			fi
-! 			if [ "$DOWNMESSAGE" ]
-  			then
-! 				echo $DOWNMESSAGE > /dev/console
-! 			fi
-  		fi
-  		;;
-  	*)
---- 54,152 ----
-  #DOWNMESSAGE="Killed $PRINTNAME"
-  USAGEMESSAGE="Usage: $0 [start|stop]"
-  
-+ #if [ "$CMDNAME" = "sj3serv" ]
-+ #then
-+ #	if [ ! -d /usr/local/bin ]
-+ #	then                    # /usr/local not mounted
-+ #	        exit
-+ #	fi
-+ #
-+ #	pid=`/sbin/findproc $CMDNAME`
-+ #	case "$1" in
-+ #	'start')
-+ #		if [ $pid ] 
-+ #		then	
-+ #			kill -TERM $pid
-+ #			sleep 1
-+ #			pid=`/sbin/findproc $CMDNAME`
-+ #			if [ $pid ] 
-+ #			then
-+ #				kill -9 $pid
-+ #			fi
-+ #			if [ -f $CMDPATH ]
-+ #			then
-+ #				if [ "$RESTARTMESSAGE" ] 
-+ #				then 
-+ #					echo $RESTARTMESSAGE > /dev/console
-+ #				fi
-+ #				eval $CMDPATH $BACKGROUND
-+ #			fi	
-+ #		else
-+ #			if [ -f $CMDPATH ]
-+ #			then 
-+ #				if [ "$STARTMESSAGE" ]
-+ #				then
-+ #					echo $STARTMESSAGE >/dev/console 
-+ #				fi	
-+ #                                eval $CMDPATH $BACKGROUND
-+ #			fi
-+ #		fi
-+ #		;;
-+ #	'stop')
-+ #		if [ $pid ]
-+ #		then
-+ #			kill -TERM $pid
-+ #			sleep 1
-+ #			pid=`/sbin/findproc $CMDNAME`
-+ #			if [ $pid ] 
-+ #			then 
-+ #				kill -9 $pid
-+ #			fi
-+ #			if [ "$DOWNMESSAGE" ]
-+ #			then
-+ #				echo $DOWNMESSAGE > /dev/console
-+ #			fi
-+ #		fi
-+ #		;;
-+ #	*)
-+ #		echo $USAGEMESSAGE 
-+ #		;;	
-+ #	esac	
-+ #fi
-+ 
-+ ##
-+ ## For system which don't have a findproc command.(FreeBSD, ...)
-+ ## Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ ##
-+ 
-  if [ "$CMDNAME" = "sj3serv" ]
-  then
-! 	if [ ! -d /usr/local/bin ]
-! 	then                    # /usr/local not mounted
-  	        exit
-  	fi
-  
-  	case "$1" in
-  	'start')
-! 		if [ -f $CMDPATH ]
-! 		then 
-! 			if [ "$STARTMESSAGE" ]
-  			then
-! 				echo $STARTMESSAGE >/dev/console 
-  			fi	
-! 			eval $CMDPATH $BACKGROUND
-  		fi
-  		;;
-  	'stop')
-! 		;;
-! 	'')
-! 		if [ -f $CMDPATH ]
-! 		then 
-! 			if [ "$STARTMESSAGE" ]
-  			then
-! 				echo $STARTMESSAGE >/dev/console 
-! 			fi	
-! 			eval $CMDPATH $BACKGROUND
-  		fi
-  		;;
-  	*)
 diff -arcN ../sj3-2.0.1.13.org/server/setup.c ./server/setup.c
 *** ../sj3-2.0.1.13.org/server/setup.c	Fri Dec  9 20:27:07 1994
 --- ./server/setup.c	Mon Aug 12 23:58:25 1996
@@ -1164,702 +448,3 @@ diff -arcN ../sj3-2.0.1.13.org/server/setup.c ./server/setup.c
   	"allowuser",	get_list,	(int)&allow_user,
   	0, 0, 0
   };
-diff -arcN ../sj3-2.0.1.13.org/sj3/Imakefile ./sj3/Imakefile
-*** ../sj3-2.0.1.13.org/sj3/Imakefile	Fri Jun  3 17:03:02 1994
---- ./sj3/Imakefile	Mon Aug 12 18:29:43 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:03:01 $
-   */
-  
-! DEST	        = /usr/bin
-! CONFDIR 	= /usr/lib/sj3
-  
-  INCLUDES        =  -I../sj3h  -I../sj3lib -I../include
-  #if SystemV4 || SystemV
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:03:01 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-! CONFDIR 	= /usr/local/lib/sj3
-  
-  INCLUDES        =  -I../sj3h  -I../sj3lib -I../include
-  #if SystemV4 || SystemV
-***************
-*** 48,56 ****
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= staff
-  SRC0		= nmttyslot.c
-  OBJ0		= nmttyslot.o
-  #endif
-  DEFINES		= $(ARCDEFS) $(SYSDEFS) -DKANJI -DOKB 
-  
---- 53,70 ----
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= bin
-  SRC0		= nmttyslot.c
-  OBJ0		= nmttyslot.o
-+ /*
-+  * Change for FreeBSD.
-+  * Because When the LANG variable is EUC, setlocale function in library libc 
-+  * return NULL, use it in library libxpg4 
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ #if defined(FreeBSDArchitecture)
-+ CODE_LIBS	= -lxpg4
-+ #endif
-  #endif
-  DEFINES		= $(ARCDEFS) $(SYSDEFS) -DKANJI -DOKB 
-  
-***************
-*** 59,65 ****
-  SJ3_LIBDIR          = ../sj3lib
-  RKDIR = ../sj3rkcv
-  SJLIB           = $(SJ3_LIBDIR)/libsj3lib.a
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 4755
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
---- 73,79 ----
-  SJ3_LIBDIR          = ../sj3lib
-  RKDIR = ../sj3rkcv
-  SJLIB           = $(SJ3_LIBDIR)/libsj3lib.a
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 4755
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/edit.c ./sj3/edit.c
-*** ../sj3-2.0.1.13.org/sj3/edit.c	Fri Jun  3 17:03:14 1994
---- ./sj3/edit.c	Tue Aug 13 01:02:16 1996
-***************
-*** 302,308 ****
-  	cv = GetConversion ();
-  	if (cv->Ppoint[n+1] == 0)
-  		return;
-! 	mlen = strlen (cv->Ppoint[n+1]);
-  	plen = cv->Ppoint[n] - cv->Ppoint[0];
-  	p = cv->Ppoint[n];
-  	pp = &cv->out_mode[plen];
---- 302,313 ----
-  	cv = GetConversion ();
-  	if (cv->Ppoint[n+1] == 0)
-  		return;
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	mlen = strlen (cv->Ppoint[n+1]); */
-! 	mlen = strlen ((char *)cv->Ppoint[n+1]);
-  	plen = cv->Ppoint[n] - cv->Ppoint[0];
-  	p = cv->Ppoint[n];
-  	pp = &cv->out_mode[plen];
-***************
-*** 728,734 ****
-  
-  	ylen = wslen(Zs);
-  	limit = Elimit - ylen;
-! 	hlimit = Ehlimit - strlen(Hs);
-  	*ztmp = '\0';
-  	*htmp = '\0';
-  	SaveConversion (GetConversion ());
---- 733,744 ----
-  
-  	ylen = wslen(Zs);
-  	limit = Elimit - ylen;
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	hlimit = Ehlimit - strlen(Hs); */
-! 	hlimit = Ehlimit - strlen((char *)Hs);
-  	*ztmp = '\0';
-  	*htmp = '\0';
-  	SaveConversion (GetConversion ());
-***************
-*** 749,755 ****
-  		else
-  			(void)exec_romaji2(inc, htmp, ztmp, otmp, len, rlen);
-  	}
-! 	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen(ztmp), strlen(htmp));
-  	sj3_rkclear();
-  	len = wslen (ztmp);
-  	backspace(wcbyte(ztmp));
---- 759,770 ----
-  		else
-  			(void)exec_romaji2(inc, htmp, ztmp, otmp, len, rlen);
-  	}
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen(ztmp), strlen(htmp)); */
-! 	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen((char *)ztmp), strlen((char *)htmp));
-  	sj3_rkclear();
-  	len = wslen (ztmp);
-  	backspace(wcbyte(ztmp));
-diff -arcN ../sj3-2.0.1.13.org/sj3/funckey.c ./sj3/funckey.c
-*** ../sj3-2.0.1.13.org/sj3/funckey.c	Fri Jun  3 17:03:18 1994
---- ./sj3/funckey.c	Mon Aug 12 11:53:25 1996
-***************
-*** 117,123 ****
-  	struct cvtkey *ckeyp;
-  	struct wcvtkey *wckeyp;
-  
-! 	strcpy(cvtkey_file, "/usr/lib/sj3/cvtkey.");
-  	strcpy(line, term);
-  	if((p = strchr(line, '-')) != NULL)
-  		*p = '\0';
---- 117,127 ----
-  	struct cvtkey *ckeyp;
-  	struct wcvtkey *wckeyp;
-  
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 	strcpy(cvtkey_file, "/usr/local/lib/sj3/cvtkey.");
-  	strcpy(line, term);
-  	if((p = strchr(line, '-')) != NULL)
-  		*p = '\0';
-diff -arcN ../sj3-2.0.1.13.org/sj3/henkan.c ./sj3/henkan.c
-*** ../sj3-2.0.1.13.org/sj3/henkan.c	Fri Jun  3 17:03:19 1994
---- ./sj3/henkan.c	Tue Aug 13 01:01:25 1996
-***************
-*** 340,346 ****
-  		out += i;
-  	}
-  	if (*in != '\0')
-! 		(void)sj_hantozen(out, in, strlen(in));
-  }			
-  
-  
---- 340,351 ----
-  		out += i;
-  	}
-  	if (*in != '\0')
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		(void)sj_hantozen(out, in, strlen(in)); */
-! 		(void)sj_hantozen(out, in, strlen((char *)in));
-  }			
-  
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/romaji.c ./sj3/romaji.c
-*** ../sj3-2.0.1.13.org/sj3/romaji.c	Fri Jun  3 17:03:22 1994
---- ./sj3/romaji.c	Tue Aug 13 01:03:23 1996
-***************
-*** 370,376 ****
-  		s2 += i;
-  		roma[res + i] = '\0';
-  		rlen = sj3_rkconv2(roma, kstr, i + res - 1);
-! 		res = strlen(roma);
-  		if (rlen <= 0)
-  			continue;
-  		kp = kstr;
---- 370,381 ----
-  		s2 += i;
-  		roma[res + i] = '\0';
-  		rlen = sj3_rkconv2(roma, kstr, i + res - 1);
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		res = strlen(roma); */
-! 		res = strlen((char *)roma);
-  		if (rlen <= 0)
-  			continue;
-  		kp = kstr;
-diff -arcN ../sj3-2.0.1.13.org/sj3/sj3.c ./sj3/sj3.c
-*** ../sj3-2.0.1.13.org/sj3/sj3.c	Fri Apr  7 17:36:34 1995
---- ./sj3/sj3.c	Tue Aug 13 02:47:32 1996
-***************
-*** 189,195 ****
-  	(void) signal (SIGBUS, (void (*)())makecore);
-  	(void) signal (SIGSEGV, (void (*)())makecore);
-  	(void) signal (SIGFPE, (void (*)())makecore);
-! 	sigpipe = signal (SIGPIPE, SIG_IGN);
-  
-  	if (argv [0][0] == '-')
-  		Lflag ++;
---- 189,204 ----
-  	(void) signal (SIGBUS, (void (*)())makecore);
-  	(void) signal (SIGSEGV, (void (*)())makecore);
-  	(void) signal (SIGFPE, (void (*)())makecore);
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	sigpipe = signal (SIGPIPE, SIG_IGN); */
-! #ifdef SIGTYPE_VOID
-! 	sigpipe = (void(*)()) signal (SIGPIPE, SIG_IGN);
-! #else
-! 	sigpipe = (int(*)()) signal (SIGPIPE, SIG_IGN);
-! #endif
-  
-  	if (argv [0][0] == '-')
-  		Lflag ++;
-***************
-*** 452,466 ****
---- 461,499 ----
-  
-  	ioctl(master, I_PUSH, "pckt");		
-  #else 
-+ /*
-+  * 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/10
-+  */
-+ #if defined(__FreeBSD__)
-+ 	struct stat	stb;
-+ 	int		h, i, j, k1, k2;
-+ #else /* !__FreeBSD__ */
-  	char		c;
-  	struct stat	stb;
-  	int		i, j, k1, k2;
-+ #endif /* __FreeBSD__ */
-  
-  	strcpy(line, "/dev/ptyXX");
-  
-  	k1 = strlen("/dev/pty");
-  	k2 = strlen ("/dev/ptyp");
-  
-+ /*
-+  * 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/10
-+  */
-+ #if defined(__FreeBSD__)
-+ 	for (h = 0; h < 8; h++) {
-+ 		line[k1] = "pqrsPQRS"[h];
-+ 		line[k2] = '0';
-+ 		if (stat (line, &stb) < 0)
-+ 			break;
-+ 		for (i = 0; i < 32; i++) {
-+ 			line[k2] = "0123456789abcdefghijklmnopqrstuv"[i];
-+ #else /* !__FreeBSD__ */
-  	for (c = 'p'; c <= 'z'; c ++) { 
-  		line[k1] = c;
-  		line[k2] = '0';
-***************
-*** 468,473 ****
---- 501,507 ----
-  			break;
-  		for (i = 0; i < 16; i++) {
-  			line[k2] = "0123456789abcdef"[i];
-+ #endif /* __FreeBSD__ */
-  			master = open (line, 2);
-  			if (master >= 0) {
-  				j = 1;
-***************
-*** 681,687 ****
-  	}
-  
-  #ifndef SVR4
-! 	(void) signal (SIGCHLD, exitprocess);
-  #endif 
-  }
-  
---- 715,726 ----
-  	}
-  
-  #ifndef SVR4
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGCHLD, exitprocess); */
-! 	(void) signal (SIGCHLD, (void (*)())exitprocess);
-  #endif 
-  }
-  
-***************
-*** 787,792 ****
---- 826,836 ----
-  #else /* SYSV_TERMIOS */
-  	struct utmp		Utmp;
-  	register char		*p;
-+ /*
-+  * Remove warning.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 	char			*ttyname (), *strrchr ();
-  #define SCPYN(a, b) strncpy(a, b, sizeof(a))
-  
-  	if ((p = ttyname (0)) == NULL)
-***************
-*** 836,842 ****
-  		shellargs[1] = (char *) 0;
-  	}
-  
-! 	(void) signal (SIGPIPE, sigpipe);
-  	if ( *shellprog == '/' ) {
-  		if (shell_flag) {
-  			strcpy (shellbuf, "SHELL=");
---- 880,891 ----
-  		shellargs[1] = (char *) 0;
-  	}
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGPIPE, sigpipe); */
-! 	(void) signal (SIGPIPE, (void (*)())sigpipe);
-  	if ( *shellprog == '/' ) {
-  		if (shell_flag) {
-  			strcpy (shellbuf, "SHELL=");
-***************
-*** 1006,1012 ****
-  	union wait	status;
-  	int		pid;
-  
-! 	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0);
-  	if (WIFSTOPPED (status))
-  #endif
-  		suspend();
---- 1055,1066 ----
-  	union wait	status;
-  	int		pid;
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0); */
-! 	pid = wait3 ((int *)&status, (WNOHANG|WUNTRACED), 0);
-  	if (WIFSTOPPED (status))
-  #endif
-  		suspend();
-***************
-*** 1068,1080 ****
-  		SetRegion();
-  	}
-  
-! 	old_sigtstp = signal (SIGTSTP, SIG_DFL);
-  
-  	kill (0, SIGTSTP);
-  
-  	
-  
-! 	(void) signal (SIGTSTP, old_sigtstp);
-  	killpg (Pid_shell, SIGCONT);
-  	fixtty ();
-  
---- 1122,1148 ----
-  		SetRegion();
-  	}
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	old_sigtstp = signal (SIGTSTP, SIG_DFL); */
-! #ifdef SIGTYPE_VOID
-! 	old_sigtstp = (void(*)()) signal (SIGTSTP, SIG_DFL);
-! #else
-! 	old_sigtstp = (int(*)()) signal (SIGTSTP, SIG_DFL);
-! #endif
-  
-  	kill (0, SIGTSTP);
-  
-  	
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGTSTP, old_sigtstp); */
-! 	(void) signal (SIGTSTP, (void (*)())old_sigtstp);
-  	killpg (Pid_shell, SIGCONT);
-  	fixtty ();
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/sjrc.c ./sj3/sjrc.c
-*** ../sj3-2.0.1.13.org/sj3/sjrc.c	Fri Dec  9 20:27:09 1994
---- ./sj3/sjrc.c	Tue Aug 13 00:53:22 1996
-***************
-*** 52,59 ****
-  extern char	home[];
-  extern char	term_name[];
-  extern int      current_locale;
-! #define DEFRKFILE "/usr/lib/sj3/sjrk"
-! #define DEFRCFILE "/usr/lib/sj3/sjrc"
-  
-  #define GUIDELEN	80
-  
---- 52,63 ----
-  extern char	home[];
-  extern char	term_name[];
-  extern int      current_locale;
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! #define DEFRKFILE "/usr/local/lib/sj3/sjrk"
-! #define DEFRCFILE "/usr/local/lib/sj3/sjrc"
-  
-  #define GUIDELEN	80
-  
-***************
-*** 442,448 ****
-  struct wordent	word[];
-  {
-  	if (word[1].word_str[0] != '\0' && shellprog[0] == '\0') {
-! 		strcpy (shellprog, word[1].word_str);
-  		shell_flag++;
-  	}
-  }
---- 446,457 ----
-  struct wordent	word[];
-  {
-  	if (word[1].word_str[0] != '\0' && shellprog[0] == '\0') {
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		strcpy (shellprog, word[1].word_str); */
-! 		strcpy (shellprog, (char *)word[1].word_str);
-  		shell_flag++;
-  	}
-  }
-diff -arcN ../sj3-2.0.1.13.org/sj3dic/Imakefile ./sj3dic/Imakefile
-*** ../sj3-2.0.1.13.org/sj3dic/Imakefile	Fri Jun  3 17:03:33 1994
---- ./sj3dic/Imakefile	Mon Aug 12 12:20:15 1996
-***************
-*** 32,38 ****
-   * $SonyDate: 1994/06/03 08:03:32 $
-   */
-  
-! DEST	        = /usr/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
---- 32,43 ----
-   * $SonyDate: 1994/06/03 08:03:32 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-***************
-*** 41,47 ****
-  CODE_LIBS       = -ljcode
-  #endif
-  #else
-! INSTGROUP	= staff
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
---- 46,52 ----
-  CODE_LIBS       = -ljcode
-  #endif
-  #else
-! INSTGROUP	= bin
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
-***************
-*** 52,58 ****
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 755
-  
-  SRCS          = codecnv.c \
-                  dictdisp.c \
---- 57,63 ----
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS          = codecnv.c \
-                  dictdisp.c \
-diff -arcN ../sj3-2.0.1.13.org/sj3h/sj2.h ./sj3h/sj2.h
-*** ../sj3-2.0.1.13.org/sj3h/sj2.h	Fri Jun  3 17:03:51 1994
---- ./sj3h/sj2.h	Tue Aug 13 01:14:54 1996
-***************
-*** 95,103 ****
-  
-  
-  
-  #define TRUE	0
-  #define FALSE	-1
-! 
-  
-  
-  struct	wordent {
---- 95,115 ----
-  
-  
-  
-+ /*
-+  * Remove warning.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ #if defined(TRUE) && defined(FALSE)
-+ #if (TRUE != 0) || (TRUE != -1)
-+ #undef TRUE
-+ #undef FALSE
-  #define TRUE	0
-  #define FALSE	-1
-! #endif
-! #else
-! #define TRUE	0
-! #define FALSE	-1
-! #endif
-  
-  
-  struct	wordent {
-diff -arcN ../sj3-2.0.1.13.org/sj3lib/Imakefile ./sj3lib/Imakefile
-*** ../sj3-2.0.1.13.org/sj3lib/Imakefile	Fri Jun  3 17:03:54 1994
---- ./sj3lib/Imakefile	Mon Aug 12 12:22:02 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:03:53 $
-   */
-  
-! INSTALL_LIBDIR = /usr/lib
-! INSTALL_HDRDIR = /usr/include
-  #if SystemV4 || SystemV
-  DEFINES = -DTLI
-  #endif
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:03:53 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! INSTALL_LIBDIR = /usr/local/lib
-! INSTALL_HDRDIR = /usr/local/include
-  #if SystemV4 || SystemV
-  DEFINES = -DTLI
-  #endif
-diff -arcN ../sj3-2.0.1.13.org/sj3stat/Imakefile ./sj3stat/Imakefile
-*** ../sj3-2.0.1.13.org/sj3stat/Imakefile	Tue May 30 21:29:25 1995
---- ./sj3stat/Imakefile	Mon Aug 12 12:23:14 1996
-***************
-*** 32,44 ****
-   * $SonyDate: 1995/05/30 12:29:17 $
-   */
-  
-! DEST	        = /usr/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= staff
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
---- 32,49 ----
-   * $SonyDate: 1995/05/30 12:29:17 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= bin
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
-***************
-*** 49,55 ****
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 755
-  
-  SRCS          = sj3stat.c
-  	
---- 54,60 ----
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS          = sj3stat.c
-  	
-diff -arcN ../sj3-2.0.1.13.org/sj3stat/sj3stat.c ./sj3stat/sj3stat.c
-*** ../sj3-2.0.1.13.org/sj3stat/sj3stat.c	Tue May 30 21:29:25 1995
---- ./sj3stat/sj3stat.c	Mon Aug 12 23:39:19 1996
-***************
-*** 91,100 ****
-  	}
-  	fprintf (stdout, "%d users.\n", n);
-  
-! 	fprintf(stdout, "%-16s %-16s %-8s %s\n", 
-  		"(USER)", "(HOST)", "(FD)", "(CLIENT)");
-  	for (i = 0; i < n; i++) {
-! 		fprintf(stdout, "%-16s %-16s %-8d %s\n", who[i].username, 
-  			who[i].hostname, who[i].fd, who[i].progname);
-  	}
-  	(void) sj3_erase_connection(&clnt);
---- 91,107 ----
-  	}
-  	fprintf (stdout, "%d users.\n", n);
-  
-! /*
-!  * Change hostname entry's length.
-!  * Because it's so short.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	fprintf(stdout, "%-16s %-16s %-8s %s\n", */
-! 	fprintf(stdout, "%-16s %-32s %-8s %s\n", 
-  		"(USER)", "(HOST)", "(FD)", "(CLIENT)");
-  	for (i = 0; i < n; i++) {
-! /*		fprintf(stdout, "%-16s %-16s %-8d %s\n", who[i].username, */
-! 		fprintf(stdout, "%-16s %-32s %-8d %s\n", who[i].username, 
-  			who[i].hostname, who[i].fd, who[i].progname);
-  	}
-  	(void) sj3_erase_connection(&clnt);
-diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
-*** ../sj3-2.0.1.13.old/include/Const.h	Tue Aug 13 03:13:39 1996
---- ./include/Const.h	Wed Aug 21 14:01:27 1996
-***************
-*** 87,93 ****
---- 87,101 ----
-  #define ProtoName               "tcp"
-  #define	PortNumber		"3000"
-  #else
-+ /*
-+  * Change the default Port number of sj3 for FreeBSD.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+  */
-+ #ifdef __FreeBSD__
-+ #define	PortNumber		3086
-+ #else /* ! __FreeBSD__ */
-  #define	PortNumber		3000
-+ #endif /* ! __FreeBSD__ */
-  #endif
-  #define	SocketName		"/tmp/sj3sock"
-  #define	LockFile		"/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-lib/files/patch-ab b/japanese/sj3-lib/files/patch-ab
new file mode 100644
index 000000000000..ea8aebc78ddd
--- /dev/null
+++ b/japanese/sj3-lib/files/patch-ab
@@ -0,0 +1,21 @@
+diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
+*** ../sj3-2.0.1.13.old/include/Const.h	Tue Aug 13 03:13:39 1996
+--- ./include/Const.h	Wed Aug 21 14:01:27 1996
+***************
+*** 87,93 ****
+--- 87,101 ----
+  #define ProtoName               "tcp"
+  #define	PortNumber		"3000"
+  #else
++ /*
++  * Change the default Port number of sj3 for FreeBSD.
++  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
++  */
++ #ifdef __FreeBSD__
++ #define	PortNumber		3086
++ #else /* ! __FreeBSD__ */
+  #define	PortNumber		3000
++ #endif /* ! __FreeBSD__ */
+  #endif
+  #define	SocketName		"/tmp/sj3sock"
+  #define	LockFile		"/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-lib/files/patch-ac b/japanese/sj3-lib/files/patch-ac
new file mode 100644
index 000000000000..148a043fdad8
--- /dev/null
+++ b/japanese/sj3-lib/files/patch-ac
@@ -0,0 +1,11 @@
+--- dict/dict/Imakefile.~1~	Thu Jan 23 20:20:51 1997
++++ dict/dict/Imakefile	Tue Aug 18 10:51:14 1998
+@@ -48,7 +48,7 @@
+ 
+ XCOMM INSTFLAGS	= -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
+ 
+-all:		$(OBJS)
++all::		$(OBJS)
+ 
+ $(OBJS):	$(SRCS)
+ 		$(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/japanese/sj3-lib/files/patch-ad b/japanese/sj3-lib/files/patch-ad
new file mode 100644
index 000000000000..8c714daa84fe
--- /dev/null
+++ b/japanese/sj3-lib/files/patch-ad
@@ -0,0 +1,11 @@
+--- sj3.tmpl.~1~	Thu Jan 23 20:20:58 1997
++++ sj3.tmpl	Tue Aug 18 11:07:42 1998
+@@ -48,7 +48,7 @@
+ #if defined(FreeBSDArchitecture)
+ 
+ CODE_LIBS	= -lxpg4
+-SJ3OWNER	= root
++SJ3OWNER	= bin
+ SJ3GROUP	= bin
+ 
+ #else
diff --git a/japanese/sj3-lib/files/patch-ae b/japanese/sj3-lib/files/patch-ae
new file mode 100644
index 000000000000..939c71115c9b
--- /dev/null
+++ b/japanese/sj3-lib/files/patch-ae
@@ -0,0 +1,26 @@
+--- include/Paths.h.in.orig	Thu Jan 23 20:20:57 1997
++++ include/Paths.h.in	Tue Aug 18 11:29:00 1998
+@@ -33,7 +33,22 @@
+  * $SonyDate: 1997/01/23 11:20:55 $
+  */
+ 
+-#define ErrorOutFile            "/dev/console"
++/*
++ * Change ErrotOutFile variable.
++ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
++ * This error is "Cannot Open "/dev/console".". 
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
++ *
++ * Change ErrotOutFile variable.
++ * This default value is "/dev/null" in document.
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
++ */
++#if !defined(__FreeBSD__)
++#define	ErrorOutFile		"/dev/console"
++#else
++/* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
++#define	ErrorOutFile		"/dev/null"
++#endif
+ 
+ #define SocketName              "/tmp/sj3sock"
+ #define LockFile                "/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-lib/files/patch-af b/japanese/sj3-lib/files/patch-af
new file mode 100644
index 000000000000..13b49cf298b3
--- /dev/null
+++ b/japanese/sj3-lib/files/patch-af
@@ -0,0 +1,11 @@
+--- doc/man/Imakefile.~1~	Thu Jan 23 20:20:52 1997
++++ doc/man/Imakefile	Tue Aug 18 12:15:20 1998
+@@ -40,7 +40,7 @@
+  */
+ 
+ #ifndef JapaneseManLocale
+-#define JapaneseManLocale	ja_JP.EUC
++#define JapaneseManLocale	ja
+ #endif
+ JMANLOCALE = JapaneseManLocale
+ 
diff --git a/japanese/sj3-lib/pkg-descr b/japanese/sj3-lib/pkg-descr
index 40d4753542ca..3daaeb2d9b61 100644
--- a/japanese/sj3-lib/pkg-descr
+++ b/japanese/sj3-lib/pkg-descr
@@ -1,4 +1,4 @@
-This is SJ3 2.0.1.13, a Japanese input method.
+This is SJ3 2.0.1.20, a Japanese input method.
 This system developed by Sony Corporation.
 SJ3 is composed of Kana-Kanji conversion server(sj3serv), 
 Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
diff --git a/japanese/sj3-lib/pkg-plist b/japanese/sj3-lib/pkg-plist
index 1cbeed197c87..1e3a58b681f7 100644
--- a/japanese/sj3-lib/pkg-plist
+++ b/japanese/sj3-lib/pkg-plist
@@ -3,6 +3,7 @@ bin/sj3dic
 bin/sj3mkdic
 bin/sj3serv
 bin/sj3stat
+include/sj3lib.h
 lib/libsj3lib.a
 lib/sj3/Nihongo.ps.Z
 lib/sj3/cvtkey.news
@@ -17,7 +18,7 @@ lib/sj3/sj3lib.ms
 lib/sj3/sj3serv.ms
 lib/sj3/sjrc
 lib/sj3/sjrk
-man/ja/man1/sj3.1.gz
-man/ja/man1/sj3dic.1.gz
-man/ja/man1/sj3mkdic.1.gz
-man/ja/man1/sj3serv.1.gz
+etc/rc.d/sj3.sh
+@dirrm lib/sj3/dict/user
+@dirrm lib/sj3/dict
+@dirrm lib/sj3
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index 8c41501dd59d..d48639a5f120 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	SJ3
-# Version required:	2.0.1.13
-# Date created:		10 Aug 1996
+# Version required:	2.0.1.20
+# Date created:		18 Aug 1998
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/09/14 21:35:56 max Exp $
+# $Id: Makefile,v 1.6 1998/06/06 03:45:04 itojun Exp $
 #
 
-DISTNAME=	sj3-2.0.1.13
-PKGNAME=	ja-sj3-2.0.1.13
+DISTNAME=	sj3-2.0.1.20
+PKGNAME=	ja-sj3-2.0.1.20
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
@@ -17,11 +17,27 @@ MAINTAINER=	hidekazu@cs.titech.ac.jp
 MAN1=		sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
 MANLANG=	ja
 
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/sj3.sh
+
 # This port requires xmkmf but installs in /usr/local
 #
 # NOTE : You must not use 'xmkmf -a', because the running 'make depend' caused a error.
 
 do-configure:
-	( cd $(WRKDIR)/sj3-2.0.1.13 ; xmkmf ; make Makefiles )
+	( cd $(WRKSRC) ; xmkmf ; make Makefiles )
+
+post-install:
+	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
+		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
+		${ECHO} 'sj3=${PREFIX}/bin/sj3serv' >> ${STARTUP_SCRIPT} ; \
+		${ECHO} 'if [ -f $$sj3 ]; then' >> ${STARTUP_SCRIPT} ;	\
+		${ECHO} '     $$sj3' >> ${STARTUP_SCRIPT} ;		\
+		${ECHO} "fi" >> ${STARTUP_SCRIPT} ;			\
+		chmod 755 ${STARTUP_SCRIPT} ;				\
+		chown bin.bin ${STARTUP_SCRIPT};			\
+	fi
+	${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/sj3-server/distinfo b/japanese/sj3-server/distinfo
index 9d39008a5ba1..31c66f8d7cec 100644
--- a/japanese/sj3-server/distinfo
+++ b/japanese/sj3-server/distinfo
@@ -1 +1 @@
-MD5 (sj3-2.0.1.13.tar.gz) = f29a04e72a657557f7436268ccdafe49
+MD5 (sj3-2.0.1.20.tar.gz) = 36cc23702e2295e4552271b9d481c863
diff --git a/japanese/sj3-server/files/patch-aa b/japanese/sj3-server/files/patch-aa
index 04d311632cd0..2ff33a40a0c8 100644
--- a/japanese/sj3-server/files/patch-aa
+++ b/japanese/sj3-server/files/patch-aa
@@ -1,348 +1,3 @@
-diff -arcN ../sj3-2.0.1.13.org/Imakefile ./Imakefile
-*** ../sj3-2.0.1.13.org/Imakefile	Tue May 30 21:30:16 1995
---- ./Imakefile	Mon Aug 12 11:34:47 1996
-***************
-*** 35,41 ****
-  #define IHaveSubdirs
-  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-  
-! SUBDIRS = dict kanakan server sj3lib sj3 sj3dic sj3stat demo
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
---- 35,46 ----
-  #define IHaveSubdirs
-  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-  
-! /*
-!  * Add make rules to install manpages and other documents.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! SUBDIRS = dict doc kanakan server sj3lib sj3 sj3dic sj3stat demo
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
-diff -arcN ../sj3-2.0.1.13.org/README ./README
-*** ../sj3-2.0.1.13.org/README	Thu Mar 21 14:59:47 1996
---- ./README	Tue Aug 13 03:10:23 1996
-***************
-*** 20,40 ****
-  
-  	Following files are installed after make install:
-  
-! 	/usr/dict/sj3/sj3main.dic	Main dictionary(used by sj3serv)
-! 	/usr/bin/sj3serv		Kana-Kanji conversion server
-! 	/usr/bin/sj3			Kana-Kanji conversion client
-! 	/usr/bin/sj3dic			User dictionary utility
-! 	/usr/bin/sj3mkdic		Dictionary converter
-! 	/usr/bin/sj3stat		Utility to show status of sj3serv
-! 	/usr/include/sj3lib.h		Header file for sj3lib
-! 	/usr/lib/libsj3lib.a		Kana-Kanji conversion library
-! 	/usr/lib/sj3/serverrc		Configuration file for sj3serv
-! 	/usr/lib/sj3/sjrc		Configuration file for sj3
-! 	/usr/lib/sj3/sjrk		Roma-Kana conversion file for sj3
-! 	/usr/lib/sj3/cvtkey.xterm	Mapping table between function key
-! 	/usr/lib/sj3/cvtkey.news	and escape sequence for sj3
-! 	/usr/lib/sj3/cvtkey.nws511
-! 	/usr/lib/sj3/cvtkey.nws517
-  
-  * Source tree
-  	dict/dict	Main dictionary(text file)
---- 20,49 ----
-  
-  	Following files are installed after make install:
-  
-! 	/usr/local/lib/sj3/dict/sj3main.dic	Main dictionary(used by sj3serv)
-! 	/usr/local/bin/sj3serv			Kana-Kanji conversion server
-! 	/usr/local/bin/sj3			Kana-Kanji conversion client
-! 	/usr/local/bin/sj3dic			User dictionary utility
-! 	/usr/local/bin/sj3mkdic			Dictionary converter
-! 	/usr/local/bin/sj3stat			Utility to show status of sj3serv
-! 	/usr/local/include/sj3lib.h		Header file for sj3lib
-! 	/usr/local/lib/libsj3lib.a		Kana-Kanji conversion library
-! 	/usr/local/man/ja/man1/sj3.1		sj3's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3dic.1		sj3dic's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3mkdic.1	sj3mkdic's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3serv.1	sj3serv's online manual(Japanese)
-! 	/usr/local/lib/sj3/serverrc		Configuration file for sj3serv
-! 	/usr/local/lib/sj3/sjrc			Configuration file for sj3
-! 	/usr/local/lib/sj3/sjrk			Roma-Kana conversion file for sj3
-! 	/usr/local/lib/sj3/cvtkey.xterm		Mapping table between function key
-! 	/usr/local/lib/sj3/cvtkey.news		and escape sequence for sj3
-! 	/usr/local/lib/sj3/cvtkey.nws511
-! 	/usr/local/lib/sj3/cvtkey.nws517
-! 	/usr/local/lib/sj3/Nihongo.ps.Z		Operation guide for SJ3(Japanese)
-! 	/usr/local/lib/sj3/hinsi.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/makedict.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/sj3lib.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/sj3serv.ms		Documents(Japanese)
-  
-  * Source tree
-  	dict/dict	Main dictionary(text file)
-diff -arcN ../sj3-2.0.1.13.org/README.eucJP ./README.eucJP
-*** ../sj3-2.0.1.13.org/README.eucJP	Thu Mar 21 15:00:11 1996
---- ./README.eucJP	Tue Aug 13 03:10:45 1996
-***************
-*** 28,48 ****
-  
-  	この操作によりインストールされるファイルをいかに示します。
-  
-! 	/usr/dict/sj3/sj3main.dic	sj3serv が使用するメイン辞書
-! 	/usr/bin/sj3serv		仮名漢字変換サーバ
-! 	/usr/bin/sj3			端末用仮名漢字変換クライアント
-! 	/usr/bin/sj3dic			ユーザ辞書ユーティリティ
-! 	/usr/bin/sj3mkdic		辞書生成ツール
-! 	/usr/bin/sj3stat		sj3serv への接続状況表示ユーティリティ
-! 	/usr/include/sj3lib.h		仮名漢字変換ライブラリのヘッダファイル
-! 	/usr/lib/libsj3lib.a		仮名漢字変換ライブラリ
-! 	/usr/lib/sj3/serverrc		sj3serv の設定ファイル
-! 	/usr/lib/sj3/sjrc		sj3 の設定ファイル
-! 	/usr/lib/sj3/sjrk		sj3 のローマ字仮名変換設定ファイル
-! 	/usr/lib/sj3/cvtkey.xterm	sj3 のファンクションキーとエスケープ
-! 	/usr/lib/sj3/cvtkey.news	シーケンスの対応を設定するファイル。
-! 	/usr/lib/sj3/cvtkey.nws511
-! 	/usr/lib/sj3/cvtkey.nws517
-  
-  
-  ・ディレクトリ構成
---- 28,57 ----
-  
-  	この操作によりインストールされるファイルをいかに示します。
-  
-! 	/usr/local/lib/sj3/dict/sj3main.dic	sj3serv が使用するメイン辞書
-! 	/usr/local/bin/sj3serv			仮名漢字変換サーバ
-! 	/usr/local/bin/sj3			端末用仮名漢字変換クライアント
-! 	/usr/local/bin/sj3dic			ユーザ辞書ユーティリティ
-! 	/usr/local/bin/sj3mkdic			辞書生成ツール
-! 	/usr/local/bin/sj3stat			sj3serv への接続状況表示ユーティリティ
-! 	/usr/local/include/sj3lib.h		仮名漢字変換ライブラリのヘッダファイル
-! 	/usr/local/lib/libsj3lib.a		仮名漢字変換ライブラリ
-! 	/usr/local/man/ja/man1/sj3.1		sj3 のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3dic.1		sj3dic のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3mkdic.1	sj3mkdic のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3serv.1	sj3serv のオンラインマニュアル
-! 	/usr/local/lib/sj3/serverrc		sj3serv の設定ファイル
-! 	/usr/local/lib/sj3/sjrc			sj3 の設定ファイル
-! 	/usr/local/lib/sj3/sjrk			sj3 のローマ字仮名変換設定ファイル
-! 	/usr/local/lib/sj3/cvtkey.xterm		sj3 のファンクションキーとエスケープ
-! 	/usr/local/lib/sj3/cvtkey.news		シーケンスの対応を設定するファイル。
-! 	/usr/local/lib/sj3/cvtkey.nws511
-! 	/usr/local/lib/sj3/cvtkey.nws517	
-! 	/usr/local/lib/sj3/Nihongo.ps.Z		SJ3 日本語入力ガイド
-! 	/usr/local/lib/sj3/hinsi.ms		ドキュメント
-! 	/usr/local/lib/sj3/makedict.ms		ドキュメント
-! 	/usr/local/lib/sj3/sj3lib.ms		ドキュメント
-! 	/usr/local/lib/sj3/sj3serv.ms		ドキュメント
-  
-  
-  ・ディレクトリ構成
-diff -arcN ../sj3-2.0.1.13.org/demo/sample.c ./demo/sample.c
-*** ../sj3-2.0.1.13.org/demo/sample.c	Fri Jun  3 17:00:16 1994
---- ./demo/sample.c	Mon Aug 12 12:30:29 1996
-***************
-*** 44,50 ****
-  #include "wchar16.h"
-  
-  #define	RETURN(c)	((c == '\n') || (c == '\r'))
-! #define	RKFILE		"/usr/lib/sj3/sjrk"
-  #define	LOCALHOST	"localhost"
-  #define	HBUFSIZ		512
-  #define	QBUFSIZ		256
---- 44,54 ----
-  #include "wchar16.h"
-  
-  #define	RETURN(c)	((c == '\n') || (c == '\r'))
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! #define	RKFILE		"/usr/local/lib/sj3/sjrk"
-  #define	LOCALHOST	"localhost"
-  #define	HBUFSIZ		512
-  #define	QBUFSIZ		256
-diff -arcN ../sj3-2.0.1.13.org/dict/dict/Imakefile ./dict/dict/Imakefile
-*** ../sj3-2.0.1.13.org/dict/dict/Imakefile	Fri Dec  9 20:27:05 1994
---- ./dict/dict/Imakefile	Tue Aug 13 03:14:31 1996
-***************
-*** 32,38 ****
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! DICTDIR         = /usr/dict/sj3
-  
-  TOOL_DIR      = ../tool
-  TOOL_NAME     = sj3mkdic
---- 32,43 ----
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DICTDIR         = /usr/local/lib/sj3/dict
-  
-  TOOL_DIR      = ../tool
-  TOOL_NAME     = sj3mkdic
-***************
-*** 44,52 ****
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= staff
-  #endif
-! INSTFLAGS	= -o root -g $(INSTGROUP) -m 444
-  
-! all:		$(OBJS)
-  
---- 49,57 ----
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= bin
-  #endif
-! INSTFLAGS	= -o bin -g $(INSTGROUP) -m 444
-  
-! all::		$(OBJS)
-  
-diff -arcN ../sj3-2.0.1.13.org/dict/tool/Imakefile ./dict/tool/Imakefile
-*** ../sj3-2.0.1.13.org/dict/tool/Imakefile	Fri Dec  9 20:27:05 1994
---- ./dict/tool/Imakefile	Mon Aug 12 11:38:02 1996
-***************
-*** 32,47 ****
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! DEST            = /usr/bin
-  
-  INCLUDES = -I../include -I../../include
-  #if SystemV4 || SystemV
-  INSTGROUP       = bin
-  #else
-! INSTGROUP       = staff
-  #endif
-  
-! INSTFLAGS       = -o root -g $(INSTGROUP) -m 755
-  
-  SRCS = \
-  	char.c \
---- 32,52 ----
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST            = /usr/local/bin
-  
-  INCLUDES = -I../include -I../../include
-  #if SystemV4 || SystemV
-  INSTGROUP       = bin
-  #else
-! INSTGROUP       = bin
-  #endif
-  
-! INSTFLAGS       = -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS = \
-  	char.c \
-diff -arcN ../sj3-2.0.1.13.org/doc/Imakefile ./doc/Imakefile
-*** ../sj3-2.0.1.13.org/doc/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/Imakefile	Mon Aug 12 11:34:22 1996
-***************
-*** 0 ****
---- 1,40 ----
-+ /*
-+  * Copyright (c) 1991-1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install manpages and other documents.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ #define IHaveSubdirs
-+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-+ 
-+ SUBDIRS = doc man
-+ 
-+ MakeSubdirs($(SUBDIRS))
-+ DependSubdirs($(SUBDIRS))
-diff -arcN ../sj3-2.0.1.13.org/doc/doc/Imakefile ./doc/doc/Imakefile
-*** ../sj3-2.0.1.13.org/doc/doc/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/doc/Imakefile	Mon Aug 12 11:34:34 1996
-***************
-*** 0 ****
---- 1,41 ----
-+ /*
-+  * Copyright (c) 1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install other documents.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ CONFDIR 	= /usr/local/lib/sj3
-+ DOCLIST		= Nihongo.ps.Z hinsi.ms makedict.ms sj3lib.ms sj3serv.ms
-+ 
-+ all::
-+ 
-+ depend::
-+ 
-+ InstallMultiple($(DOCLIST),$(CONFDIR))
 diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms
 *** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms	Fri Jun  3 17:00:49 1994
 --- ./doc/doc/sj3lib.ms	Tue Aug 13 03:17:26 1996
@@ -502,62 +157,6 @@ diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3serv.ms ./doc/doc/sj3serv.ms
   .RE
   .sp
   .NH 3
-diff -arcN ../sj3-2.0.1.13.org/doc/man/Imakefile ./doc/man/Imakefile
-*** ../sj3-2.0.1.13.org/doc/man/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/man/Imakefile	Mon Aug 12 11:34:15 1996
-***************
-*** 0 ****
---- 1,50 ----
-+ /*
-+  * Copyright (c) 1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install manpages.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ #ifndef JapaneseManLocale
-+ #define JapaneseManLocale	ja
-+ #endif
-+ JMANLOCALE = JapaneseManLocale
-+ 
-+ #ifndef JapaneseManDir
-+ #define JapaneseManDir		/usr/local/man/$(JMANLOCALE)/man1
-+ #endif
-+ 
-+ JMANDIR 	= JapaneseManDir
-+ MANLIST		= sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
-+ 
-+ all::
-+ 
-+ depend::
-+ 
-+ InstallMultipleFlags($(MANLIST),$(JMANDIR),$(INSTMANFLAGS))
 diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3.1 ./doc/man/sj3.1
 *** ../sj3-2.0.1.13.org/doc/man/sj3.1	Fri Jun  3 17:00:51 1994
 --- ./doc/man/sj3.1	Tue Aug 13 03:18:59 1996
@@ -760,321 +359,6 @@ diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3serv.1 ./doc/man/sj3serv.1
   かな漢字変換サーバ デフォルト辞書ディレクトリ
   .TP
       sj3main.dic
-diff -arcN ../sj3-2.0.1.13.org/include/Const.h ./include/Const.h
-*** ../sj3-2.0.1.13.org/include/Const.h	Fri Oct 21 13:16:19 1994
---- ./include/Const.h	Tue Aug 13 03:13:39 1996
-***************
-*** 33,38 ****
---- 33,42 ----
-   * $SonyDate: 1994/10/21 04:16:06 $
-   */
-  
-+ /*
-+  * Change some default values.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-  
-  
-  #define	HostNameLen		128			
-***************
-*** 54,66 ****
-  #define	MinClLen		512
-  #define	MaxClLen		0x7fff
-  
-! #define	RunCmdFile		"/usr/lib/sj3/serverrc"
-  #define	DebugOutFile		NULL	
-  #define	DebugLevel		0
-  #define	ForkFlag		1
-  #define	MaxClientNum		512
-  #define	ErrorOutFile		"/dev/console"
-! #define	DictRootDir		"/usr/dict/sj3"
-  #define	LogOutFile		NULL	
-  #define	PortName		"sj3"
-  #ifdef TLI
---- 58,85 ----
-  #define	MinClLen		512
-  #define	MaxClLen		0x7fff
-  
-! #define	RunCmdFile		"/usr/local/lib/sj3/serverrc"
-  #define	DebugOutFile		NULL	
-  #define	DebugLevel		0
-  #define	ForkFlag		1
-  #define	MaxClientNum		512
-+ /*
-+  * Change ErrotOutFile variable.
-+  * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+  * This error is "Cannot Open "/dev/console".". 
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  *
-+  * Change ErrotOutFile variable.
-+  * This default value is "/dev/null" in document.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
-+  */
-+ #if 0
-  #define	ErrorOutFile		"/dev/console"
-! #else
-! /* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
-! #define	ErrorOutFile		"/dev/null"
-! #endif
-! #define	DictRootDir		"/usr/local/lib/sj3/dict"
-  #define	LogOutFile		NULL	
-  #define	PortName		"sj3"
-  #ifdef TLI
-diff -arcN ../sj3-2.0.1.13.org/server/Imakefile ./server/Imakefile
-*** ../sj3-2.0.1.13.org/server/Imakefile	Fri Jun  3 17:02:50 1994
---- ./server/Imakefile	Mon Aug 12 11:38:51 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:02:49 $
-   */
-  
-! DEST	        = /usr/bin
-! CONFDIR 	= /usr/lib/sj3
-  CONFFILE        = $(CONFDIR)/serverrc
-  RKDIR           = ../sj3lib
-  
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:02:49 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-! CONFDIR 	= /usr/local/lib/sj3
-  CONFFILE        = $(CONFDIR)/serverrc
-  RKDIR           = ../sj3lib
-  
-***************
-*** 45,59 ****
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= staff
-  #endif
-  DEFINES          = $(ARCDEFS) $(SYSDEFS) $(USETLI) 
-  
-  CONVLIB         = ../kanakan/libkanakan.a
-  DEPLIBS         = $(CONVLIB)
-  LOCAL_LIBRARIES = $(CONVLIB)
-! INSTFLAGS	= -o root -g $(INSTGROUP) -m 4755
-! INSTFLAGS2	= -o root -g $(INSTGROUP) -m 444
-  
-  #MKDIRHIER       = ../util/mkdirh/mkdirh
-  
---- 50,64 ----
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= bin
-  #endif
-  DEFINES          = $(ARCDEFS) $(SYSDEFS) $(USETLI) 
-  
-  CONVLIB         = ../kanakan/libkanakan.a
-  DEPLIBS         = $(CONVLIB)
-  LOCAL_LIBRARIES = $(CONVLIB)
-! INSTFLAGS	= -o bin -g $(INSTGROUP) -m 4755
-! INSTFLAGS2	= -o bin -g $(INSTGROUP) -m 444
-  
-  #MKDIRHIER       = ../util/mkdirh/mkdirh
-  
-***************
-*** 80,83 ****
-  DependTarget()
-  LinkSourceFile(string.c,$(RKDIR))
-  InstallProgramWithFlags(sj3serv,$(DEST),$(INSTFLAGS))
-! InstallProgramWithFlags(serverrc,$(CONFDIR),$(INSTFLAGS2))
---- 85,88 ----
-  DependTarget()
-  LinkSourceFile(string.c,$(RKDIR))
-  InstallProgramWithFlags(sj3serv,$(DEST),$(INSTFLAGS))
-! InstallMultipleFlags(serverrc,$(CONFDIR),$(INSTFLAGS2))
-diff -arcN ../sj3-2.0.1.13.org/server/rc.sj3serv ./server/rc.sj3serv
-*** ../sj3-2.0.1.13.org/server/rc.sj3serv	Fri Jun  3 17:02:55 1994
---- ./server/rc.sj3serv	Mon Aug 12 11:48:07 1996
-***************
-*** 41,49 ****
-  CMDNAME=sj3serv
-  
-  PRINTNAME=$CMDNAME
-! CMDDIR=/usr/bin
-  BACKGROUND=
-! PATH=/usr/bin:/bin
-  CMDPATH=$CMDDIR/$CMDNAME
-  
-  RESTARTMESSAGE=
---- 41,49 ----
-  CMDNAME=sj3serv
-  
-  PRINTNAME=$CMDNAME
-! CMDDIR=/usr/local/bin
-  BACKGROUND=
-! PATH=/usr/local/bin:/usr/bin:/bin
-  CMDPATH=$CMDDIR/$CMDNAME
-  
-  RESTARTMESSAGE=
-***************
-*** 54,111 ****
-  #DOWNMESSAGE="Killed $PRINTNAME"
-  USAGEMESSAGE="Usage: $0 [start|stop]"
-  
-  if [ "$CMDNAME" = "sj3serv" ]
-  then
-! 	if [ ! -d /usr/bin ]
-! 	then                    # /usr not mounted
-  	        exit
-  	fi
-  
-- 	pid=`/sbin/findproc $CMDNAME`
-  	case "$1" in
-  	'start')
-! 		if [ $pid ] 
-! 		then	
-! 			kill -TERM $pid
-! 			sleep 1
-! 			pid=`/sbin/findproc $CMDNAME`
-! 			if [ $pid ] 
-! 			then
-! 				kill -9 $pid
-! 			fi
-! 			if [ -f $CMDPATH ]
-  			then
-! 				if [ "$RESTARTMESSAGE" ] 
-! 				then 
-! 					echo $RESTARTMESSAGE > /dev/console
-! 				fi
-! 				eval $CMDPATH $BACKGROUND
-  			fi	
-! 		else
-! 			if [ -f $CMDPATH ]
-! 			then 
-! 				if [ "$STARTMESSAGE" ]
-! 				then
-! 					echo $STARTMESSAGE >/dev/console 
-! 				fi	
-!                                 eval $CMDPATH $BACKGROUND
-! 			fi
-  		fi
-  		;;
-  	'stop')
-! 		if [ $pid ]
-! 		then
-! 			kill -TERM $pid
-! 			sleep 1
-! 			pid=`/sbin/findproc $CMDNAME`
-! 			if [ $pid ] 
-! 			then 
-! 				kill -9 $pid
-! 			fi
-! 			if [ "$DOWNMESSAGE" ]
-  			then
-! 				echo $DOWNMESSAGE > /dev/console
-! 			fi
-  		fi
-  		;;
-  	*)
---- 54,152 ----
-  #DOWNMESSAGE="Killed $PRINTNAME"
-  USAGEMESSAGE="Usage: $0 [start|stop]"
-  
-+ #if [ "$CMDNAME" = "sj3serv" ]
-+ #then
-+ #	if [ ! -d /usr/local/bin ]
-+ #	then                    # /usr/local not mounted
-+ #	        exit
-+ #	fi
-+ #
-+ #	pid=`/sbin/findproc $CMDNAME`
-+ #	case "$1" in
-+ #	'start')
-+ #		if [ $pid ] 
-+ #		then	
-+ #			kill -TERM $pid
-+ #			sleep 1
-+ #			pid=`/sbin/findproc $CMDNAME`
-+ #			if [ $pid ] 
-+ #			then
-+ #				kill -9 $pid
-+ #			fi
-+ #			if [ -f $CMDPATH ]
-+ #			then
-+ #				if [ "$RESTARTMESSAGE" ] 
-+ #				then 
-+ #					echo $RESTARTMESSAGE > /dev/console
-+ #				fi
-+ #				eval $CMDPATH $BACKGROUND
-+ #			fi	
-+ #		else
-+ #			if [ -f $CMDPATH ]
-+ #			then 
-+ #				if [ "$STARTMESSAGE" ]
-+ #				then
-+ #					echo $STARTMESSAGE >/dev/console 
-+ #				fi	
-+ #                                eval $CMDPATH $BACKGROUND
-+ #			fi
-+ #		fi
-+ #		;;
-+ #	'stop')
-+ #		if [ $pid ]
-+ #		then
-+ #			kill -TERM $pid
-+ #			sleep 1
-+ #			pid=`/sbin/findproc $CMDNAME`
-+ #			if [ $pid ] 
-+ #			then 
-+ #				kill -9 $pid
-+ #			fi
-+ #			if [ "$DOWNMESSAGE" ]
-+ #			then
-+ #				echo $DOWNMESSAGE > /dev/console
-+ #			fi
-+ #		fi
-+ #		;;
-+ #	*)
-+ #		echo $USAGEMESSAGE 
-+ #		;;	
-+ #	esac	
-+ #fi
-+ 
-+ ##
-+ ## For system which don't have a findproc command.(FreeBSD, ...)
-+ ## Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ ##
-+ 
-  if [ "$CMDNAME" = "sj3serv" ]
-  then
-! 	if [ ! -d /usr/local/bin ]
-! 	then                    # /usr/local not mounted
-  	        exit
-  	fi
-  
-  	case "$1" in
-  	'start')
-! 		if [ -f $CMDPATH ]
-! 		then 
-! 			if [ "$STARTMESSAGE" ]
-  			then
-! 				echo $STARTMESSAGE >/dev/console 
-  			fi	
-! 			eval $CMDPATH $BACKGROUND
-  		fi
-  		;;
-  	'stop')
-! 		;;
-! 	'')
-! 		if [ -f $CMDPATH ]
-! 		then 
-! 			if [ "$STARTMESSAGE" ]
-  			then
-! 				echo $STARTMESSAGE >/dev/console 
-! 			fi	
-! 			eval $CMDPATH $BACKGROUND
-  		fi
-  		;;
-  	*)
 diff -arcN ../sj3-2.0.1.13.org/server/setup.c ./server/setup.c
 *** ../sj3-2.0.1.13.org/server/setup.c	Fri Dec  9 20:27:07 1994
 --- ./server/setup.c	Mon Aug 12 23:58:25 1996
@@ -1164,702 +448,3 @@ diff -arcN ../sj3-2.0.1.13.org/server/setup.c ./server/setup.c
   	"allowuser",	get_list,	(int)&allow_user,
   	0, 0, 0
   };
-diff -arcN ../sj3-2.0.1.13.org/sj3/Imakefile ./sj3/Imakefile
-*** ../sj3-2.0.1.13.org/sj3/Imakefile	Fri Jun  3 17:03:02 1994
---- ./sj3/Imakefile	Mon Aug 12 18:29:43 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:03:01 $
-   */
-  
-! DEST	        = /usr/bin
-! CONFDIR 	= /usr/lib/sj3
-  
-  INCLUDES        =  -I../sj3h  -I../sj3lib -I../include
-  #if SystemV4 || SystemV
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:03:01 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-! CONFDIR 	= /usr/local/lib/sj3
-  
-  INCLUDES        =  -I../sj3h  -I../sj3lib -I../include
-  #if SystemV4 || SystemV
-***************
-*** 48,56 ****
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= staff
-  SRC0		= nmttyslot.c
-  OBJ0		= nmttyslot.o
-  #endif
-  DEFINES		= $(ARCDEFS) $(SYSDEFS) -DKANJI -DOKB 
-  
---- 53,70 ----
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= bin
-  SRC0		= nmttyslot.c
-  OBJ0		= nmttyslot.o
-+ /*
-+  * Change for FreeBSD.
-+  * Because When the LANG variable is EUC, setlocale function in library libc 
-+  * return NULL, use it in library libxpg4 
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ #if defined(FreeBSDArchitecture)
-+ CODE_LIBS	= -lxpg4
-+ #endif
-  #endif
-  DEFINES		= $(ARCDEFS) $(SYSDEFS) -DKANJI -DOKB 
-  
-***************
-*** 59,65 ****
-  SJ3_LIBDIR          = ../sj3lib
-  RKDIR = ../sj3rkcv
-  SJLIB           = $(SJ3_LIBDIR)/libsj3lib.a
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 4755
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
---- 73,79 ----
-  SJ3_LIBDIR          = ../sj3lib
-  RKDIR = ../sj3rkcv
-  SJLIB           = $(SJ3_LIBDIR)/libsj3lib.a
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 4755
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/edit.c ./sj3/edit.c
-*** ../sj3-2.0.1.13.org/sj3/edit.c	Fri Jun  3 17:03:14 1994
---- ./sj3/edit.c	Tue Aug 13 01:02:16 1996
-***************
-*** 302,308 ****
-  	cv = GetConversion ();
-  	if (cv->Ppoint[n+1] == 0)
-  		return;
-! 	mlen = strlen (cv->Ppoint[n+1]);
-  	plen = cv->Ppoint[n] - cv->Ppoint[0];
-  	p = cv->Ppoint[n];
-  	pp = &cv->out_mode[plen];
---- 302,313 ----
-  	cv = GetConversion ();
-  	if (cv->Ppoint[n+1] == 0)
-  		return;
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	mlen = strlen (cv->Ppoint[n+1]); */
-! 	mlen = strlen ((char *)cv->Ppoint[n+1]);
-  	plen = cv->Ppoint[n] - cv->Ppoint[0];
-  	p = cv->Ppoint[n];
-  	pp = &cv->out_mode[plen];
-***************
-*** 728,734 ****
-  
-  	ylen = wslen(Zs);
-  	limit = Elimit - ylen;
-! 	hlimit = Ehlimit - strlen(Hs);
-  	*ztmp = '\0';
-  	*htmp = '\0';
-  	SaveConversion (GetConversion ());
---- 733,744 ----
-  
-  	ylen = wslen(Zs);
-  	limit = Elimit - ylen;
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	hlimit = Ehlimit - strlen(Hs); */
-! 	hlimit = Ehlimit - strlen((char *)Hs);
-  	*ztmp = '\0';
-  	*htmp = '\0';
-  	SaveConversion (GetConversion ());
-***************
-*** 749,755 ****
-  		else
-  			(void)exec_romaji2(inc, htmp, ztmp, otmp, len, rlen);
-  	}
-! 	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen(ztmp), strlen(htmp));
-  	sj3_rkclear();
-  	len = wslen (ztmp);
-  	backspace(wcbyte(ztmp));
---- 759,770 ----
-  		else
-  			(void)exec_romaji2(inc, htmp, ztmp, otmp, len, rlen);
-  	}
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen(ztmp), strlen(htmp)); */
-! 	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen((char *)ztmp), strlen((char *)htmp));
-  	sj3_rkclear();
-  	len = wslen (ztmp);
-  	backspace(wcbyte(ztmp));
-diff -arcN ../sj3-2.0.1.13.org/sj3/funckey.c ./sj3/funckey.c
-*** ../sj3-2.0.1.13.org/sj3/funckey.c	Fri Jun  3 17:03:18 1994
---- ./sj3/funckey.c	Mon Aug 12 11:53:25 1996
-***************
-*** 117,123 ****
-  	struct cvtkey *ckeyp;
-  	struct wcvtkey *wckeyp;
-  
-! 	strcpy(cvtkey_file, "/usr/lib/sj3/cvtkey.");
-  	strcpy(line, term);
-  	if((p = strchr(line, '-')) != NULL)
-  		*p = '\0';
---- 117,127 ----
-  	struct cvtkey *ckeyp;
-  	struct wcvtkey *wckeyp;
-  
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 	strcpy(cvtkey_file, "/usr/local/lib/sj3/cvtkey.");
-  	strcpy(line, term);
-  	if((p = strchr(line, '-')) != NULL)
-  		*p = '\0';
-diff -arcN ../sj3-2.0.1.13.org/sj3/henkan.c ./sj3/henkan.c
-*** ../sj3-2.0.1.13.org/sj3/henkan.c	Fri Jun  3 17:03:19 1994
---- ./sj3/henkan.c	Tue Aug 13 01:01:25 1996
-***************
-*** 340,346 ****
-  		out += i;
-  	}
-  	if (*in != '\0')
-! 		(void)sj_hantozen(out, in, strlen(in));
-  }			
-  
-  
---- 340,351 ----
-  		out += i;
-  	}
-  	if (*in != '\0')
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		(void)sj_hantozen(out, in, strlen(in)); */
-! 		(void)sj_hantozen(out, in, strlen((char *)in));
-  }			
-  
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/romaji.c ./sj3/romaji.c
-*** ../sj3-2.0.1.13.org/sj3/romaji.c	Fri Jun  3 17:03:22 1994
---- ./sj3/romaji.c	Tue Aug 13 01:03:23 1996
-***************
-*** 370,376 ****
-  		s2 += i;
-  		roma[res + i] = '\0';
-  		rlen = sj3_rkconv2(roma, kstr, i + res - 1);
-! 		res = strlen(roma);
-  		if (rlen <= 0)
-  			continue;
-  		kp = kstr;
---- 370,381 ----
-  		s2 += i;
-  		roma[res + i] = '\0';
-  		rlen = sj3_rkconv2(roma, kstr, i + res - 1);
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		res = strlen(roma); */
-! 		res = strlen((char *)roma);
-  		if (rlen <= 0)
-  			continue;
-  		kp = kstr;
-diff -arcN ../sj3-2.0.1.13.org/sj3/sj3.c ./sj3/sj3.c
-*** ../sj3-2.0.1.13.org/sj3/sj3.c	Fri Apr  7 17:36:34 1995
---- ./sj3/sj3.c	Tue Aug 13 02:47:32 1996
-***************
-*** 189,195 ****
-  	(void) signal (SIGBUS, (void (*)())makecore);
-  	(void) signal (SIGSEGV, (void (*)())makecore);
-  	(void) signal (SIGFPE, (void (*)())makecore);
-! 	sigpipe = signal (SIGPIPE, SIG_IGN);
-  
-  	if (argv [0][0] == '-')
-  		Lflag ++;
---- 189,204 ----
-  	(void) signal (SIGBUS, (void (*)())makecore);
-  	(void) signal (SIGSEGV, (void (*)())makecore);
-  	(void) signal (SIGFPE, (void (*)())makecore);
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	sigpipe = signal (SIGPIPE, SIG_IGN); */
-! #ifdef SIGTYPE_VOID
-! 	sigpipe = (void(*)()) signal (SIGPIPE, SIG_IGN);
-! #else
-! 	sigpipe = (int(*)()) signal (SIGPIPE, SIG_IGN);
-! #endif
-  
-  	if (argv [0][0] == '-')
-  		Lflag ++;
-***************
-*** 452,466 ****
---- 461,499 ----
-  
-  	ioctl(master, I_PUSH, "pckt");		
-  #else 
-+ /*
-+  * 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/10
-+  */
-+ #if defined(__FreeBSD__)
-+ 	struct stat	stb;
-+ 	int		h, i, j, k1, k2;
-+ #else /* !__FreeBSD__ */
-  	char		c;
-  	struct stat	stb;
-  	int		i, j, k1, k2;
-+ #endif /* __FreeBSD__ */
-  
-  	strcpy(line, "/dev/ptyXX");
-  
-  	k1 = strlen("/dev/pty");
-  	k2 = strlen ("/dev/ptyp");
-  
-+ /*
-+  * 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/10
-+  */
-+ #if defined(__FreeBSD__)
-+ 	for (h = 0; h < 8; h++) {
-+ 		line[k1] = "pqrsPQRS"[h];
-+ 		line[k2] = '0';
-+ 		if (stat (line, &stb) < 0)
-+ 			break;
-+ 		for (i = 0; i < 32; i++) {
-+ 			line[k2] = "0123456789abcdefghijklmnopqrstuv"[i];
-+ #else /* !__FreeBSD__ */
-  	for (c = 'p'; c <= 'z'; c ++) { 
-  		line[k1] = c;
-  		line[k2] = '0';
-***************
-*** 468,473 ****
---- 501,507 ----
-  			break;
-  		for (i = 0; i < 16; i++) {
-  			line[k2] = "0123456789abcdef"[i];
-+ #endif /* __FreeBSD__ */
-  			master = open (line, 2);
-  			if (master >= 0) {
-  				j = 1;
-***************
-*** 681,687 ****
-  	}
-  
-  #ifndef SVR4
-! 	(void) signal (SIGCHLD, exitprocess);
-  #endif 
-  }
-  
---- 715,726 ----
-  	}
-  
-  #ifndef SVR4
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGCHLD, exitprocess); */
-! 	(void) signal (SIGCHLD, (void (*)())exitprocess);
-  #endif 
-  }
-  
-***************
-*** 787,792 ****
---- 826,836 ----
-  #else /* SYSV_TERMIOS */
-  	struct utmp		Utmp;
-  	register char		*p;
-+ /*
-+  * Remove warning.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 	char			*ttyname (), *strrchr ();
-  #define SCPYN(a, b) strncpy(a, b, sizeof(a))
-  
-  	if ((p = ttyname (0)) == NULL)
-***************
-*** 836,842 ****
-  		shellargs[1] = (char *) 0;
-  	}
-  
-! 	(void) signal (SIGPIPE, sigpipe);
-  	if ( *shellprog == '/' ) {
-  		if (shell_flag) {
-  			strcpy (shellbuf, "SHELL=");
---- 880,891 ----
-  		shellargs[1] = (char *) 0;
-  	}
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGPIPE, sigpipe); */
-! 	(void) signal (SIGPIPE, (void (*)())sigpipe);
-  	if ( *shellprog == '/' ) {
-  		if (shell_flag) {
-  			strcpy (shellbuf, "SHELL=");
-***************
-*** 1006,1012 ****
-  	union wait	status;
-  	int		pid;
-  
-! 	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0);
-  	if (WIFSTOPPED (status))
-  #endif
-  		suspend();
---- 1055,1066 ----
-  	union wait	status;
-  	int		pid;
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0); */
-! 	pid = wait3 ((int *)&status, (WNOHANG|WUNTRACED), 0);
-  	if (WIFSTOPPED (status))
-  #endif
-  		suspend();
-***************
-*** 1068,1080 ****
-  		SetRegion();
-  	}
-  
-! 	old_sigtstp = signal (SIGTSTP, SIG_DFL);
-  
-  	kill (0, SIGTSTP);
-  
-  	
-  
-! 	(void) signal (SIGTSTP, old_sigtstp);
-  	killpg (Pid_shell, SIGCONT);
-  	fixtty ();
-  
---- 1122,1148 ----
-  		SetRegion();
-  	}
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	old_sigtstp = signal (SIGTSTP, SIG_DFL); */
-! #ifdef SIGTYPE_VOID
-! 	old_sigtstp = (void(*)()) signal (SIGTSTP, SIG_DFL);
-! #else
-! 	old_sigtstp = (int(*)()) signal (SIGTSTP, SIG_DFL);
-! #endif
-  
-  	kill (0, SIGTSTP);
-  
-  	
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGTSTP, old_sigtstp); */
-! 	(void) signal (SIGTSTP, (void (*)())old_sigtstp);
-  	killpg (Pid_shell, SIGCONT);
-  	fixtty ();
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/sjrc.c ./sj3/sjrc.c
-*** ../sj3-2.0.1.13.org/sj3/sjrc.c	Fri Dec  9 20:27:09 1994
---- ./sj3/sjrc.c	Tue Aug 13 00:53:22 1996
-***************
-*** 52,59 ****
-  extern char	home[];
-  extern char	term_name[];
-  extern int      current_locale;
-! #define DEFRKFILE "/usr/lib/sj3/sjrk"
-! #define DEFRCFILE "/usr/lib/sj3/sjrc"
-  
-  #define GUIDELEN	80
-  
---- 52,63 ----
-  extern char	home[];
-  extern char	term_name[];
-  extern int      current_locale;
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! #define DEFRKFILE "/usr/local/lib/sj3/sjrk"
-! #define DEFRCFILE "/usr/local/lib/sj3/sjrc"
-  
-  #define GUIDELEN	80
-  
-***************
-*** 442,448 ****
-  struct wordent	word[];
-  {
-  	if (word[1].word_str[0] != '\0' && shellprog[0] == '\0') {
-! 		strcpy (shellprog, word[1].word_str);
-  		shell_flag++;
-  	}
-  }
---- 446,457 ----
-  struct wordent	word[];
-  {
-  	if (word[1].word_str[0] != '\0' && shellprog[0] == '\0') {
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		strcpy (shellprog, word[1].word_str); */
-! 		strcpy (shellprog, (char *)word[1].word_str);
-  		shell_flag++;
-  	}
-  }
-diff -arcN ../sj3-2.0.1.13.org/sj3dic/Imakefile ./sj3dic/Imakefile
-*** ../sj3-2.0.1.13.org/sj3dic/Imakefile	Fri Jun  3 17:03:33 1994
---- ./sj3dic/Imakefile	Mon Aug 12 12:20:15 1996
-***************
-*** 32,38 ****
-   * $SonyDate: 1994/06/03 08:03:32 $
-   */
-  
-! DEST	        = /usr/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
---- 32,43 ----
-   * $SonyDate: 1994/06/03 08:03:32 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-***************
-*** 41,47 ****
-  CODE_LIBS       = -ljcode
-  #endif
-  #else
-! INSTGROUP	= staff
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
---- 46,52 ----
-  CODE_LIBS       = -ljcode
-  #endif
-  #else
-! INSTGROUP	= bin
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
-***************
-*** 52,58 ****
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 755
-  
-  SRCS          = codecnv.c \
-                  dictdisp.c \
---- 57,63 ----
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS          = codecnv.c \
-                  dictdisp.c \
-diff -arcN ../sj3-2.0.1.13.org/sj3h/sj2.h ./sj3h/sj2.h
-*** ../sj3-2.0.1.13.org/sj3h/sj2.h	Fri Jun  3 17:03:51 1994
---- ./sj3h/sj2.h	Tue Aug 13 01:14:54 1996
-***************
-*** 95,103 ****
-  
-  
-  
-  #define TRUE	0
-  #define FALSE	-1
-! 
-  
-  
-  struct	wordent {
---- 95,115 ----
-  
-  
-  
-+ /*
-+  * Remove warning.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ #if defined(TRUE) && defined(FALSE)
-+ #if (TRUE != 0) || (TRUE != -1)
-+ #undef TRUE
-+ #undef FALSE
-  #define TRUE	0
-  #define FALSE	-1
-! #endif
-! #else
-! #define TRUE	0
-! #define FALSE	-1
-! #endif
-  
-  
-  struct	wordent {
-diff -arcN ../sj3-2.0.1.13.org/sj3lib/Imakefile ./sj3lib/Imakefile
-*** ../sj3-2.0.1.13.org/sj3lib/Imakefile	Fri Jun  3 17:03:54 1994
---- ./sj3lib/Imakefile	Mon Aug 12 12:22:02 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:03:53 $
-   */
-  
-! INSTALL_LIBDIR = /usr/lib
-! INSTALL_HDRDIR = /usr/include
-  #if SystemV4 || SystemV
-  DEFINES = -DTLI
-  #endif
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:03:53 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! INSTALL_LIBDIR = /usr/local/lib
-! INSTALL_HDRDIR = /usr/local/include
-  #if SystemV4 || SystemV
-  DEFINES = -DTLI
-  #endif
-diff -arcN ../sj3-2.0.1.13.org/sj3stat/Imakefile ./sj3stat/Imakefile
-*** ../sj3-2.0.1.13.org/sj3stat/Imakefile	Tue May 30 21:29:25 1995
---- ./sj3stat/Imakefile	Mon Aug 12 12:23:14 1996
-***************
-*** 32,44 ****
-   * $SonyDate: 1995/05/30 12:29:17 $
-   */
-  
-! DEST	        = /usr/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= staff
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
---- 32,49 ----
-   * $SonyDate: 1995/05/30 12:29:17 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= bin
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
-***************
-*** 49,55 ****
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 755
-  
-  SRCS          = sj3stat.c
-  	
---- 54,60 ----
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS          = sj3stat.c
-  	
-diff -arcN ../sj3-2.0.1.13.org/sj3stat/sj3stat.c ./sj3stat/sj3stat.c
-*** ../sj3-2.0.1.13.org/sj3stat/sj3stat.c	Tue May 30 21:29:25 1995
---- ./sj3stat/sj3stat.c	Mon Aug 12 23:39:19 1996
-***************
-*** 91,100 ****
-  	}
-  	fprintf (stdout, "%d users.\n", n);
-  
-! 	fprintf(stdout, "%-16s %-16s %-8s %s\n", 
-  		"(USER)", "(HOST)", "(FD)", "(CLIENT)");
-  	for (i = 0; i < n; i++) {
-! 		fprintf(stdout, "%-16s %-16s %-8d %s\n", who[i].username, 
-  			who[i].hostname, who[i].fd, who[i].progname);
-  	}
-  	(void) sj3_erase_connection(&clnt);
---- 91,107 ----
-  	}
-  	fprintf (stdout, "%d users.\n", n);
-  
-! /*
-!  * Change hostname entry's length.
-!  * Because it's so short.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	fprintf(stdout, "%-16s %-16s %-8s %s\n", */
-! 	fprintf(stdout, "%-16s %-32s %-8s %s\n", 
-  		"(USER)", "(HOST)", "(FD)", "(CLIENT)");
-  	for (i = 0; i < n; i++) {
-! /*		fprintf(stdout, "%-16s %-16s %-8d %s\n", who[i].username, */
-! 		fprintf(stdout, "%-16s %-32s %-8d %s\n", who[i].username, 
-  			who[i].hostname, who[i].fd, who[i].progname);
-  	}
-  	(void) sj3_erase_connection(&clnt);
-diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
-*** ../sj3-2.0.1.13.old/include/Const.h	Tue Aug 13 03:13:39 1996
---- ./include/Const.h	Wed Aug 21 14:01:27 1996
-***************
-*** 87,93 ****
---- 87,101 ----
-  #define ProtoName               "tcp"
-  #define	PortNumber		"3000"
-  #else
-+ /*
-+  * Change the default Port number of sj3 for FreeBSD.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+  */
-+ #ifdef __FreeBSD__
-+ #define	PortNumber		3086
-+ #else /* ! __FreeBSD__ */
-  #define	PortNumber		3000
-+ #endif /* ! __FreeBSD__ */
-  #endif
-  #define	SocketName		"/tmp/sj3sock"
-  #define	LockFile		"/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-server/files/patch-ab b/japanese/sj3-server/files/patch-ab
new file mode 100644
index 000000000000..ea8aebc78ddd
--- /dev/null
+++ b/japanese/sj3-server/files/patch-ab
@@ -0,0 +1,21 @@
+diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
+*** ../sj3-2.0.1.13.old/include/Const.h	Tue Aug 13 03:13:39 1996
+--- ./include/Const.h	Wed Aug 21 14:01:27 1996
+***************
+*** 87,93 ****
+--- 87,101 ----
+  #define ProtoName               "tcp"
+  #define	PortNumber		"3000"
+  #else
++ /*
++  * Change the default Port number of sj3 for FreeBSD.
++  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
++  */
++ #ifdef __FreeBSD__
++ #define	PortNumber		3086
++ #else /* ! __FreeBSD__ */
+  #define	PortNumber		3000
++ #endif /* ! __FreeBSD__ */
+  #endif
+  #define	SocketName		"/tmp/sj3sock"
+  #define	LockFile		"/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-server/files/patch-ac b/japanese/sj3-server/files/patch-ac
new file mode 100644
index 000000000000..148a043fdad8
--- /dev/null
+++ b/japanese/sj3-server/files/patch-ac
@@ -0,0 +1,11 @@
+--- dict/dict/Imakefile.~1~	Thu Jan 23 20:20:51 1997
++++ dict/dict/Imakefile	Tue Aug 18 10:51:14 1998
+@@ -48,7 +48,7 @@
+ 
+ XCOMM INSTFLAGS	= -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
+ 
+-all:		$(OBJS)
++all::		$(OBJS)
+ 
+ $(OBJS):	$(SRCS)
+ 		$(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/japanese/sj3-server/files/patch-ad b/japanese/sj3-server/files/patch-ad
new file mode 100644
index 000000000000..8c714daa84fe
--- /dev/null
+++ b/japanese/sj3-server/files/patch-ad
@@ -0,0 +1,11 @@
+--- sj3.tmpl.~1~	Thu Jan 23 20:20:58 1997
++++ sj3.tmpl	Tue Aug 18 11:07:42 1998
+@@ -48,7 +48,7 @@
+ #if defined(FreeBSDArchitecture)
+ 
+ CODE_LIBS	= -lxpg4
+-SJ3OWNER	= root
++SJ3OWNER	= bin
+ SJ3GROUP	= bin
+ 
+ #else
diff --git a/japanese/sj3-server/files/patch-ae b/japanese/sj3-server/files/patch-ae
new file mode 100644
index 000000000000..939c71115c9b
--- /dev/null
+++ b/japanese/sj3-server/files/patch-ae
@@ -0,0 +1,26 @@
+--- include/Paths.h.in.orig	Thu Jan 23 20:20:57 1997
++++ include/Paths.h.in	Tue Aug 18 11:29:00 1998
+@@ -33,7 +33,22 @@
+  * $SonyDate: 1997/01/23 11:20:55 $
+  */
+ 
+-#define ErrorOutFile            "/dev/console"
++/*
++ * Change ErrotOutFile variable.
++ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
++ * This error is "Cannot Open "/dev/console".". 
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
++ *
++ * Change ErrotOutFile variable.
++ * This default value is "/dev/null" in document.
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
++ */
++#if !defined(__FreeBSD__)
++#define	ErrorOutFile		"/dev/console"
++#else
++/* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
++#define	ErrorOutFile		"/dev/null"
++#endif
+ 
+ #define SocketName              "/tmp/sj3sock"
+ #define LockFile                "/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-server/files/patch-af b/japanese/sj3-server/files/patch-af
new file mode 100644
index 000000000000..13b49cf298b3
--- /dev/null
+++ b/japanese/sj3-server/files/patch-af
@@ -0,0 +1,11 @@
+--- doc/man/Imakefile.~1~	Thu Jan 23 20:20:52 1997
++++ doc/man/Imakefile	Tue Aug 18 12:15:20 1998
+@@ -40,7 +40,7 @@
+  */
+ 
+ #ifndef JapaneseManLocale
+-#define JapaneseManLocale	ja_JP.EUC
++#define JapaneseManLocale	ja
+ #endif
+ JMANLOCALE = JapaneseManLocale
+ 
diff --git a/japanese/sj3-server/pkg-descr b/japanese/sj3-server/pkg-descr
index 40d4753542ca..3daaeb2d9b61 100644
--- a/japanese/sj3-server/pkg-descr
+++ b/japanese/sj3-server/pkg-descr
@@ -1,4 +1,4 @@
-This is SJ3 2.0.1.13, a Japanese input method.
+This is SJ3 2.0.1.20, a Japanese input method.
 This system developed by Sony Corporation.
 SJ3 is composed of Kana-Kanji conversion server(sj3serv), 
 Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
diff --git a/japanese/sj3-server/pkg-plist b/japanese/sj3-server/pkg-plist
index 1cbeed197c87..1e3a58b681f7 100644
--- a/japanese/sj3-server/pkg-plist
+++ b/japanese/sj3-server/pkg-plist
@@ -3,6 +3,7 @@ bin/sj3dic
 bin/sj3mkdic
 bin/sj3serv
 bin/sj3stat
+include/sj3lib.h
 lib/libsj3lib.a
 lib/sj3/Nihongo.ps.Z
 lib/sj3/cvtkey.news
@@ -17,7 +18,7 @@ lib/sj3/sj3lib.ms
 lib/sj3/sj3serv.ms
 lib/sj3/sjrc
 lib/sj3/sjrk
-man/ja/man1/sj3.1.gz
-man/ja/man1/sj3dic.1.gz
-man/ja/man1/sj3mkdic.1.gz
-man/ja/man1/sj3serv.1.gz
+etc/rc.d/sj3.sh
+@dirrm lib/sj3/dict/user
+@dirrm lib/sj3/dict
+@dirrm lib/sj3
diff --git a/japanese/sj3/Makefile b/japanese/sj3/Makefile
index 8c41501dd59d..d48639a5f120 100644
--- a/japanese/sj3/Makefile
+++ b/japanese/sj3/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	SJ3
-# Version required:	2.0.1.13
-# Date created:		10 Aug 1996
+# Version required:	2.0.1.20
+# Date created:		18 Aug 1998
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/09/14 21:35:56 max Exp $
+# $Id: Makefile,v 1.6 1998/06/06 03:45:04 itojun Exp $
 #
 
-DISTNAME=	sj3-2.0.1.13
-PKGNAME=	ja-sj3-2.0.1.13
+DISTNAME=	sj3-2.0.1.20
+PKGNAME=	ja-sj3-2.0.1.20
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
@@ -17,11 +17,27 @@ MAINTAINER=	hidekazu@cs.titech.ac.jp
 MAN1=		sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
 MANLANG=	ja
 
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/sj3.sh
+
 # This port requires xmkmf but installs in /usr/local
 #
 # NOTE : You must not use 'xmkmf -a', because the running 'make depend' caused a error.
 
 do-configure:
-	( cd $(WRKDIR)/sj3-2.0.1.13 ; xmkmf ; make Makefiles )
+	( cd $(WRKSRC) ; xmkmf ; make Makefiles )
+
+post-install:
+	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
+		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
+		${ECHO} 'sj3=${PREFIX}/bin/sj3serv' >> ${STARTUP_SCRIPT} ; \
+		${ECHO} 'if [ -f $$sj3 ]; then' >> ${STARTUP_SCRIPT} ;	\
+		${ECHO} '     $$sj3' >> ${STARTUP_SCRIPT} ;		\
+		${ECHO} "fi" >> ${STARTUP_SCRIPT} ;			\
+		chmod 755 ${STARTUP_SCRIPT} ;				\
+		chown bin.bin ${STARTUP_SCRIPT};			\
+	fi
+	${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/sj3/distinfo b/japanese/sj3/distinfo
index 9d39008a5ba1..31c66f8d7cec 100644
--- a/japanese/sj3/distinfo
+++ b/japanese/sj3/distinfo
@@ -1 +1 @@
-MD5 (sj3-2.0.1.13.tar.gz) = f29a04e72a657557f7436268ccdafe49
+MD5 (sj3-2.0.1.20.tar.gz) = 36cc23702e2295e4552271b9d481c863
diff --git a/japanese/sj3/files/patch-aa b/japanese/sj3/files/patch-aa
index 04d311632cd0..2ff33a40a0c8 100644
--- a/japanese/sj3/files/patch-aa
+++ b/japanese/sj3/files/patch-aa
@@ -1,348 +1,3 @@
-diff -arcN ../sj3-2.0.1.13.org/Imakefile ./Imakefile
-*** ../sj3-2.0.1.13.org/Imakefile	Tue May 30 21:30:16 1995
---- ./Imakefile	Mon Aug 12 11:34:47 1996
-***************
-*** 35,41 ****
-  #define IHaveSubdirs
-  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-  
-! SUBDIRS = dict kanakan server sj3lib sj3 sj3dic sj3stat demo
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
---- 35,46 ----
-  #define IHaveSubdirs
-  #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-  
-! /*
-!  * Add make rules to install manpages and other documents.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! SUBDIRS = dict doc kanakan server sj3lib sj3 sj3dic sj3stat demo
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
-diff -arcN ../sj3-2.0.1.13.org/README ./README
-*** ../sj3-2.0.1.13.org/README	Thu Mar 21 14:59:47 1996
---- ./README	Tue Aug 13 03:10:23 1996
-***************
-*** 20,40 ****
-  
-  	Following files are installed after make install:
-  
-! 	/usr/dict/sj3/sj3main.dic	Main dictionary(used by sj3serv)
-! 	/usr/bin/sj3serv		Kana-Kanji conversion server
-! 	/usr/bin/sj3			Kana-Kanji conversion client
-! 	/usr/bin/sj3dic			User dictionary utility
-! 	/usr/bin/sj3mkdic		Dictionary converter
-! 	/usr/bin/sj3stat		Utility to show status of sj3serv
-! 	/usr/include/sj3lib.h		Header file for sj3lib
-! 	/usr/lib/libsj3lib.a		Kana-Kanji conversion library
-! 	/usr/lib/sj3/serverrc		Configuration file for sj3serv
-! 	/usr/lib/sj3/sjrc		Configuration file for sj3
-! 	/usr/lib/sj3/sjrk		Roma-Kana conversion file for sj3
-! 	/usr/lib/sj3/cvtkey.xterm	Mapping table between function key
-! 	/usr/lib/sj3/cvtkey.news	and escape sequence for sj3
-! 	/usr/lib/sj3/cvtkey.nws511
-! 	/usr/lib/sj3/cvtkey.nws517
-  
-  * Source tree
-  	dict/dict	Main dictionary(text file)
---- 20,49 ----
-  
-  	Following files are installed after make install:
-  
-! 	/usr/local/lib/sj3/dict/sj3main.dic	Main dictionary(used by sj3serv)
-! 	/usr/local/bin/sj3serv			Kana-Kanji conversion server
-! 	/usr/local/bin/sj3			Kana-Kanji conversion client
-! 	/usr/local/bin/sj3dic			User dictionary utility
-! 	/usr/local/bin/sj3mkdic			Dictionary converter
-! 	/usr/local/bin/sj3stat			Utility to show status of sj3serv
-! 	/usr/local/include/sj3lib.h		Header file for sj3lib
-! 	/usr/local/lib/libsj3lib.a		Kana-Kanji conversion library
-! 	/usr/local/man/ja/man1/sj3.1		sj3's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3dic.1		sj3dic's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3mkdic.1	sj3mkdic's online manual(Japanese)
-! 	/usr/local/man/ja/man1/sj3serv.1	sj3serv's online manual(Japanese)
-! 	/usr/local/lib/sj3/serverrc		Configuration file for sj3serv
-! 	/usr/local/lib/sj3/sjrc			Configuration file for sj3
-! 	/usr/local/lib/sj3/sjrk			Roma-Kana conversion file for sj3
-! 	/usr/local/lib/sj3/cvtkey.xterm		Mapping table between function key
-! 	/usr/local/lib/sj3/cvtkey.news		and escape sequence for sj3
-! 	/usr/local/lib/sj3/cvtkey.nws511
-! 	/usr/local/lib/sj3/cvtkey.nws517
-! 	/usr/local/lib/sj3/Nihongo.ps.Z		Operation guide for SJ3(Japanese)
-! 	/usr/local/lib/sj3/hinsi.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/makedict.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/sj3lib.ms		Documents(Japanese)
-! 	/usr/local/lib/sj3/sj3serv.ms		Documents(Japanese)
-  
-  * Source tree
-  	dict/dict	Main dictionary(text file)
-diff -arcN ../sj3-2.0.1.13.org/README.eucJP ./README.eucJP
-*** ../sj3-2.0.1.13.org/README.eucJP	Thu Mar 21 15:00:11 1996
---- ./README.eucJP	Tue Aug 13 03:10:45 1996
-***************
-*** 28,48 ****
-  
-  	この操作によりインストールされるファイルをいかに示します。
-  
-! 	/usr/dict/sj3/sj3main.dic	sj3serv が使用するメイン辞書
-! 	/usr/bin/sj3serv		仮名漢字変換サーバ
-! 	/usr/bin/sj3			端末用仮名漢字変換クライアント
-! 	/usr/bin/sj3dic			ユーザ辞書ユーティリティ
-! 	/usr/bin/sj3mkdic		辞書生成ツール
-! 	/usr/bin/sj3stat		sj3serv への接続状況表示ユーティリティ
-! 	/usr/include/sj3lib.h		仮名漢字変換ライブラリのヘッダファイル
-! 	/usr/lib/libsj3lib.a		仮名漢字変換ライブラリ
-! 	/usr/lib/sj3/serverrc		sj3serv の設定ファイル
-! 	/usr/lib/sj3/sjrc		sj3 の設定ファイル
-! 	/usr/lib/sj3/sjrk		sj3 のローマ字仮名変換設定ファイル
-! 	/usr/lib/sj3/cvtkey.xterm	sj3 のファンクションキーとエスケープ
-! 	/usr/lib/sj3/cvtkey.news	シーケンスの対応を設定するファイル。
-! 	/usr/lib/sj3/cvtkey.nws511
-! 	/usr/lib/sj3/cvtkey.nws517
-  
-  
-  ・ディレクトリ構成
---- 28,57 ----
-  
-  	この操作によりインストールされるファイルをいかに示します。
-  
-! 	/usr/local/lib/sj3/dict/sj3main.dic	sj3serv が使用するメイン辞書
-! 	/usr/local/bin/sj3serv			仮名漢字変換サーバ
-! 	/usr/local/bin/sj3			端末用仮名漢字変換クライアント
-! 	/usr/local/bin/sj3dic			ユーザ辞書ユーティリティ
-! 	/usr/local/bin/sj3mkdic			辞書生成ツール
-! 	/usr/local/bin/sj3stat			sj3serv への接続状況表示ユーティリティ
-! 	/usr/local/include/sj3lib.h		仮名漢字変換ライブラリのヘッダファイル
-! 	/usr/local/lib/libsj3lib.a		仮名漢字変換ライブラリ
-! 	/usr/local/man/ja/man1/sj3.1		sj3 のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3dic.1		sj3dic のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3mkdic.1	sj3mkdic のオンラインマニュアル
-! 	/usr/local/man/ja/man1/sj3serv.1	sj3serv のオンラインマニュアル
-! 	/usr/local/lib/sj3/serverrc		sj3serv の設定ファイル
-! 	/usr/local/lib/sj3/sjrc			sj3 の設定ファイル
-! 	/usr/local/lib/sj3/sjrk			sj3 のローマ字仮名変換設定ファイル
-! 	/usr/local/lib/sj3/cvtkey.xterm		sj3 のファンクションキーとエスケープ
-! 	/usr/local/lib/sj3/cvtkey.news		シーケンスの対応を設定するファイル。
-! 	/usr/local/lib/sj3/cvtkey.nws511
-! 	/usr/local/lib/sj3/cvtkey.nws517	
-! 	/usr/local/lib/sj3/Nihongo.ps.Z		SJ3 日本語入力ガイド
-! 	/usr/local/lib/sj3/hinsi.ms		ドキュメント
-! 	/usr/local/lib/sj3/makedict.ms		ドキュメント
-! 	/usr/local/lib/sj3/sj3lib.ms		ドキュメント
-! 	/usr/local/lib/sj3/sj3serv.ms		ドキュメント
-  
-  
-  ・ディレクトリ構成
-diff -arcN ../sj3-2.0.1.13.org/demo/sample.c ./demo/sample.c
-*** ../sj3-2.0.1.13.org/demo/sample.c	Fri Jun  3 17:00:16 1994
---- ./demo/sample.c	Mon Aug 12 12:30:29 1996
-***************
-*** 44,50 ****
-  #include "wchar16.h"
-  
-  #define	RETURN(c)	((c == '\n') || (c == '\r'))
-! #define	RKFILE		"/usr/lib/sj3/sjrk"
-  #define	LOCALHOST	"localhost"
-  #define	HBUFSIZ		512
-  #define	QBUFSIZ		256
---- 44,54 ----
-  #include "wchar16.h"
-  
-  #define	RETURN(c)	((c == '\n') || (c == '\r'))
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! #define	RKFILE		"/usr/local/lib/sj3/sjrk"
-  #define	LOCALHOST	"localhost"
-  #define	HBUFSIZ		512
-  #define	QBUFSIZ		256
-diff -arcN ../sj3-2.0.1.13.org/dict/dict/Imakefile ./dict/dict/Imakefile
-*** ../sj3-2.0.1.13.org/dict/dict/Imakefile	Fri Dec  9 20:27:05 1994
---- ./dict/dict/Imakefile	Tue Aug 13 03:14:31 1996
-***************
-*** 32,38 ****
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! DICTDIR         = /usr/dict/sj3
-  
-  TOOL_DIR      = ../tool
-  TOOL_NAME     = sj3mkdic
---- 32,43 ----
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DICTDIR         = /usr/local/lib/sj3/dict
-  
-  TOOL_DIR      = ../tool
-  TOOL_NAME     = sj3mkdic
-***************
-*** 44,52 ****
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= staff
-  #endif
-! INSTFLAGS	= -o root -g $(INSTGROUP) -m 444
-  
-! all:		$(OBJS)
-  
---- 49,57 ----
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= bin
-  #endif
-! INSTFLAGS	= -o bin -g $(INSTGROUP) -m 444
-  
-! all::		$(OBJS)
-  
-diff -arcN ../sj3-2.0.1.13.org/dict/tool/Imakefile ./dict/tool/Imakefile
-*** ../sj3-2.0.1.13.org/dict/tool/Imakefile	Fri Dec  9 20:27:05 1994
---- ./dict/tool/Imakefile	Mon Aug 12 11:38:02 1996
-***************
-*** 32,47 ****
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! DEST            = /usr/bin
-  
-  INCLUDES = -I../include -I../../include
-  #if SystemV4 || SystemV
-  INSTGROUP       = bin
-  #else
-! INSTGROUP       = staff
-  #endif
-  
-! INSTFLAGS       = -o root -g $(INSTGROUP) -m 755
-  
-  SRCS = \
-  	char.c \
---- 32,52 ----
-   * $SonyDate: 1994/12/09 11:27:05 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST            = /usr/local/bin
-  
-  INCLUDES = -I../include -I../../include
-  #if SystemV4 || SystemV
-  INSTGROUP       = bin
-  #else
-! INSTGROUP       = bin
-  #endif
-  
-! INSTFLAGS       = -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS = \
-  	char.c \
-diff -arcN ../sj3-2.0.1.13.org/doc/Imakefile ./doc/Imakefile
-*** ../sj3-2.0.1.13.org/doc/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/Imakefile	Mon Aug 12 11:34:22 1996
-***************
-*** 0 ****
---- 1,40 ----
-+ /*
-+  * Copyright (c) 1991-1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install manpages and other documents.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ #define IHaveSubdirs
-+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-+ 
-+ SUBDIRS = doc man
-+ 
-+ MakeSubdirs($(SUBDIRS))
-+ DependSubdirs($(SUBDIRS))
-diff -arcN ../sj3-2.0.1.13.org/doc/doc/Imakefile ./doc/doc/Imakefile
-*** ../sj3-2.0.1.13.org/doc/doc/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/doc/Imakefile	Mon Aug 12 11:34:34 1996
-***************
-*** 0 ****
---- 1,41 ----
-+ /*
-+  * Copyright (c) 1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install other documents.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ CONFDIR 	= /usr/local/lib/sj3
-+ DOCLIST		= Nihongo.ps.Z hinsi.ms makedict.ms sj3lib.ms sj3serv.ms
-+ 
-+ all::
-+ 
-+ depend::
-+ 
-+ InstallMultiple($(DOCLIST),$(CONFDIR))
 diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms
 *** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms	Fri Jun  3 17:00:49 1994
 --- ./doc/doc/sj3lib.ms	Tue Aug 13 03:17:26 1996
@@ -502,62 +157,6 @@ diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3serv.ms ./doc/doc/sj3serv.ms
   .RE
   .sp
   .NH 3
-diff -arcN ../sj3-2.0.1.13.org/doc/man/Imakefile ./doc/man/Imakefile
-*** ../sj3-2.0.1.13.org/doc/man/Imakefile	Thu Jan  1 09:00:00 1970
---- ./doc/man/Imakefile	Mon Aug 12 11:34:15 1996
-***************
-*** 0 ****
---- 1,50 ----
-+ /*
-+  * Copyright (c) 1994  Sony Corporation
-+  * 
-+  * Permission is hereby granted, free of charge, to any person obtaining
-+  * a copy of this software and associated documentation files (the
-+  * "Software"), to deal in the Software without restriction, including
-+  * without limitation the rights to use, copy, modify, merge, publish,
-+  * distribute, sublicense, and/or sell copies of the Software, and to
-+  * permit persons to whom the Software is furnished to do so, subject to
-+  * the following conditions:
-+  * 
-+  * The above copyright notice and this permission notice shall be
-+  * included in all copies or substantial portions of the Software.
-+  * 
-+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+  * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
-+  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+  * 
-+  * Except as contained in this notice, the name of Sony Corporation
-+  * shall not be used in advertising or otherwise to promote the sale, use
-+  * or other dealings in this Software without prior written authorization
-+  * from Sony Corporation.
-+  */
-+ 
-+ /*
-+  * Add make rules to install manpages.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 
-+ #ifndef JapaneseManLocale
-+ #define JapaneseManLocale	ja
-+ #endif
-+ JMANLOCALE = JapaneseManLocale
-+ 
-+ #ifndef JapaneseManDir
-+ #define JapaneseManDir		/usr/local/man/$(JMANLOCALE)/man1
-+ #endif
-+ 
-+ JMANDIR 	= JapaneseManDir
-+ MANLIST		= sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
-+ 
-+ all::
-+ 
-+ depend::
-+ 
-+ InstallMultipleFlags($(MANLIST),$(JMANDIR),$(INSTMANFLAGS))
 diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3.1 ./doc/man/sj3.1
 *** ../sj3-2.0.1.13.org/doc/man/sj3.1	Fri Jun  3 17:00:51 1994
 --- ./doc/man/sj3.1	Tue Aug 13 03:18:59 1996
@@ -760,321 +359,6 @@ diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3serv.1 ./doc/man/sj3serv.1
   かな漢字変換サーバ デフォルト辞書ディレクトリ
   .TP
       sj3main.dic
-diff -arcN ../sj3-2.0.1.13.org/include/Const.h ./include/Const.h
-*** ../sj3-2.0.1.13.org/include/Const.h	Fri Oct 21 13:16:19 1994
---- ./include/Const.h	Tue Aug 13 03:13:39 1996
-***************
-*** 33,38 ****
---- 33,42 ----
-   * $SonyDate: 1994/10/21 04:16:06 $
-   */
-  
-+ /*
-+  * Change some default values.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-  
-  
-  #define	HostNameLen		128			
-***************
-*** 54,66 ****
-  #define	MinClLen		512
-  #define	MaxClLen		0x7fff
-  
-! #define	RunCmdFile		"/usr/lib/sj3/serverrc"
-  #define	DebugOutFile		NULL	
-  #define	DebugLevel		0
-  #define	ForkFlag		1
-  #define	MaxClientNum		512
-  #define	ErrorOutFile		"/dev/console"
-! #define	DictRootDir		"/usr/dict/sj3"
-  #define	LogOutFile		NULL	
-  #define	PortName		"sj3"
-  #ifdef TLI
---- 58,85 ----
-  #define	MinClLen		512
-  #define	MaxClLen		0x7fff
-  
-! #define	RunCmdFile		"/usr/local/lib/sj3/serverrc"
-  #define	DebugOutFile		NULL	
-  #define	DebugLevel		0
-  #define	ForkFlag		1
-  #define	MaxClientNum		512
-+ /*
-+  * Change ErrotOutFile variable.
-+  * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+  * This error is "Cannot Open "/dev/console".". 
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  *
-+  * Change ErrotOutFile variable.
-+  * This default value is "/dev/null" in document.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
-+  */
-+ #if 0
-  #define	ErrorOutFile		"/dev/console"
-! #else
-! /* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
-! #define	ErrorOutFile		"/dev/null"
-! #endif
-! #define	DictRootDir		"/usr/local/lib/sj3/dict"
-  #define	LogOutFile		NULL	
-  #define	PortName		"sj3"
-  #ifdef TLI
-diff -arcN ../sj3-2.0.1.13.org/server/Imakefile ./server/Imakefile
-*** ../sj3-2.0.1.13.org/server/Imakefile	Fri Jun  3 17:02:50 1994
---- ./server/Imakefile	Mon Aug 12 11:38:51 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:02:49 $
-   */
-  
-! DEST	        = /usr/bin
-! CONFDIR 	= /usr/lib/sj3
-  CONFFILE        = $(CONFDIR)/serverrc
-  RKDIR           = ../sj3lib
-  
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:02:49 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-! CONFDIR 	= /usr/local/lib/sj3
-  CONFFILE        = $(CONFDIR)/serverrc
-  RKDIR           = ../sj3lib
-  
-***************
-*** 45,59 ****
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= staff
-  #endif
-  DEFINES          = $(ARCDEFS) $(SYSDEFS) $(USETLI) 
-  
-  CONVLIB         = ../kanakan/libkanakan.a
-  DEPLIBS         = $(CONVLIB)
-  LOCAL_LIBRARIES = $(CONVLIB)
-! INSTFLAGS	= -o root -g $(INSTGROUP) -m 4755
-! INSTFLAGS2	= -o root -g $(INSTGROUP) -m 444
-  
-  #MKDIRHIER       = ../util/mkdirh/mkdirh
-  
---- 50,64 ----
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= bin
-  #endif
-  DEFINES          = $(ARCDEFS) $(SYSDEFS) $(USETLI) 
-  
-  CONVLIB         = ../kanakan/libkanakan.a
-  DEPLIBS         = $(CONVLIB)
-  LOCAL_LIBRARIES = $(CONVLIB)
-! INSTFLAGS	= -o bin -g $(INSTGROUP) -m 4755
-! INSTFLAGS2	= -o bin -g $(INSTGROUP) -m 444
-  
-  #MKDIRHIER       = ../util/mkdirh/mkdirh
-  
-***************
-*** 80,83 ****
-  DependTarget()
-  LinkSourceFile(string.c,$(RKDIR))
-  InstallProgramWithFlags(sj3serv,$(DEST),$(INSTFLAGS))
-! InstallProgramWithFlags(serverrc,$(CONFDIR),$(INSTFLAGS2))
---- 85,88 ----
-  DependTarget()
-  LinkSourceFile(string.c,$(RKDIR))
-  InstallProgramWithFlags(sj3serv,$(DEST),$(INSTFLAGS))
-! InstallMultipleFlags(serverrc,$(CONFDIR),$(INSTFLAGS2))
-diff -arcN ../sj3-2.0.1.13.org/server/rc.sj3serv ./server/rc.sj3serv
-*** ../sj3-2.0.1.13.org/server/rc.sj3serv	Fri Jun  3 17:02:55 1994
---- ./server/rc.sj3serv	Mon Aug 12 11:48:07 1996
-***************
-*** 41,49 ****
-  CMDNAME=sj3serv
-  
-  PRINTNAME=$CMDNAME
-! CMDDIR=/usr/bin
-  BACKGROUND=
-! PATH=/usr/bin:/bin
-  CMDPATH=$CMDDIR/$CMDNAME
-  
-  RESTARTMESSAGE=
---- 41,49 ----
-  CMDNAME=sj3serv
-  
-  PRINTNAME=$CMDNAME
-! CMDDIR=/usr/local/bin
-  BACKGROUND=
-! PATH=/usr/local/bin:/usr/bin:/bin
-  CMDPATH=$CMDDIR/$CMDNAME
-  
-  RESTARTMESSAGE=
-***************
-*** 54,111 ****
-  #DOWNMESSAGE="Killed $PRINTNAME"
-  USAGEMESSAGE="Usage: $0 [start|stop]"
-  
-  if [ "$CMDNAME" = "sj3serv" ]
-  then
-! 	if [ ! -d /usr/bin ]
-! 	then                    # /usr not mounted
-  	        exit
-  	fi
-  
-- 	pid=`/sbin/findproc $CMDNAME`
-  	case "$1" in
-  	'start')
-! 		if [ $pid ] 
-! 		then	
-! 			kill -TERM $pid
-! 			sleep 1
-! 			pid=`/sbin/findproc $CMDNAME`
-! 			if [ $pid ] 
-! 			then
-! 				kill -9 $pid
-! 			fi
-! 			if [ -f $CMDPATH ]
-  			then
-! 				if [ "$RESTARTMESSAGE" ] 
-! 				then 
-! 					echo $RESTARTMESSAGE > /dev/console
-! 				fi
-! 				eval $CMDPATH $BACKGROUND
-  			fi	
-! 		else
-! 			if [ -f $CMDPATH ]
-! 			then 
-! 				if [ "$STARTMESSAGE" ]
-! 				then
-! 					echo $STARTMESSAGE >/dev/console 
-! 				fi	
-!                                 eval $CMDPATH $BACKGROUND
-! 			fi
-  		fi
-  		;;
-  	'stop')
-! 		if [ $pid ]
-! 		then
-! 			kill -TERM $pid
-! 			sleep 1
-! 			pid=`/sbin/findproc $CMDNAME`
-! 			if [ $pid ] 
-! 			then 
-! 				kill -9 $pid
-! 			fi
-! 			if [ "$DOWNMESSAGE" ]
-  			then
-! 				echo $DOWNMESSAGE > /dev/console
-! 			fi
-  		fi
-  		;;
-  	*)
---- 54,152 ----
-  #DOWNMESSAGE="Killed $PRINTNAME"
-  USAGEMESSAGE="Usage: $0 [start|stop]"
-  
-+ #if [ "$CMDNAME" = "sj3serv" ]
-+ #then
-+ #	if [ ! -d /usr/local/bin ]
-+ #	then                    # /usr/local not mounted
-+ #	        exit
-+ #	fi
-+ #
-+ #	pid=`/sbin/findproc $CMDNAME`
-+ #	case "$1" in
-+ #	'start')
-+ #		if [ $pid ] 
-+ #		then	
-+ #			kill -TERM $pid
-+ #			sleep 1
-+ #			pid=`/sbin/findproc $CMDNAME`
-+ #			if [ $pid ] 
-+ #			then
-+ #				kill -9 $pid
-+ #			fi
-+ #			if [ -f $CMDPATH ]
-+ #			then
-+ #				if [ "$RESTARTMESSAGE" ] 
-+ #				then 
-+ #					echo $RESTARTMESSAGE > /dev/console
-+ #				fi
-+ #				eval $CMDPATH $BACKGROUND
-+ #			fi	
-+ #		else
-+ #			if [ -f $CMDPATH ]
-+ #			then 
-+ #				if [ "$STARTMESSAGE" ]
-+ #				then
-+ #					echo $STARTMESSAGE >/dev/console 
-+ #				fi	
-+ #                                eval $CMDPATH $BACKGROUND
-+ #			fi
-+ #		fi
-+ #		;;
-+ #	'stop')
-+ #		if [ $pid ]
-+ #		then
-+ #			kill -TERM $pid
-+ #			sleep 1
-+ #			pid=`/sbin/findproc $CMDNAME`
-+ #			if [ $pid ] 
-+ #			then 
-+ #				kill -9 $pid
-+ #			fi
-+ #			if [ "$DOWNMESSAGE" ]
-+ #			then
-+ #				echo $DOWNMESSAGE > /dev/console
-+ #			fi
-+ #		fi
-+ #		;;
-+ #	*)
-+ #		echo $USAGEMESSAGE 
-+ #		;;	
-+ #	esac	
-+ #fi
-+ 
-+ ##
-+ ## For system which don't have a findproc command.(FreeBSD, ...)
-+ ## Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ ##
-+ 
-  if [ "$CMDNAME" = "sj3serv" ]
-  then
-! 	if [ ! -d /usr/local/bin ]
-! 	then                    # /usr/local not mounted
-  	        exit
-  	fi
-  
-  	case "$1" in
-  	'start')
-! 		if [ -f $CMDPATH ]
-! 		then 
-! 			if [ "$STARTMESSAGE" ]
-  			then
-! 				echo $STARTMESSAGE >/dev/console 
-  			fi	
-! 			eval $CMDPATH $BACKGROUND
-  		fi
-  		;;
-  	'stop')
-! 		;;
-! 	'')
-! 		if [ -f $CMDPATH ]
-! 		then 
-! 			if [ "$STARTMESSAGE" ]
-  			then
-! 				echo $STARTMESSAGE >/dev/console 
-! 			fi	
-! 			eval $CMDPATH $BACKGROUND
-  		fi
-  		;;
-  	*)
 diff -arcN ../sj3-2.0.1.13.org/server/setup.c ./server/setup.c
 *** ../sj3-2.0.1.13.org/server/setup.c	Fri Dec  9 20:27:07 1994
 --- ./server/setup.c	Mon Aug 12 23:58:25 1996
@@ -1164,702 +448,3 @@ diff -arcN ../sj3-2.0.1.13.org/server/setup.c ./server/setup.c
   	"allowuser",	get_list,	(int)&allow_user,
   	0, 0, 0
   };
-diff -arcN ../sj3-2.0.1.13.org/sj3/Imakefile ./sj3/Imakefile
-*** ../sj3-2.0.1.13.org/sj3/Imakefile	Fri Jun  3 17:03:02 1994
---- ./sj3/Imakefile	Mon Aug 12 18:29:43 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:03:01 $
-   */
-  
-! DEST	        = /usr/bin
-! CONFDIR 	= /usr/lib/sj3
-  
-  INCLUDES        =  -I../sj3h  -I../sj3lib -I../include
-  #if SystemV4 || SystemV
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:03:01 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-! CONFDIR 	= /usr/local/lib/sj3
-  
-  INCLUDES        =  -I../sj3h  -I../sj3lib -I../include
-  #if SystemV4 || SystemV
-***************
-*** 48,56 ****
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= staff
-  SRC0		= nmttyslot.c
-  OBJ0		= nmttyslot.o
-  #endif
-  DEFINES		= $(ARCDEFS) $(SYSDEFS) -DKANJI -DOKB 
-  
---- 53,70 ----
-  EXTRA_LIBRARIES = -lnsl
-  #endif
-  #else
-! INSTGROUP	= bin
-  SRC0		= nmttyslot.c
-  OBJ0		= nmttyslot.o
-+ /*
-+  * Change for FreeBSD.
-+  * Because When the LANG variable is EUC, setlocale function in library libc 
-+  * return NULL, use it in library libxpg4 
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ #if defined(FreeBSDArchitecture)
-+ CODE_LIBS	= -lxpg4
-+ #endif
-  #endif
-  DEFINES		= $(ARCDEFS) $(SYSDEFS) -DKANJI -DOKB 
-  
-***************
-*** 59,65 ****
-  SJ3_LIBDIR          = ../sj3lib
-  RKDIR = ../sj3rkcv
-  SJLIB           = $(SJ3_LIBDIR)/libsj3lib.a
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 4755
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
---- 73,79 ----
-  SJ3_LIBDIR          = ../sj3lib
-  RKDIR = ../sj3rkcv
-  SJLIB           = $(SJ3_LIBDIR)/libsj3lib.a
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 4755
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/edit.c ./sj3/edit.c
-*** ../sj3-2.0.1.13.org/sj3/edit.c	Fri Jun  3 17:03:14 1994
---- ./sj3/edit.c	Tue Aug 13 01:02:16 1996
-***************
-*** 302,308 ****
-  	cv = GetConversion ();
-  	if (cv->Ppoint[n+1] == 0)
-  		return;
-! 	mlen = strlen (cv->Ppoint[n+1]);
-  	plen = cv->Ppoint[n] - cv->Ppoint[0];
-  	p = cv->Ppoint[n];
-  	pp = &cv->out_mode[plen];
---- 302,313 ----
-  	cv = GetConversion ();
-  	if (cv->Ppoint[n+1] == 0)
-  		return;
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	mlen = strlen (cv->Ppoint[n+1]); */
-! 	mlen = strlen ((char *)cv->Ppoint[n+1]);
-  	plen = cv->Ppoint[n] - cv->Ppoint[0];
-  	p = cv->Ppoint[n];
-  	pp = &cv->out_mode[plen];
-***************
-*** 728,734 ****
-  
-  	ylen = wslen(Zs);
-  	limit = Elimit - ylen;
-! 	hlimit = Ehlimit - strlen(Hs);
-  	*ztmp = '\0';
-  	*htmp = '\0';
-  	SaveConversion (GetConversion ());
---- 733,744 ----
-  
-  	ylen = wslen(Zs);
-  	limit = Elimit - ylen;
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	hlimit = Ehlimit - strlen(Hs); */
-! 	hlimit = Ehlimit - strlen((char *)Hs);
-  	*ztmp = '\0';
-  	*htmp = '\0';
-  	SaveConversion (GetConversion ());
-***************
-*** 749,755 ****
-  		else
-  			(void)exec_romaji2(inc, htmp, ztmp, otmp, len, rlen);
-  	}
-! 	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen(ztmp), strlen(htmp));
-  	sj3_rkclear();
-  	len = wslen (ztmp);
-  	backspace(wcbyte(ztmp));
---- 759,770 ----
-  		else
-  			(void)exec_romaji2(inc, htmp, ztmp, otmp, len, rlen);
-  	}
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen(ztmp), strlen(htmp)); */
-! 	(void)exec_romaji2(0, htmp, ztmp, otmp, strlen((char *)ztmp), strlen((char *)htmp));
-  	sj3_rkclear();
-  	len = wslen (ztmp);
-  	backspace(wcbyte(ztmp));
-diff -arcN ../sj3-2.0.1.13.org/sj3/funckey.c ./sj3/funckey.c
-*** ../sj3-2.0.1.13.org/sj3/funckey.c	Fri Jun  3 17:03:18 1994
---- ./sj3/funckey.c	Mon Aug 12 11:53:25 1996
-***************
-*** 117,123 ****
-  	struct cvtkey *ckeyp;
-  	struct wcvtkey *wckeyp;
-  
-! 	strcpy(cvtkey_file, "/usr/lib/sj3/cvtkey.");
-  	strcpy(line, term);
-  	if((p = strchr(line, '-')) != NULL)
-  		*p = '\0';
---- 117,127 ----
-  	struct cvtkey *ckeyp;
-  	struct wcvtkey *wckeyp;
-  
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 	strcpy(cvtkey_file, "/usr/local/lib/sj3/cvtkey.");
-  	strcpy(line, term);
-  	if((p = strchr(line, '-')) != NULL)
-  		*p = '\0';
-diff -arcN ../sj3-2.0.1.13.org/sj3/henkan.c ./sj3/henkan.c
-*** ../sj3-2.0.1.13.org/sj3/henkan.c	Fri Jun  3 17:03:19 1994
---- ./sj3/henkan.c	Tue Aug 13 01:01:25 1996
-***************
-*** 340,346 ****
-  		out += i;
-  	}
-  	if (*in != '\0')
-! 		(void)sj_hantozen(out, in, strlen(in));
-  }			
-  
-  
---- 340,351 ----
-  		out += i;
-  	}
-  	if (*in != '\0')
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		(void)sj_hantozen(out, in, strlen(in)); */
-! 		(void)sj_hantozen(out, in, strlen((char *)in));
-  }			
-  
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/romaji.c ./sj3/romaji.c
-*** ../sj3-2.0.1.13.org/sj3/romaji.c	Fri Jun  3 17:03:22 1994
---- ./sj3/romaji.c	Tue Aug 13 01:03:23 1996
-***************
-*** 370,376 ****
-  		s2 += i;
-  		roma[res + i] = '\0';
-  		rlen = sj3_rkconv2(roma, kstr, i + res - 1);
-! 		res = strlen(roma);
-  		if (rlen <= 0)
-  			continue;
-  		kp = kstr;
---- 370,381 ----
-  		s2 += i;
-  		roma[res + i] = '\0';
-  		rlen = sj3_rkconv2(roma, kstr, i + res - 1);
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		res = strlen(roma); */
-! 		res = strlen((char *)roma);
-  		if (rlen <= 0)
-  			continue;
-  		kp = kstr;
-diff -arcN ../sj3-2.0.1.13.org/sj3/sj3.c ./sj3/sj3.c
-*** ../sj3-2.0.1.13.org/sj3/sj3.c	Fri Apr  7 17:36:34 1995
---- ./sj3/sj3.c	Tue Aug 13 02:47:32 1996
-***************
-*** 189,195 ****
-  	(void) signal (SIGBUS, (void (*)())makecore);
-  	(void) signal (SIGSEGV, (void (*)())makecore);
-  	(void) signal (SIGFPE, (void (*)())makecore);
-! 	sigpipe = signal (SIGPIPE, SIG_IGN);
-  
-  	if (argv [0][0] == '-')
-  		Lflag ++;
---- 189,204 ----
-  	(void) signal (SIGBUS, (void (*)())makecore);
-  	(void) signal (SIGSEGV, (void (*)())makecore);
-  	(void) signal (SIGFPE, (void (*)())makecore);
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	sigpipe = signal (SIGPIPE, SIG_IGN); */
-! #ifdef SIGTYPE_VOID
-! 	sigpipe = (void(*)()) signal (SIGPIPE, SIG_IGN);
-! #else
-! 	sigpipe = (int(*)()) signal (SIGPIPE, SIG_IGN);
-! #endif
-  
-  	if (argv [0][0] == '-')
-  		Lflag ++;
-***************
-*** 452,466 ****
---- 461,499 ----
-  
-  	ioctl(master, I_PUSH, "pckt");		
-  #else 
-+ /*
-+  * 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/10
-+  */
-+ #if defined(__FreeBSD__)
-+ 	struct stat	stb;
-+ 	int		h, i, j, k1, k2;
-+ #else /* !__FreeBSD__ */
-  	char		c;
-  	struct stat	stb;
-  	int		i, j, k1, k2;
-+ #endif /* __FreeBSD__ */
-  
-  	strcpy(line, "/dev/ptyXX");
-  
-  	k1 = strlen("/dev/pty");
-  	k2 = strlen ("/dev/ptyp");
-  
-+ /*
-+  * 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/10
-+  */
-+ #if defined(__FreeBSD__)
-+ 	for (h = 0; h < 8; h++) {
-+ 		line[k1] = "pqrsPQRS"[h];
-+ 		line[k2] = '0';
-+ 		if (stat (line, &stb) < 0)
-+ 			break;
-+ 		for (i = 0; i < 32; i++) {
-+ 			line[k2] = "0123456789abcdefghijklmnopqrstuv"[i];
-+ #else /* !__FreeBSD__ */
-  	for (c = 'p'; c <= 'z'; c ++) { 
-  		line[k1] = c;
-  		line[k2] = '0';
-***************
-*** 468,473 ****
---- 501,507 ----
-  			break;
-  		for (i = 0; i < 16; i++) {
-  			line[k2] = "0123456789abcdef"[i];
-+ #endif /* __FreeBSD__ */
-  			master = open (line, 2);
-  			if (master >= 0) {
-  				j = 1;
-***************
-*** 681,687 ****
-  	}
-  
-  #ifndef SVR4
-! 	(void) signal (SIGCHLD, exitprocess);
-  #endif 
-  }
-  
---- 715,726 ----
-  	}
-  
-  #ifndef SVR4
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGCHLD, exitprocess); */
-! 	(void) signal (SIGCHLD, (void (*)())exitprocess);
-  #endif 
-  }
-  
-***************
-*** 787,792 ****
---- 826,836 ----
-  #else /* SYSV_TERMIOS */
-  	struct utmp		Utmp;
-  	register char		*p;
-+ /*
-+  * Remove warning.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ 	char			*ttyname (), *strrchr ();
-  #define SCPYN(a, b) strncpy(a, b, sizeof(a))
-  
-  	if ((p = ttyname (0)) == NULL)
-***************
-*** 836,842 ****
-  		shellargs[1] = (char *) 0;
-  	}
-  
-! 	(void) signal (SIGPIPE, sigpipe);
-  	if ( *shellprog == '/' ) {
-  		if (shell_flag) {
-  			strcpy (shellbuf, "SHELL=");
---- 880,891 ----
-  		shellargs[1] = (char *) 0;
-  	}
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGPIPE, sigpipe); */
-! 	(void) signal (SIGPIPE, (void (*)())sigpipe);
-  	if ( *shellprog == '/' ) {
-  		if (shell_flag) {
-  			strcpy (shellbuf, "SHELL=");
-***************
-*** 1006,1012 ****
-  	union wait	status;
-  	int		pid;
-  
-! 	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0);
-  	if (WIFSTOPPED (status))
-  #endif
-  		suspend();
---- 1055,1066 ----
-  	union wait	status;
-  	int		pid;
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	pid = wait3 (&status, (WNOHANG|WUNTRACED), 0); */
-! 	pid = wait3 ((int *)&status, (WNOHANG|WUNTRACED), 0);
-  	if (WIFSTOPPED (status))
-  #endif
-  		suspend();
-***************
-*** 1068,1080 ****
-  		SetRegion();
-  	}
-  
-! 	old_sigtstp = signal (SIGTSTP, SIG_DFL);
-  
-  	kill (0, SIGTSTP);
-  
-  	
-  
-! 	(void) signal (SIGTSTP, old_sigtstp);
-  	killpg (Pid_shell, SIGCONT);
-  	fixtty ();
-  
---- 1122,1148 ----
-  		SetRegion();
-  	}
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	old_sigtstp = signal (SIGTSTP, SIG_DFL); */
-! #ifdef SIGTYPE_VOID
-! 	old_sigtstp = (void(*)()) signal (SIGTSTP, SIG_DFL);
-! #else
-! 	old_sigtstp = (int(*)()) signal (SIGTSTP, SIG_DFL);
-! #endif
-  
-  	kill (0, SIGTSTP);
-  
-  	
-  
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	(void) signal (SIGTSTP, old_sigtstp); */
-! 	(void) signal (SIGTSTP, (void (*)())old_sigtstp);
-  	killpg (Pid_shell, SIGCONT);
-  	fixtty ();
-  
-diff -arcN ../sj3-2.0.1.13.org/sj3/sjrc.c ./sj3/sjrc.c
-*** ../sj3-2.0.1.13.org/sj3/sjrc.c	Fri Dec  9 20:27:09 1994
---- ./sj3/sjrc.c	Tue Aug 13 00:53:22 1996
-***************
-*** 52,59 ****
-  extern char	home[];
-  extern char	term_name[];
-  extern int      current_locale;
-! #define DEFRKFILE "/usr/lib/sj3/sjrk"
-! #define DEFRCFILE "/usr/lib/sj3/sjrc"
-  
-  #define GUIDELEN	80
-  
---- 52,63 ----
-  extern char	home[];
-  extern char	term_name[];
-  extern int      current_locale;
-! /*
-!  * Change a default value.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! #define DEFRKFILE "/usr/local/lib/sj3/sjrk"
-! #define DEFRCFILE "/usr/local/lib/sj3/sjrc"
-  
-  #define GUIDELEN	80
-  
-***************
-*** 442,448 ****
-  struct wordent	word[];
-  {
-  	if (word[1].word_str[0] != '\0' && shellprog[0] == '\0') {
-! 		strcpy (shellprog, word[1].word_str);
-  		shell_flag++;
-  	}
-  }
---- 446,457 ----
-  struct wordent	word[];
-  {
-  	if (word[1].word_str[0] != '\0' && shellprog[0] == '\0') {
-! /*
-!  * Remove warning.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*		strcpy (shellprog, word[1].word_str); */
-! 		strcpy (shellprog, (char *)word[1].word_str);
-  		shell_flag++;
-  	}
-  }
-diff -arcN ../sj3-2.0.1.13.org/sj3dic/Imakefile ./sj3dic/Imakefile
-*** ../sj3-2.0.1.13.org/sj3dic/Imakefile	Fri Jun  3 17:03:33 1994
---- ./sj3dic/Imakefile	Mon Aug 12 12:20:15 1996
-***************
-*** 32,38 ****
-   * $SonyDate: 1994/06/03 08:03:32 $
-   */
-  
-! DEST	        = /usr/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
---- 32,43 ----
-   * $SonyDate: 1994/06/03 08:03:32 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-***************
-*** 41,47 ****
-  CODE_LIBS       = -ljcode
-  #endif
-  #else
-! INSTGROUP	= staff
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
---- 46,52 ----
-  CODE_LIBS       = -ljcode
-  #endif
-  #else
-! INSTGROUP	= bin
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
-***************
-*** 52,58 ****
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 755
-  
-  SRCS          = codecnv.c \
-                  dictdisp.c \
---- 57,63 ----
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS          = codecnv.c \
-                  dictdisp.c \
-diff -arcN ../sj3-2.0.1.13.org/sj3h/sj2.h ./sj3h/sj2.h
-*** ../sj3-2.0.1.13.org/sj3h/sj2.h	Fri Jun  3 17:03:51 1994
---- ./sj3h/sj2.h	Tue Aug 13 01:14:54 1996
-***************
-*** 95,103 ****
-  
-  
-  
-  #define TRUE	0
-  #define FALSE	-1
-! 
-  
-  
-  struct	wordent {
---- 95,115 ----
-  
-  
-  
-+ /*
-+  * Remove warning.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+  */
-+ #if defined(TRUE) && defined(FALSE)
-+ #if (TRUE != 0) || (TRUE != -1)
-+ #undef TRUE
-+ #undef FALSE
-  #define TRUE	0
-  #define FALSE	-1
-! #endif
-! #else
-! #define TRUE	0
-! #define FALSE	-1
-! #endif
-  
-  
-  struct	wordent {
-diff -arcN ../sj3-2.0.1.13.org/sj3lib/Imakefile ./sj3lib/Imakefile
-*** ../sj3-2.0.1.13.org/sj3lib/Imakefile	Fri Jun  3 17:03:54 1994
---- ./sj3lib/Imakefile	Mon Aug 12 12:22:02 1996
-***************
-*** 32,39 ****
-   * $SonyDate: 1994/06/03 08:03:53 $
-   */
-  
-! INSTALL_LIBDIR = /usr/lib
-! INSTALL_HDRDIR = /usr/include
-  #if SystemV4 || SystemV
-  DEFINES = -DTLI
-  #endif
---- 32,44 ----
-   * $SonyDate: 1994/06/03 08:03:53 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! INSTALL_LIBDIR = /usr/local/lib
-! INSTALL_HDRDIR = /usr/local/include
-  #if SystemV4 || SystemV
-  DEFINES = -DTLI
-  #endif
-diff -arcN ../sj3-2.0.1.13.org/sj3stat/Imakefile ./sj3stat/Imakefile
-*** ../sj3-2.0.1.13.org/sj3stat/Imakefile	Tue May 30 21:29:25 1995
---- ./sj3stat/Imakefile	Mon Aug 12 12:23:14 1996
-***************
-*** 32,44 ****
-   * $SonyDate: 1995/05/30 12:29:17 $
-   */
-  
-! DEST	        = /usr/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= staff
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
---- 32,49 ----
-   * $SonyDate: 1995/05/30 12:29:17 $
-   */
-  
-! /*
-!  * Change some make rules.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! 
-! DEST	        = /usr/local/bin
-  
-  INCLUDES        =  -I../include -I../sj3lib
-  #if SystemV4 || SystemV
-  INSTGROUP	= bin
-  #else
-! INSTGROUP	= bin
-  #endif
-  
-  SYS_LIBRARIES   = $(CODE_LIBS)
-***************
-*** 49,55 ****
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o root -g $(INSTGROUP) -m 755
-  
-  SRCS          = sj3stat.c
-  	
---- 54,60 ----
-  DEPLIBS         = $(SJLIB)
-  LOCAL_LIBRARIES = $(SJLIB)
-  
-! INSTFLAGS 	= -o bin -g $(INSTGROUP) -m 755
-  
-  SRCS          = sj3stat.c
-  	
-diff -arcN ../sj3-2.0.1.13.org/sj3stat/sj3stat.c ./sj3stat/sj3stat.c
-*** ../sj3-2.0.1.13.org/sj3stat/sj3stat.c	Tue May 30 21:29:25 1995
---- ./sj3stat/sj3stat.c	Mon Aug 12 23:39:19 1996
-***************
-*** 91,100 ****
-  	}
-  	fprintf (stdout, "%d users.\n", n);
-  
-! 	fprintf(stdout, "%-16s %-16s %-8s %s\n", 
-  		"(USER)", "(HOST)", "(FD)", "(CLIENT)");
-  	for (i = 0; i < n; i++) {
-! 		fprintf(stdout, "%-16s %-16s %-8d %s\n", who[i].username, 
-  			who[i].hostname, who[i].fd, who[i].progname);
-  	}
-  	(void) sj3_erase_connection(&clnt);
---- 91,107 ----
-  	}
-  	fprintf (stdout, "%d users.\n", n);
-  
-! /*
-!  * Change hostname entry's length.
-!  * Because it's so short.
-!  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-!  */
-! /*	fprintf(stdout, "%-16s %-16s %-8s %s\n", */
-! 	fprintf(stdout, "%-16s %-32s %-8s %s\n", 
-  		"(USER)", "(HOST)", "(FD)", "(CLIENT)");
-  	for (i = 0; i < n; i++) {
-! /*		fprintf(stdout, "%-16s %-16s %-8d %s\n", who[i].username, */
-! 		fprintf(stdout, "%-16s %-32s %-8d %s\n", who[i].username, 
-  			who[i].hostname, who[i].fd, who[i].progname);
-  	}
-  	(void) sj3_erase_connection(&clnt);
-diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
-*** ../sj3-2.0.1.13.old/include/Const.h	Tue Aug 13 03:13:39 1996
---- ./include/Const.h	Wed Aug 21 14:01:27 1996
-***************
-*** 87,93 ****
---- 87,101 ----
-  #define ProtoName               "tcp"
-  #define	PortNumber		"3000"
-  #else
-+ /*
-+  * Change the default Port number of sj3 for FreeBSD.
-+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+  */
-+ #ifdef __FreeBSD__
-+ #define	PortNumber		3086
-+ #else /* ! __FreeBSD__ */
-  #define	PortNumber		3000
-+ #endif /* ! __FreeBSD__ */
-  #endif
-  #define	SocketName		"/tmp/sj3sock"
-  #define	LockFile		"/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3/files/patch-ab b/japanese/sj3/files/patch-ab
new file mode 100644
index 000000000000..ea8aebc78ddd
--- /dev/null
+++ b/japanese/sj3/files/patch-ab
@@ -0,0 +1,21 @@
+diff -arcN ../sj3-2.0.1.13.old/include/Const.h ./include/Const.h
+*** ../sj3-2.0.1.13.old/include/Const.h	Tue Aug 13 03:13:39 1996
+--- ./include/Const.h	Wed Aug 21 14:01:27 1996
+***************
+*** 87,93 ****
+--- 87,101 ----
+  #define ProtoName               "tcp"
+  #define	PortNumber		"3000"
+  #else
++ /*
++  * Change the default Port number of sj3 for FreeBSD.
++  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
++  */
++ #ifdef __FreeBSD__
++ #define	PortNumber		3086
++ #else /* ! __FreeBSD__ */
+  #define	PortNumber		3000
++ #endif /* ! __FreeBSD__ */
+  #endif
+  #define	SocketName		"/tmp/sj3sock"
+  #define	LockFile		"/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3/files/patch-ac b/japanese/sj3/files/patch-ac
new file mode 100644
index 000000000000..148a043fdad8
--- /dev/null
+++ b/japanese/sj3/files/patch-ac
@@ -0,0 +1,11 @@
+--- dict/dict/Imakefile.~1~	Thu Jan 23 20:20:51 1997
++++ dict/dict/Imakefile	Tue Aug 18 10:51:14 1998
+@@ -48,7 +48,7 @@
+ 
+ XCOMM INSTFLAGS	= -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
+ 
+-all:		$(OBJS)
++all::		$(OBJS)
+ 
+ $(OBJS):	$(SRCS)
+ 		$(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/japanese/sj3/files/patch-ad b/japanese/sj3/files/patch-ad
new file mode 100644
index 000000000000..8c714daa84fe
--- /dev/null
+++ b/japanese/sj3/files/patch-ad
@@ -0,0 +1,11 @@
+--- sj3.tmpl.~1~	Thu Jan 23 20:20:58 1997
++++ sj3.tmpl	Tue Aug 18 11:07:42 1998
+@@ -48,7 +48,7 @@
+ #if defined(FreeBSDArchitecture)
+ 
+ CODE_LIBS	= -lxpg4
+-SJ3OWNER	= root
++SJ3OWNER	= bin
+ SJ3GROUP	= bin
+ 
+ #else
diff --git a/japanese/sj3/files/patch-ae b/japanese/sj3/files/patch-ae
new file mode 100644
index 000000000000..939c71115c9b
--- /dev/null
+++ b/japanese/sj3/files/patch-ae
@@ -0,0 +1,26 @@
+--- include/Paths.h.in.orig	Thu Jan 23 20:20:57 1997
++++ include/Paths.h.in	Tue Aug 18 11:29:00 1998
+@@ -33,7 +33,22 @@
+  * $SonyDate: 1997/01/23 11:20:55 $
+  */
+ 
+-#define ErrorOutFile            "/dev/console"
++/*
++ * Change ErrotOutFile variable.
++ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
++ * This error is "Cannot Open "/dev/console".". 
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
++ *
++ * Change ErrotOutFile variable.
++ * This default value is "/dev/null" in document.
++ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/11
++ */
++#if !defined(__FreeBSD__)
++#define	ErrorOutFile		"/dev/console"
++#else
++/* #define	ErrorOutFile		"/dev/stderr" */ 	/* for test */
++#define	ErrorOutFile		"/dev/null"
++#endif
+ 
+ #define SocketName              "/tmp/sj3sock"
+ #define LockFile                "/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3/files/patch-af b/japanese/sj3/files/patch-af
new file mode 100644
index 000000000000..13b49cf298b3
--- /dev/null
+++ b/japanese/sj3/files/patch-af
@@ -0,0 +1,11 @@
+--- doc/man/Imakefile.~1~	Thu Jan 23 20:20:52 1997
++++ doc/man/Imakefile	Tue Aug 18 12:15:20 1998
+@@ -40,7 +40,7 @@
+  */
+ 
+ #ifndef JapaneseManLocale
+-#define JapaneseManLocale	ja_JP.EUC
++#define JapaneseManLocale	ja
+ #endif
+ JMANLOCALE = JapaneseManLocale
+ 
diff --git a/japanese/sj3/pkg-descr b/japanese/sj3/pkg-descr
index 40d4753542ca..3daaeb2d9b61 100644
--- a/japanese/sj3/pkg-descr
+++ b/japanese/sj3/pkg-descr
@@ -1,4 +1,4 @@
-This is SJ3 2.0.1.13, a Japanese input method.
+This is SJ3 2.0.1.20, a Japanese input method.
 This system developed by Sony Corporation.
 SJ3 is composed of Kana-Kanji conversion server(sj3serv), 
 Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
diff --git a/japanese/sj3/pkg-plist b/japanese/sj3/pkg-plist
index 1cbeed197c87..1e3a58b681f7 100644
--- a/japanese/sj3/pkg-plist
+++ b/japanese/sj3/pkg-plist
@@ -3,6 +3,7 @@ bin/sj3dic
 bin/sj3mkdic
 bin/sj3serv
 bin/sj3stat
+include/sj3lib.h
 lib/libsj3lib.a
 lib/sj3/Nihongo.ps.Z
 lib/sj3/cvtkey.news
@@ -17,7 +18,7 @@ lib/sj3/sj3lib.ms
 lib/sj3/sj3serv.ms
 lib/sj3/sjrc
 lib/sj3/sjrk
-man/ja/man1/sj3.1.gz
-man/ja/man1/sj3dic.1.gz
-man/ja/man1/sj3mkdic.1.gz
-man/ja/man1/sj3serv.1.gz
+etc/rc.d/sj3.sh
+@dirrm lib/sj3/dict/user
+@dirrm lib/sj3/dict
+@dirrm lib/sj3