3 files changed, 11 insertions, 16 deletions

diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index e88db675835c..5115ef448cac 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	edict
 PORTVERSION=	19990714
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/ \
@@ -22,19 +23,19 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 DIST_SUBDIR=	edict
 
 DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
-		jddict.v02.gz j_places.gz ediclsd3.zip \
+		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
+		compverb.gz 4jword2.gz concrete.zip
 
 SRCFILES=	xjdic23.tgz
 
 DOCFILES=	edict_doc.txt edict_doc.html edicth.doc \
-		enamdict_doc.txt enamdict_doc.html jddict.doc \
+		enamdict_doc.txt enamdict_doc.html \
 		j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \
 		lawgldoc.new lingdic.txt geodic.doc aviation.txt \
-		findic.doc mktdic.doc compverb.doc 4jwords.doc \
+		findic.doc mktdic.doc compverb.doc 4jword2.doc \
 		concrete.doc
 
 #
@@ -136,7 +137,6 @@ do-install:
 	@${ECHO_CMD} dicfile enamdict >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile compdic >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile ediclsd3 >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile j_places >> ${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile lawgledt >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile geodic >> ${DATADIR}/.xjdicrc
@@ -145,7 +145,7 @@ do-install:
 	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile compverb >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile 4jwords >> ${DATADIR}/.xjdicrc
+	@${ECHO_CMD} dicfile 4jword2 >> ${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc
 	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/.xjdicrc
diff --git a/japanese/edict/distinfo b/japanese/edict/distinfo
index 386d4fba6d52..e1542df24031 100644
--- a/japanese/edict/distinfo
+++ b/japanese/edict/distinfo
@@ -4,7 +4,6 @@ MD5 (edict/edict.gz) = IGNORE
 MD5 (edict/edicth) = IGNORE
 MD5 (edict/enamdict.gz) = IGNORE
 MD5 (edict/compdic.gz) = IGNORE
-MD5 (edict/jddict.v02.gz) = IGNORE
 MD5 (edict/j_places.gz) = IGNORE
 MD5 (edict/ediclsd3.zip) = IGNORE
 MD5 (edict/kanjidic.gz) = IGNORE
@@ -17,14 +16,13 @@ MD5 (edict/aviation.zip) = IGNORE
 MD5 (edict/findic.zip) = IGNORE
 MD5 (edict/mktdic.zip) = IGNORE
 MD5 (edict/compverb.gz) = IGNORE
-MD5 (edict/4jwords.gz) = IGNORE
+MD5 (edict/4jword2.gz) = IGNORE
 MD5 (edict/concrete.zip) = IGNORE
 MD5 (edict/edict_doc.txt) = IGNORE
 MD5 (edict/edict_doc.html) = IGNORE
 MD5 (edict/edicth.doc) = IGNORE
 MD5 (edict/enamdict_doc.txt) = IGNORE
 MD5 (edict/enamdict_doc.html) = IGNORE
-MD5 (edict/jddict.doc) = IGNORE
 MD5 (edict/j_places.inf) = IGNORE
 MD5 (edict/kanjidic.doc) = IGNORE
 MD5 (edict/kanjd212.doc) = IGNORE
@@ -36,5 +34,5 @@ MD5 (edict/aviation.txt) = IGNORE
 MD5 (edict/findic.doc) = IGNORE
 MD5 (edict/mktdic.doc) = IGNORE
 MD5 (edict/compverb.doc) = IGNORE
-MD5 (edict/4jwords.doc) = IGNORE
+MD5 (edict/4jword2.doc) = IGNORE
 MD5 (edict/concrete.doc) = IGNORE
diff --git a/japanese/edict/pkg-plist b/japanese/edict/pkg-plist
index 9bd9d255884a..3e920b8a086d 100644
--- a/japanese/edict/pkg-plist
+++ b/japanese/edict/pkg-plist
@@ -4,8 +4,8 @@ bin/xjdic_sa
 bin/xjdic_cl
 bin/xjdserver
 bin/xjdxgen
-share/dict/edict/4jwords
-share/dict/edict/4jwords.xjdx
+share/dict/edict/4jword2
+share/dict/edict/4jword2.xjdx
 share/dict/edict/aviation
 share/dict/edict/aviation.xjdx
 share/dict/edict/compdic
@@ -28,8 +28,6 @@ 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
@@ -49,7 +47,7 @@ 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/4jword2.doc
 share/doc/xjdic/aviation.txt
 share/doc/xjdic/compverb.doc
 share/doc/xjdic/concrete.doc
@@ -62,7 +60,6 @@ share/doc/xjdic/enamdict_doc.txt
 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