Update to version 19981007.

PR:		8192
Submitted by:	maintainer

12 files changed, 124 insertions, 114 deletions

diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index f8dc6bceae86..d7df54853452 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	edict
-# Version required:	19980409
+# Version required:	19981007
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/30 01:36:05 kuriyama Exp $
 #
 
-DISTNAME=	edict-19980409
-PKGNAME=	ja-edict-19980409
+DISTNAME=	edict-19981007
+PKGNAME=	ja-edict-19981007
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.cc.monash.edu.au/pub/nihongo/
-MASTER_SITES+=	ftp://enterprise.ic.gc.ca/pub/nihongo/
 MASTER_SITES+=	ftp://ftp.cdrom.com/pub/japanese/monash/
-MASTER_SITES+=	ftp://kuso.shef.ac.uk/pub/japanese/monash/
-MASTER_SITES+=	ftp://ftp.uwtc.washington.edu/pub/Japanese/Monash/
+MASTER_SITES+=	ftp://ftp.sedl.org/pub/mirrors/nihongo/
+MASTER_SITES+=	ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/
 EXTRACT_SUFX=
 DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
 
-MAINTAINER=	jhanna@rogers.wave.ca
+MAINTAINER=	jhanna@home.com
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
@@ -54,7 +53,7 @@ DICTFILES+=	mktdic.zip
 DICTFILES+=	compverb.gz
 DICTFILES+=	4jwords.gz
 
-SRCFILES=	xjdic22.tar.gz
+SRCFILES=	xjdic23.tgz
 
 DOCFILES=	edict.doc
 DOCFILES+=	edicth.doc
@@ -77,14 +76,15 @@ DOCFILES+=	4jwords.doc
 IGNOREFILES=	$(DICTFILES) $(DOCFILES)
 
 BINFILES=	exjdxgen
-BINFILES+=	xjdic22cl
-BINFILES+=	xjdic22sa
-BINFILES+=	xjdserver22
+BINFILES+=	xjdic_cl
+BINFILES+=	xjdic_sa
+BINFILES+=	xjdserver
 BINFILES+=	xjdxgen
 
 # Where to install the data files
 DATADIR=	${PREFIX}/share/dict/edict
 DOCDIR=		${PREFIX}/share/doc/xjdic
+MAN1=		xjdic.1
 
 NO_WRKSUBDIR=
 
@@ -155,7 +155,7 @@ do-install:
 		) ; \
 	done
 	${RM} -f ${PREFIX}/bin/xjdic
-	ln -s ${PREFIX}/bin/xjdic22sa ${PREFIX}/bin/xjdic
+	ln -s ${PREFIX}/bin/xjdic_sa ${PREFIX}/bin/xjdic
 	${INSTALL_DATA} ${WRKDIR}/radicals.tm ${DATADIR} ;
 	${INSTALL_DATA} ${WRKDIR}/radkfile ${DATADIR} ;
 	${INSTALL_DATA} ${WRKDIR}/kanjstroke ${DATADIR} ;
@@ -164,29 +164,33 @@ do-install:
 	#
 	# Only 9 dictionaries can be enabled
 	#
-	@${ECHO} dicfile ${DATADIR}/edict > ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/enamdict >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/compdic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/lifscdic >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/jddict.v02 >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/lawgledt >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/geodic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/pandpdic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/aviation >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/findic >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/mktdic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/compverb >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/4jwords >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile edict >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile enamdict >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile compdic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile lifscdic >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile lawgledt >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile geodic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile pandpdic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile aviation >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile findic >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile mktdic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile compverb >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile 4jwords >> ${DATADIR}/.xjdicrc
 	@chown ${SHAREOWN}.${SHAREGRP} ${DATADIR}/.xjdicrc
 	@chmod ${SHAREMODE} ${DATADIR}/.xjdicrc
+	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
 	@if [ ! -d ${DOCDIR} ] ; \
 	then \
 		${MKDIR} ${DOCDIR} ; \
 	fi
