4 files changed, 70 insertions, 67 deletions

diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index 942f3cb25bf6..2538eb37c260 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -3,15 +3,15 @@
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
-# $Id: Makefile,v 1.3 1998/12/12 04:18:46 asami Exp $
+# $Id: Makefile,v 1.4 1999/02/22 03:15:56 steve Exp $
 #
 
-DISTNAME=	edict-19981007
-PKGNAME=	ja-edict-19981007
+DISTNAME=	edict-19990714
+PKGNAME=	ja-edict-19990714
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.cdrom.com/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/
+MASTER_SITES=	ftp://ftp.cdrom.com/pub/japanese/monash/ \
+		ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
+		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/
 EXTRACT_SUFX=
 DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
 
@@ -21,64 +21,27 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 DIST_SUBDIR=	edict
 
-DOCFILES=	edict.doc
-DOCFILES+=	edicth.doc
-DOCFILES+=	enamdict.doc
-DOCFILES+=	compdic.doc
-DOCFILES+=	jddict.doc
-DOCFILES+=	kanjidic.doc
-DOCFILES+=	lifscdic.doc
-DOCFILES+=	lawgldoc.new
-DOCFILES+=	geodic.doc
-DOCFILES+=	aviation.doc
-DOCFILES+=	findic.doc
-DOCFILES+=	mktdic.doc
-DOCFILES+=	compverb.doc
-DOCFILES+=	4jwords.doc
-
-DICTFILES=	edict.gz
-DICTFILES+=	edicth
-DICTFILES+=	enamdict.gz
-DICTFILES+=	compdic.gz
-DICTFILES+=	jddict.v02.gz
-DICTFILES+=	lifscdic.Z
-DICTFILES+=	kanjidic.gz
-DICTFILES+=	lawgledt.zip
-DICTFILES+=	geodic.gz
-DICTFILES+=	pandpdic.zip
-DICTFILES+=	aviation.zip
-DICTFILES+=	findic.zip
-DICTFILES+=	mktdic.zip
-DICTFILES+=	compverb.gz
-DICTFILES+=	4jwords.gz
+DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
+		jddict.v02.gz j_places.gz ediclsd3.zip \
+		kanjidic.gz kanjd212.gz lawgledt.zip \
+		lingdic.zip geodic.gz pandpdic.zip \
+		aviation.zip findic.zip mktdic.zip \
+		compverb.gz 4jwords.gz concrete.zip
 
 SRCFILES=	xjdic23.tgz
 
-DOCFILES=	edict.doc
-DOCFILES+=	edicth.doc
-DOCFILES+=	enamdict.doc
-DOCFILES+=	compdic.doc
-DOCFILES+=	jddict.doc
-DOCFILES+=	kanjidic.doc
-DOCFILES+=	lifscdic.doc
-DOCFILES+=	lawgldoc.new
-DOCFILES+=	geodic.doc
-DOCFILES+=	aviation.doc
-DOCFILES+=	findic.doc
-DOCFILES+=	mktdic.doc
-DOCFILES+=	compverb.doc
-DOCFILES+=	4jwords.doc
+DOCFILES=	edict.doc edicth.doc enamdict.doc jddict.doc \
+		j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \
+		lawgldoc.new lingdic.txt geodic.doc aviation.doc \
+		findic.doc mktdic.doc compverb.doc 4jwords.doc \
+		concrete.doc
 
 #
 # These change too often and are not made into executables.
 #
 IGNOREFILES=	$(DICTFILES) $(DOCFILES)
 
-BINFILES=	exjdxgen
-BINFILES+=	xjdic_cl
-BINFILES+=	xjdic_sa
-BINFILES+=	xjdserver
-BINFILES+=	xjdxgen
+BINFILES=	exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen
 
 # Where to install the data files
 DATADIR=	${PREFIX}/share/dict/edict
@@ -165,16 +128,19 @@ do-install:
 	@${ECHO} dicfile edict >> ${DATADIR}/.xjdicrc
 	@${ECHO} dicfile enamdict >> ${DATADIR}/.xjdicrc
 	@${ECHO} dicfile compdic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile lifscdic >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile ediclsd3 >> ${DATADIR}/.xjdicrc
 	# @${ECHO} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc
