4 files changed, 51 insertions, 68 deletions

diff --git a/japanese/wdic-fpw/Makefile b/japanese/wdic-fpw/Makefile
index 707583c74845..f9b8940dda73 100644
--- a/japanese/wdic-fpw/Makefile
+++ b/japanese/wdic-fpw/Makefile
@@ -5,40 +5,55 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wdic001-fpw
-PORTVERSION=	0.11
+PORTNAME=	wdic-fpw
+PORTVERSION=	${SCRPT_VERSION}
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/ \
 		http://www.wdic.org/file/ \
-		http://www.geocities.co.jp/SiliconValley-Bay/2872/
-DISTFILES=	${DICTFILES} wdc001fpw-${PORTVERSION}.tar.gz
-EXTRACT_ONLY=	wdc001fpw-${PORTVERSION}.tar.gz
+		http://openlab.ring.gr.jp/edict/fpw/dist/wdic/
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DICTFILES}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=    	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf \
-		fpwmake:${PORTSDIR}/japanese/freepwing \
+BUILD_DEPENDS=	${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
 		catdump:${PORTSDIR}/japanese/epwutil \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf
+		lha:${PORTSDIR}/archivers/lha \
+		nkf:${PORTSDIR}/japanese/nkf \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+#		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf
 
-WRKSRC=		${WRKDIR}/wdc001-fpw${PORTVERSION}
-DICTFILES=	wdc001a.lzh wdc001b.lzh wdc001c.lzh wdc001d.lzh wdc001e.lzh \
-		wdc001f.lzh
-ALL_TARGET=	#
+USE_GMAKE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
+DICT_VERSION=	002
+SCRPT_VERSION=	1.1b
+DICTFILES=	wdc${DICT_VERSION}.lzh wdc00p12.lzh
 
 post-extract:
-	cd ${WRKSRC}/data; \
+	${MKDIR} ${WRKSRC}/wdic${DICT_VERSION}
+	${CP} ${LOCALBASE}/share/doc/freepwing/fpwutils.mk ${WRKSRC}
+	cd ${WRKSRC}/wdic${DICT_VERSION}; \
 	for i in ${DICTFILES}; do \
 		lha xqf ${DISTDIR}/$$i; \
 	done
-# join several dictionaris
-	${CAT} ${FILESDIR}/MOE_RAIL.H ${WRKSRC}/data/MOE[12].DIC ${WRKSRC}/data/RAIL.DIC > ${WRKSRC}/data/MOE_RAIL.DIC
-	${RM} ${WRKSRC}/data/MOE[12].DIC  ${WRKSRC}/data/RAIL.DIC
-	${CAT} ${FILESDIR}/YOGOPASO.H ${WRKSRC}/data/YOGO.DIC ${WRKSRC}/data/PASO.DIC > ${WRKSRC}/data/YOGOPASO.DIC
-	${RM}  ${WRKSRC}/data/PASO.DIC ${WRKSRC}/data/YOGO.DIC
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.org
-	${SED} 's,/usr/local/share/eb/data/wdc001,${PREFIX}/share/dict/wdc001-fpw,' \
-		${WRKSRC}/Makefile.org > ${WRKSRC}/Makefile
+
+post-build:
+	cd ${WRKSRC}; nkf -eSd catalogs.sjis > catalogs.txt; \
+	catdump -u catalogs.txt catalogs
+
+do-install:
+	${MKDIR} ${PREFIX}/share/dict/wdic-fpw/wdic/data
+	${MKDIR} ${PREFIX}/share/dict/wdic-fpw/wdic/gaiji
+	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/wdic-fpw/wdic/data
+	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/wdic-fpw
+	${INSTALL_DATA} ${WRKSRC}/gai16h ${PREFIX}/share/dict/wdic-fpw/wdic/gaiji
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/wdic-fpw
+	${INSTALL_DATA} ${WRKSRC}/readme.1st ${PREFIX}/share/doc/wdic-fpw
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/wdic-fpw
+.endif
+
 
 .include <bsd.port.mk>
diff --git a/japanese/wdic-fpw/distinfo b/japanese/wdic-fpw/distinfo
index ec73a1b0f28c..f7fa3db3b04d 100644
--- a/japanese/wdic-fpw/distinfo
+++ b/japanese/wdic-fpw/distinfo
@@ -1,7 +1,3 @@
-MD5 (wdc001a.lzh) = 800d5a1efed47237b78ac75810953174
-MD5 (wdc001b.lzh) = c07eef9dd43d77c2f79df067cc1eefe9
-MD5 (wdc001c.lzh) = 10f11e494338136c31676ce780d6d64c
-MD5 (wdc001d.lzh) = d2a941058c5e56e3aea5a485c77c7509
-MD5 (wdc001e.lzh) = 29953c42c721d87e191bd67985be270c
-MD5 (wdc001f.lzh) = 9111b987cb1ece49cb44d1d8e49fcbe8
-MD5 (wdc001fpw-0.11.tar.gz) = fddab1827f1c9f68706c2239dc343202
+MD5 (wdic-fpw1.1b-src.tar.gz) = 17a92c775f12039263ae92e27a7eef6f
+MD5 (wdc002.lzh) = bc1e44a4343d890487fe5be508a8becf
+MD5 (wdc00p12.lzh) = 30a5fd862ed34f6e88633180c3c84ee2
diff --git a/japanese/wdic-fpw/pkg-descr b/japanese/wdic-fpw/pkg-descr
index d0a08723fa04..278eca1d6cab 100644
--- a/japanese/wdic-fpw/pkg-descr
+++ b/japanese/wdic-fpw/pkg-descr
@@ -8,4 +8,4 @@ o URL for WDIC:
      http://www.wdic.org/
 
 o URL for this converted dictionary:
-WWW: http://www.geocities.co.jp/SiliconValley-Bay/2872/
+WWW: http://openlab.ring.gr.jp/edict/fpw/
diff --git a/japanese/wdic-fpw/pkg-plist b/japanese/wdic-fpw/pkg-plist
index be91e10f7a98..7ece6e1cb96d 100644
--- a/japanese/wdic-fpw/pkg-plist
+++ b/japanese/wdic-fpw/pkg-plist
@@ -1,38 +1,10 @@
-share/dict/wdc001-fpw/catalogs
-share/dict/wdc001-fpw/comm/data/honmon
-share/dict/wdc001-fpw/dev/data/honmon
-share/dict/wdc001-fpw/elec/data/honmon
-share/dict/wdc001-fpw/info/data/honmon
-share/dict/wdc001-fpw/know/data/honmon
-share/dict/wdc001-fpw/moe_rail/data/honmon
-share/dict/wdc001-fpw/org/data/honmon
-share/dict/wdc001-fpw/soft/data/honmon
-share/dict/wdc001-fpw/std/data/honmon
-share/dict/wdc001-fpw/tech/data/honmon
-share/dict/wdc001-fpw/tran/data/honmon
-share/dict/wdc001-fpw/yogopaso/data/honmon
-@dirrm share/dict/wdc001-fpw/yogopaso/data
-@dirrm share/dict/wdc001-fpw/yogopaso
-@dirrm share/dict/wdc001-fpw/tran/data
-@dirrm share/dict/wdc001-fpw/tran
-@dirrm share/dict/wdc001-fpw/tech/data
-@dirrm share/dict/wdc001-fpw/tech
-@dirrm share/dict/wdc001-fpw/std/data
-@dirrm share/dict/wdc001-fpw/std
-@dirrm share/dict/wdc001-fpw/soft/data
-@dirrm share/dict/wdc001-fpw/soft
-@dirrm share/dict/wdc001-fpw/org/data
-@dirrm share/dict/wdc001-fpw/org
-@dirrm share/dict/wdc001-fpw/moe_rail/data
-@dirrm share/dict/wdc001-fpw/moe_rail
-@dirrm share/dict/wdc001-fpw/know/data
-@dirrm share/dict/wdc001-fpw/know
-@dirrm share/dict/wdc001-fpw/info/data
-@dirrm share/dict/wdc001-fpw/info
-@dirrm share/dict/wdc001-fpw/elec/data
-@dirrm share/dict/wdc001-fpw/elec
-@dirrm share/dict/wdc001-fpw/dev/data
-@dirrm share/dict/wdc001-fpw/dev
-@dirrm share/dict/wdc001-fpw/comm/data
-@dirrm share/dict/wdc001-fpw/comm
-@dirrm share/dict/wdc001-fpw
+share/dict/wdic-fpw/catalogs
+share/dict/wdic-fpw/wdic/data/honmon
+share/dict/wdic-fpw/wdic/gaiji/gai16h
+@dirrm share/dict/wdic-fpw/wdic/data
+@dirrm share/dict/wdic-fpw/wdic/gaiji
+@dirrm share/dict/wdic-fpw/wdic/
+@dirrm share/dict/wdic-fpw
+share/doc/wdic-fpw/readme.1st
+share/doc/wdic-fpw/readme.txt
+@dirrm share/doc/wdic-fpw