-	${INSTALL_MAN} ${WRKSRC}/xjdic22.doc ${DOCDIR}
+	${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCDIR}
 	@for docfile in ${DOCFILES} ; do \
-		${ECHO} Installing  ${DOCDIR}/$$docfile ; \
+		${ECHO} InstalLing  ${DOCDIR}/$$docfile ; \
 		${INSTALL_MAN}  ${_DISTDIR}/$$docfile ${DOCDIR} ; \
 	done
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/edict-utf-8/distinfo b/japanese/edict-utf-8/distinfo
index 6237f9e495e6..e0f5ceada6e0 100644
--- a/japanese/edict-utf-8/distinfo
+++ b/japanese/edict-utf-8/distinfo
@@ -1,4 +1,4 @@
-MD5 (edict/xjdic22.tar.gz) = 2aae116525cde38d4bb2b2cac6c20483
+MD5 (edict/xjdic23.tgz) = f1d6c030e3f1334fd6fe396ce0deb240
 MD5 (edict/edict.gz) = IGNORE
 MD5 (edict/edicth) = IGNORE
 MD5 (edict/enamdict.gz) = IGNORE
diff --git a/japanese/edict-utf-8/files/patch-aa b/japanese/edict-utf-8/files/patch-aa
index 4384444929b3..5bfcff7a9f9d 100644
--- a/japanese/edict-utf-8/files/patch-aa
+++ b/japanese/edict-utf-8/files/patch-aa
@@ -1,20 +1,20 @@
---- Makefile.orig	Sun Aug 17 22:45:50 1997
-+++ Makefile	Sun Aug 17 22:47:02 1997
-@@ -48,7 +48,7 @@
- #	S T A N D _ A L O N E 
+--- Makefile.orig	Wed Sep 16 04:08:01 1998
++++ Makefile	Wed Oct  7 11:26:15 1998
+@@ -80,7 +80,7 @@
  #
  SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
--SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
-+SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING -D__STRICT_BSD__
- xjdic22sa: $(SAOBJECTS)
- 	$(CC) $(SAOBJECTS) -o xjdic22sa
- xjdsa.o: xjdsa.c
-@@ -64,7 +64,7 @@
+ #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
+-SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
++SACFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDDIC -DMMAP
+ #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DRAM_LOAD
+ xjdic_sa: $(SAOBJECTS)
+ 	$(CC) $(SAOBJECTS) -o xjdic_sa
+@@ -97,7 +97,7 @@
  #	C L I E N T
  #
  CLOBJECTS = xjdclient.o xjdcomm_cl.o xjdfrontend_cl.o
 -CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV
-+CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV -D__STRICT_BSD__
- xjdic22cl: $(CLOBJECTS)
- 	$(CC) $(CLOBJECTS) -o xjdic22cl
++CLCFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDCLSERV
+ xjdic_cl: $(CLOBJECTS)
+ 	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
  xjdclient.o: xjdclient.c
diff --git a/japanese/edict-utf-8/files/patch-ab b/japanese/edict-utf-8/files/patch-ab
index d97c27772f5f..2dc40879b18d 100644
--- a/japanese/edict-utf-8/files/patch-ab
+++ b/japanese/edict-utf-8/files/patch-ab
@@ -1,10 +1,11 @@
---- xjdclient.c.orig	Sun Aug 17 22:48:25 1997
-+++ xjdclient.c	Sun Aug 17 22:48:39 1997
-@@ -33,7 +33,6 @@
- #include "xjdic.h"
- 
- extern int errno;
--extern char *sys_errlist[];
- unsigned char host[51] = {"localhost"};
- unsigned char yn[2];
- unsigned int portno = XJ_PORTNO;
+--- xjdic.h.orig	Thu Sep  3 02:05:28 1998
++++ xjdic.h	Wed Oct  7 11:55:52 1998
+@@ -3,7 +3,7 @@
+ #define NRKANA 250*2   /*  size of the romaji to kana tables*/
+ #define NOFILT 10      /* maximum number of general filters */
+ #define VMAX 350       /* maximum entries in the verb table */
+-#define DEFAULT_DICDIR ""    /* could be: "/usr/local/lib/xjdic"   */
++#define DEFAULT_DICDIR "/usr/local/share/dict/edict"    /* could be: "/usr/local/lib/xjdic"   */
+ #define NOHITS 1000       /* size of hittab  */
+ #define SPTAG '@'         /* character that flags priority entries */
+ #define KFBUFFSIZE 2000   /* size of the KFlush buffer */
diff --git a/japanese/edict-utf-8/pkg-descr b/japanese/edict-utf-8/pkg-descr
index 6ee8d269f295..b91311bb5a59 100644
--- a/japanese/edict-utf-8/pkg-descr
+++ b/japanese/edict-utf-8/pkg-descr
@@ -1,4 +1,4 @@
-XJDIC V2.2, XJDSERVER V2.2 -- (Copyright: J.W. Breen - 1996)
+XJDIC V2.3, XJDSERVER V2.3 -- (Copyright: J.W. Breen - 1998)
 
 XJDIC is an  electronic  Japanese-English  dictionary  program  designed  to 
 operate  in  the  X11 window environment.  In particular,  it must run in an 