+	@${ECHO} dicfile j_places >> ${DATADIR}/.xjdicrc
 	# @${ECHO} dicfile lawgledt >> ${DATADIR}/.xjdicrc
 	@${ECHO} dicfile geodic >> ${DATADIR}/.xjdicrc
-	@${ECHO} dicfile pandpdic >> ${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
+	# @${ECHO} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
+	# @${ECHO} dicfile lingdic >> ${DATADIR}/.xjdicrc
 	@chown ${SHAREOWN}.${SHAREGRP} ${DATADIR}/.xjdicrc
 	@chmod ${SHAREMODE} ${DATADIR}/.xjdicrc
 	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
diff --git a/japanese/edict/distinfo b/japanese/edict/distinfo
index 10ca3b1bd94f..e3bd85fd455a 100644
--- a/japanese/edict/distinfo
+++ b/japanese/edict/distinfo
@@ -4,9 +4,12 @@ MD5 (edict/edicth) = IGNORE
 MD5 (edict/enamdict.gz) = IGNORE
 MD5 (edict/compdic.gz) = IGNORE
 MD5 (edict/jddict.v02.gz) = IGNORE
-MD5 (edict/lifscdic.Z) = IGNORE
+MD5 (edict/j_places.gz) = IGNORE
+MD5 (edict/ediclsd3.zip) = IGNORE
 MD5 (edict/kanjidic.gz) = IGNORE
+MD5 (edict/kanjd212.gz) = IGNORE
 MD5 (edict/lawgledt.zip) = IGNORE
+MD5 (edict/lingdic.zip) = IGNORE
 MD5 (edict/geodic.gz) = IGNORE
 MD5 (edict/pandpdic.zip) = IGNORE
 MD5 (edict/aviation.zip) = IGNORE
@@ -14,17 +17,22 @@ MD5 (edict/findic.zip) = IGNORE
 MD5 (edict/mktdic.zip) = IGNORE
 MD5 (edict/compverb.gz) = IGNORE
 MD5 (edict/4jwords.gz) = IGNORE
+MD5 (edict/concrete.zip) = IGNORE
 MD5 (edict/edict.doc) = IGNORE
 MD5 (edict/edicth.doc) = IGNORE
 MD5 (edict/enamdict.doc) = IGNORE
 MD5 (edict/compdic.doc) = IGNORE
 MD5 (edict/jddict.doc) = IGNORE
+MD5 (edict/j_places.inf) = IGNORE
 MD5 (edict/kanjidic.doc) = IGNORE
-MD5 (edict/lifscdic.doc) = IGNORE
+MD5 (edict/kanjd212.doc) = IGNORE
+MD5 (edict/ediclsd3.rme) = IGNORE
 MD5 (edict/lawgldoc.new) = IGNORE
+MD5 (edict/lingdic.txt) = IGNORE
 MD5 (edict/geodic.doc) = IGNORE
 MD5 (edict/aviation.doc) = IGNORE
 MD5 (edict/findic.doc) = IGNORE
 MD5 (edict/mktdic.doc) = IGNORE
 MD5 (edict/compverb.doc) = IGNORE
 MD5 (edict/4jwords.doc) = IGNORE
+MD5 (edict/concrete.doc) = IGNORE
diff --git a/japanese/edict/files/patch-aa b/japanese/edict/files/patch-aa
index 5bfcff7a9f9d..bf66c1d716d9 100644
--- a/japanese/edict/files/patch-aa
+++ b/japanese/edict/files/patch-aa
@@ -1,11 +1,20 @@
 --- Makefile.orig	Wed Sep 16 04:08:01 1998
-+++ Makefile	Wed Oct  7 11:26:15 1998
++++ Makefile	Sat Jul 17 21:33:01 1999
+@@ -54,7 +54,7 @@
+ #
+ #LIBS= -lsocket -lnsl
+ #
+-CC=gcc -g
++#CC=gcc -g
+ all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
+ client: xjdic_cl
+ server: xjdserver
 @@ -80,7 +80,7 @@
  #
  SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
  #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
 -SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
-+SACFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDDIC -DMMAP
++SACFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDDIC -DMMAP ${CFLAGS}
  #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DRAM_LOAD
  xjdic_sa: $(SAOBJECTS)
  	$(CC) $(SAOBJECTS) -o xjdic_sa
@@ -14,7 +23,16 @@
  #
  CLOBJECTS = xjdclient.o xjdcomm_cl.o xjdfrontend_cl.o
 -CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV
-+CLCFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDCLSERV
++CLCFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDCLSERV ${CFLAGS}
  xjdic_cl: $(CLOBJECTS)
  	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
  xjdclient.o: xjdclient.c
+@@ -112,7 +112,7 @@
+ #
+ SVOBJECTS = xjdcomm_sv.o xjdservcomm_sv.o xjdserver.o
+ #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DDEMAND_PAGING
+-SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP
++SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP ${CFLAGS}
+ #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DRAM_LOAD
+ xjdserver: $(SVOBJECTS)
+ 	$(CC) $(SVOBJECTS) $(LIBS) -o xjdserver
diff --git a/japanese/edict/pkg-plist b/japanese/edict/pkg-plist
index 83f08c53984b..3b9647b317e5 100644
--- a/japanese/edict/pkg-plist
+++ b/japanese/edict/pkg-plist
@@ -12,6 +12,10 @@ share/dict/edict/compdic
 share/dict/edict/compdic.xjdx
 share/dict/edict/compverb
 share/dict/edict/compverb.xjdx
+share/dict/edict/concrete
+share/dict/edict/concrete.xjdx
+share/dict/edict/ediclsd3
+share/dict/edict/ediclsd3.xjdx
 share/dict/edict/edict
 share/dict/edict/edict.xjdx
 share/dict/edict/edicth
@@ -22,38 +26,45 @@ share/dict/edict/findic
 share/dict/edict/findic.xjdx
 share/dict/edict/geodic
 share/dict/edict/geodic.xjdx
+share/dict/edict/j_places
+share/dict/edict/j_places.xjdx
 share/dict/edict/jddict.v02
 share/dict/edict/jddict.v02.xjdx
+share/dict/edict/kanjd212
+share/dict/edict/kanjd212.xjdx
 share/dict/edict/kanjidic
 share/dict/edict/kanjidic.xjdx
+share/dict/edict/kanjstroke
 share/dict/edict/lawgledt
 share/dict/edict/lawgledt.xjdx
-share/dict/edict/lifscdic
-share/dict/edict/lifscdic.xjdx
+share/dict/edict/lingdic
+share/dict/edict/lingdic.xjdx
 share/dict/edict/mktdic
 share/dict/edict/mktdic.xjdx
 share/dict/edict/pandpdic
 share/dict/edict/pandpdic.xjdx
 share/dict/edict/radicals.tm
 share/dict/edict/radkfile
-share/dict/edict/kanjstroke
 share/dict/edict/romkana.cnv
 share/dict/edict/vconj
 share/dict/edict/.xjdicrc
 @dirrm share/dict/edict
 share/doc/xjdic/4jwords.doc
 share/doc/xjdic/aviation.doc
-share/doc/xjdic/compdic.doc
 share/doc/xjdic/compverb.doc
+share/doc/xjdic/concrete.doc
+share/doc/xjdic/ediclsd3.rme
 share/doc/xjdic/edict.doc
 share/doc/xjdic/edicth.doc
 share/doc/xjdic/enamdict.doc
 share/doc/xjdic/findic.doc
 share/doc/xjdic/geodic.doc
+share/doc/xjdic/j_places.inf
 share/doc/xjdic/jddict.doc
+share/doc/xjdic/kanjd212.doc
 share/doc/xjdic/kanjidic.doc
 share/doc/xjdic/lawgldoc.new
-share/doc/xjdic/lifscdic.doc
+share/doc/xjdic/lingdic.txt
 share/doc/xjdic/mktdic.doc
 share/doc/xjdic/xjdic23.inf
 @dirrm share/doc/xjdic