5 files changed, 18 insertions, 16 deletions

diff --git a/japanese/edict-fpw/Makefile b/japanese/edict-fpw/Makefile
index 85abaf011cfd..4046e850c22b 100644
--- a/japanese/edict-fpw/Makefile
+++ b/japanese/edict-fpw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	edict-fpw
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/freepwing/fpwbooks/edict/ \
 		ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
@@ -16,20 +16,22 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/freepwing/fpwbooks/edict/ \
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		edict.gz \
-		edict.doc
+		edict_doc.txt
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=    	taoka@FreeBSD.org
 
 BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		catdump:${PORTSDIR}/japanese/epwutil
+		catdump:${PORTSDIR}/japanese/epwutil \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/source
 	${CP} -f ${DISTDIR}/edict.gz ${WRKSRC}/source
-	${CP} -f ${DISTDIR}/edict.doc ${WRKSRC}/source
+	${CP} -f ${DISTDIR}/edict_doc.txt ${WRKSRC}/source
 	${GZIP_CMD} -d ${WRKSRC}/source/edict.gz
 
 do-build:
@@ -42,8 +44,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/edict-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/edict-fpw
-	${INSTALL_DATA} ${WRKSRC}/source/edict.doc ${PREFIX}/share/doc/edict-fpw
-	${INSTALL_DATA} ${WRKSRC}/README.pkg ${PREFIX}/share/doc/edict-fpw
+	${INSTALL_DATA} ${WRKSRC}/source/edict_doc.txt ${PREFIX}/share/doc/edict-fpw
+	${INSTALL_DATA} ${WRKSRC}/README.PKG ${PREFIX}/share/doc/edict-fpw
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/edict-fpw/distinfo b/japanese/edict-fpw/distinfo
index 05093e5ba65a..8df87a97041c 100644
--- a/japanese/edict-fpw/distinfo
+++ b/japanese/edict-fpw/distinfo
@@ -1,3 +1,3 @@
-MD5 (edict-fpw1.1-src.tar.gz) = a5c71416967bce713c58e1362eca1ed3
-MD5 (edict.gz) = 4b27b7136dfb2b79f17305ba4b9be4b0
-MD5 (edict.doc) = 85619ddceced99326ca28ac458ec8e40
+MD5 (edict-fpw1.2.1-src.tar.gz) = 14f9ff3d93c581e0573ab75baa23a606
+MD5 (edict.gz) = 8736f3b216456b8228341fdfb80eb509
+MD5 (edict_doc.txt) = 995588917f41023527f314f3f7ae9160
diff --git a/japanese/edict-fpw/pkg-comment b/japanese/edict-fpw/pkg-comment
index 7dcc370c7b20..0c8eda6c8abc 100644
--- a/japanese/edict-fpw/pkg-comment
+++ b/japanese/edict-fpw/pkg-comment
@@ -1 +1 @@
-A Japanese - English Dictionary (EPWING V1 format)
+A Japanese <-> English Dictionary (EPWING V1 format)
diff --git a/japanese/edict-fpw/pkg-descr b/japanese/edict-fpw/pkg-descr
index 82a5ba6d4b91..c92714457935 100644
--- a/japanese/edict-fpw/pkg-descr
+++ b/japanese/edict-fpw/pkg-descr
@@ -1,8 +1,8 @@
 EDICT is a Japanese - English Dictionary by Mr. J.W. Breen.  This is a
-dictionary converted from the original one into JIS X 4081 format
-(that is a subset of EPWING V1) by FreePWING. So it can be used by
-EPWING viewer on Unix and the other OS (e.g. Windows or MacOS).  URL
-for this converted dictionary is
+Japanese-English and English-Japanese dictionary converted from the
+original one into JIS X 4081 format (that is a subset of EPWING V1) by
+FreePWING. So it can be used by EPWING viewer on Unix and the other OS
+(e.g. Windows or MacOS).  URL for this converted dictionary is
 
 WWW: http://www.sra.co.jp/people/m-kasahr/freepwing/books.html
 
diff --git a/japanese/edict-fpw/pkg-plist b/japanese/edict-fpw/pkg-plist
index 561f7b859b1f..dc2086e59fbd 100644
--- a/japanese/edict-fpw/pkg-plist
+++ b/japanese/edict-fpw/pkg-plist
@@ -1,7 +1,7 @@
 share/dict/edict-fpw/edict/data/honmon
 share/dict/edict-fpw/catalogs
-share/doc/edict-fpw/edict.doc
-share/doc/edict-fpw/README.pkg
+share/doc/edict-fpw/edict_doc.txt
+share/doc/edict-fpw/README.PKG
 @dirrm share/dict/edict-fpw/edict/data
 @dirrm share/dict/edict-fpw/edict
 @dirrm share/dict/edict-fpw