diff --git a/japanese/edict-utf-8/pkg-plist b/japanese/edict-utf-8/pkg-plist
index 01ae653ef647..83f08c53984b 100644
--- a/japanese/edict-utf-8/pkg-plist
+++ b/japanese/edict-utf-8/pkg-plist
@@ -1,8 +1,8 @@
 bin/exjdxgen
 bin/xjdic
-bin/xjdic22sa
-bin/xjdic22cl
-bin/xjdserver22
+bin/xjdic_sa
+bin/xjdic_cl
+bin/xjdserver
 bin/xjdxgen
 share/dict/edict/4jwords
 share/dict/edict/4jwords.xjdx
@@ -55,5 +55,5 @@ share/doc/xjdic/kanjidic.doc
 share/doc/xjdic/lawgldoc.new
 share/doc/xjdic/lifscdic.doc
 share/doc/xjdic/mktdic.doc
-share/doc/xjdic/xjdic22.doc
+share/doc/xjdic/xjdic23.inf
 @dirrm share/doc/xjdic
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index f8dc6bceae86..d7df54853452 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	edict
-# Version required:	19980409
+# Version required:	19981007
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/30 01:36:05 kuriyama Exp $
 #
 
-DISTNAME=	edict-19980409
-PKGNAME=	ja-edict-19980409
+DISTNAME=	edict-19981007
+PKGNAME=	ja-edict-19981007
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.cc.monash.edu.au/pub/nihongo/
-MASTER_SITES+=	ftp://enterprise.ic.gc.ca/pub/nihongo/
 MASTER_SITES+=	ftp://ftp.cdrom.com/pub/japanese/monash/
-MASTER_SITES+=	ftp://kuso.shef.ac.uk/pub/japanese/monash/
-MASTER_SITES+=	ftp://ftp.uwtc.washington.edu/pub/Japanese/Monash/
+MASTER_SITES+=	ftp://ftp.sedl.org/pub/mirrors/nihongo/
+MASTER_SITES+=	ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/
 EXTRACT_SUFX=
 DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
 
-MAINTAINER=	jhanna@rogers.wave.ca
+MAINTAINER=	jhanna@home.com
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
@@ -54,7 +53,7 @@ DICTFILES+=	mktdic.zip
 DICTFILES+=	compverb.gz
 DICTFILES+=	4jwords.gz
 
-SRCFILES=	xjdic22.tar.gz
+SRCFILES=	xjdic23.tgz
 
 DOCFILES=	edict.doc
 DOCFILES+=	edicth.doc
@@ -77,14 +76,15 @@ DOCFILES+=	4jwords.doc
 IGNOREFILES=	$(DICTFILES) $(DOCFILES)
 
 BINFILES=	exjdxgen
