6 files changed, 20 insertions, 12 deletions

diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index deca37e5413f..33eff718e10c 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -29,7 +29,8 @@ DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
 
 SRCFILES=	xjdic23.tgz
 
-DOCFILES=	edict.doc edicth.doc enamdict.doc jddict.doc \
+DOCFILES=	edict_doc.txt edict_doc.html edicth.doc \
+		enamdict_doc.txt enamdict_doc.html 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 \
diff --git a/japanese/edict-utf-8/distinfo b/japanese/edict-utf-8/distinfo
index e3bd85fd455a..b0b128c8394d 100644
--- a/japanese/edict-utf-8/distinfo
+++ b/japanese/edict-utf-8/distinfo
@@ -18,10 +18,11 @@ 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/edict_doc.txt) = IGNORE
+MD5 (edict/edict_doc.html) = IGNORE
 MD5 (edict/edicth.doc) = IGNORE
-MD5 (edict/enamdict.doc) = IGNORE
-MD5 (edict/compdic.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
diff --git a/japanese/edict-utf-8/pkg-plist b/japanese/edict-utf-8/pkg-plist
index 3b9647b317e5..b564f5d99cec 100644
--- a/japanese/edict-utf-8/pkg-plist
+++ b/japanese/edict-utf-8/pkg-plist
@@ -54,9 +54,11 @@ share/doc/xjdic/aviation.doc
 share/doc/xjdic/compverb.doc
 share/doc/xjdic/concrete.doc
 share/doc/xjdic/ediclsd3.rme
-share/doc/xjdic/edict.doc
+share/doc/xjdic/edict_doc.html
+share/doc/xjdic/edict_doc.txt
 share/doc/xjdic/edicth.doc
-share/doc/xjdic/enamdict.doc
+share/doc/xjdic/enamdict_doc.html
+share/doc/xjdic/enamdict_doc.txt
 share/doc/xjdic/findic.doc
 share/doc/xjdic/geodic.doc
 share/doc/xjdic/j_places.inf
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index deca37e5413f..33eff718e10c 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -29,7 +29,8 @@ DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
 
 SRCFILES=	xjdic23.tgz
 
-DOCFILES=	edict.doc edicth.doc enamdict.doc jddict.doc \
+DOCFILES=	edict_doc.txt edict_doc.html edicth.doc \
+		enamdict_doc.txt enamdict_doc.html 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 \
diff --git a/japanese/edict/distinfo b/japanese/edict/distinfo
index e3bd85fd455a..b0b128c8394d 100644
--- a/japanese/edict/distinfo
+++ b/japanese/edict/distinfo
@@ -18,10 +18,11 @@ 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/edict_doc.txt) = IGNORE
+MD5 (edict/edict_doc.html) = IGNORE
 MD5 (edict/edicth.doc) = IGNORE
-MD5 (edict/enamdict.doc) = IGNORE
-MD5 (edict/compdic.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
diff --git a/japanese/edict/pkg-plist b/japanese/edict/pkg-plist
index 3b9647b317e5..b564f5d99cec 100644
--- a/japanese/edict/pkg-plist
+++ b/japanese/edict/pkg-plist
@@ -54,9 +54,11 @@ share/doc/xjdic/aviation.doc
 share/doc/xjdic/compverb.doc
 share/doc/xjdic/concrete.doc
 share/doc/xjdic/ediclsd3.rme
-share/doc/xjdic/edict.doc
+share/doc/xjdic/edict_doc.html
+share/doc/xjdic/edict_doc.txt
 share/doc/xjdic/edicth.doc
-share/doc/xjdic/enamdict.doc
+share/doc/xjdic/enamdict_doc.html
+share/doc/xjdic/enamdict_doc.txt
 share/doc/xjdic/findic.doc
 share/doc/xjdic/geodic.doc
 share/doc/xjdic/j_places.inf