-BINFILES+=	xjdic22cl
-BINFILES+=	xjdic22sa
-BINFILES+=	xjdserver22
+BINFILES+=	xjdic_cl
+BINFILES+=	xjdic_sa
+BINFILES+=	xjdserver
 BINFILES+=	xjdxgen
 
 # Where to install the data files
 DATADIR=	${PREFIX}/share/dict/edict
 DOCDIR=		${PREFIX}/share/doc/xjdic
+MAN1=		xjdic.1
 
 NO_WRKSUBDIR=
 
@@ -155,7 +155,7 @@ do-install:
 		) ; \
 	done
 	${RM} -f ${PREFIX}/bin/xjdic
-	ln -s ${PREFIX}/bin/xjdic22sa ${PREFIX}/bin/xjdic
+	ln -s ${PREFIX}/bin/xjdic_sa ${PREFIX}/bin/xjdic
 	${INSTALL_DATA} ${WRKDIR}/radicals.tm ${DATADIR} ;
 	${INSTALL_DATA} ${WRKDIR}/radkfile ${DATADIR} ;
 	${INSTALL_DATA} ${WRKDIR}/kanjstroke ${DATADIR} ;
@@ -164,29 +164,33 @@ do-install:
 	#
 	# Only 9 dictionaries can be enabled
 	#
-	@${ECHO} dicfile ${DATADIR}/edict > ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/enamdict >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/compdic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/lifscdic >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/jddict.v02 >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/lawgledt >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/geodic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/pandpdic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/aviation >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/findic >> ${DATADIR}/.xjdicrc
-	# @${ECHO} dicfile ${DATADIR}/mktdic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/compverb >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile ${DATADIR}/4jwords >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile edict >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile enamdict >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile compdic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile lifscdic >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile lawgledt >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile geodic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile pandpdic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile aviation >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile findic >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile mktdic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile compverb >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile 4jwords >> ${DATADIR}/.xjdicrc
 	@chown ${SHAREOWN}.${SHAREGRP} ${DATADIR}/.xjdicrc
 	@chmod ${SHAREMODE} ${DATADIR}/.xjdicrc
+	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
 	@if [ ! -d ${DOCDIR} ] ; \
 	then \
 		${MKDIR} ${DOCDIR} ; \
 	fi
-	${INSTALL_MAN} ${WRKSRC}/xjdic22.doc ${DOCDIR}
+	${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCDIR}
 	@for docfile in ${DOCFILES} ; do \
-		${ECHO} Installing  ${DOCDIR}/$$docfile ; \
+		${ECHO} InstalLing  ${DOCDIR}/$$docfile ; \
 		${INSTALL_MAN}  ${_DISTDIR}/$$docfile ${DOCDIR} ; \
 	done
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/edict/distinfo b/japanese/edict/distinfo
index 6237f9e495e6..e0f5ceada6e0 100644
--- a/japanese/edict/distinfo
+++ b/japanese/edict/distinfo
@@ -1,4 +1,4 @@
-MD5 (edict/xjdic22.tar.gz) = 2aae116525cde38d4bb2b2cac6c20483
+MD5 (edict/xjdic23.tgz) = f1d6c030e3f1334fd6fe396ce0deb240
 MD5 (edict/edict.gz) = IGNORE
 MD5 (edict/edicth) = IGNORE
 MD5 (edict/enamdict.gz) = IGNORE
diff --git a/japanese/edict/files/patch-aa b/japanese/edict/files/patch-aa
index 4384444929b3..5bfcff7a9f9d 100644
--- a/japanese/edict/files/patch-aa
+++ b/japanese/edict/files/patch-aa
@@ -1,20 +1,20 @@
---- Makefile.orig	Sun Aug 17 22:45:50 1997
-+++ Makefile	Sun Aug 17 22:47:02 1997
-@@ -48,7 +48,7 @@
- #	S T A N D _ A L O N E 
+--- Makefile.orig	Wed Sep 16 04:08:01 1998
++++ Makefile	Wed Oct  7 11:26:15 1998
+@@ -80,7 +80,7 @@
  #
  SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
--SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
-+SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING -D__STRICT_BSD__
- xjdic22sa: $(SAOBJECTS)
- 	$(CC) $(SAOBJECTS) -o xjdic22sa
- xjdsa.o: xjdsa.c
-@@ -64,7 +64,7 @@
+ #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
+-SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
++SACFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDDIC -DMMAP
+ #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DRAM_LOAD
+ xjdic_sa: $(SAOBJECTS)
+ 	$(CC) $(SAOBJECTS) -o xjdic_sa
+@@ -97,7 +97,7 @@
  #	C L I E N T
  #
  CLOBJECTS = xjdclient.o xjdcomm_cl.o xjdfrontend_cl.o
 -CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV
-+CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV -D__STRICT_BSD__
- xjdic22cl: $(CLOBJECTS)
- 	$(CC) $(CLOBJECTS) -o xjdic22cl
++CLCFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDCLSERV
+ xjdic_cl: $(CLOBJECTS)
+ 	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
  xjdclient.o: xjdclient.c
diff --git a/japanese/edict/files/patch-ab b/japanese/edict/files/patch-ab
index d97c27772f5f..2dc40879b18d 100644
--- a/japanese/edict/files/patch-ab
+++ b/japanese/edict/files/patch-ab
@@ -1,10 +1,11 @@
---- xjdclient.c.orig	Sun Aug 17 22:48:25 1997
-+++ xjdclient.c	Sun Aug 17 22:48:39 1997
-@@ -33,7 +33,6 @@
- #include "xjdic.h"
- 
- extern int errno;
--extern char *sys_errlist[];
- unsigned char host[51] = {"localhost"};
- unsigned char yn[2];
- unsigned int portno = XJ_PORTNO;
+--- xjdic.h.orig	Thu Sep  3 02:05:28 1998
++++ xjdic.h	Wed Oct  7 11:55:52 1998
+@@ -3,7 +3,7 @@
+ #define NRKANA 250*2   /*  size of the romaji to kana tables*/
+ #define NOFILT 10      /* maximum number of general filters */
+ #define VMAX 350       /* maximum entries in the verb table */
+-#define DEFAULT_DICDIR ""    /* could be: "/usr/local/lib/xjdic"   */
++#define DEFAULT_DICDIR "/usr/local/share/dict/edict"    /* could be: "/usr/local/lib/xjdic"   */
+ #define NOHITS 1000       /* size of hittab  */
+ #define SPTAG '@'         /* character that flags priority entries */
+ #define KFBUFFSIZE 2000   /* size of the KFlush buffer */
diff --git a/japanese/edict/pkg-descr b/japanese/edict/pkg-descr
index 6ee8d269f295..b91311bb5a59 100644
--- a/japanese/edict/pkg-descr
+++ b/japanese/edict/pkg-descr
@@ -1,4 +1,4 @@
-XJDIC V2.2, XJDSERVER V2.2 -- (Copyright: J.W. Breen - 1996)
+XJDIC V2.3, XJDSERVER V2.3 -- (Copyright: J.W. Breen - 1998)
 
 XJDIC is an  electronic  Japanese-English  dictionary  program  designed  to 
 operate  in  the  X11 window environment.  In particular,  it must run in an 
diff --git a/japanese/edict/pkg-plist b/japanese/edict/pkg-plist
index 01ae653ef647..83f08c53984b 100644
--- a/japanese/edict/pkg-plist
+++ b/japanese/edict/pkg-plist
@@ -1,8 +1,8 @@
 bin/exjdxgen
 bin/xjdic
-bin/xjdic22sa
-bin/xjdic22cl
-bin/xjdserver22
+bin/xjdic_sa
+bin/xjdic_cl
+bin/xjdserver
 bin/xjdxgen
 share/dict/edict/4jwords
 share/dict/edict/4jwords.xjdx
@@ -55,5 +55,5 @@ share/doc/xjdic/kanjidic.doc
 share/doc/xjdic/lawgldoc.new
 share/doc/xjdic/lifscdic.doc
 share/doc/xjdic/mktdic.doc
-share/doc/xjdic/xjdic22.doc
+share/doc/xjdic/xjdic23.inf
 @dirrm share/doc/xjdic