2 files changed, 13 insertions, 50 deletions

diff --git a/japanese/wdic-fpw/Makefile b/japanese/wdic-fpw/Makefile
index d5e03d818260..79f0b387f0e1 100644
--- a/japanese/wdic-fpw/Makefile
+++ b/japanese/wdic-fpw/Makefile
@@ -6,64 +6,29 @@
 #
 
 PORTNAME=	wdic-fpw
-PORTVERSION=	${SCRPT_VERSION}
+PORTVERSION=	1.1b
 CATEGORIES=	japanese
-MASTER_SITES=	http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/ \
-		http://www.wdic.org/file/ \
-		http://openlab.ring.gr.jp/edict/fpw/dist/wdic/
-DISTNAME=	${PORTNAME}${PORTVERSION}-src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DICTFILES}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/wdic/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
-		catdump:${PORTSDIR}/japanese/epwutil \
-		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
-
-USE_GMAKE=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
-DICT_VERSION=	002
-SCRPT_VERSION=	1.1b
-DICTFILES=	wdc${DICT_VERSION}.lzh wdc00p12.lzh
-
-post-extract:
-	${MKDIR} ${WRKSRC}/wdic${DICT_VERSION}
-	${CP} ${LOCALBASE}/share/doc/freepwing/fpwutils.mk ${WRKSRC}
-	cd ${WRKSRC}/wdic${DICT_VERSION}; \
-	for i in ${DICTFILES}; do \
-		echo $$i; \
-		lha xf ${DISTDIR}/$$i; \
-	done
-# In using lha-1.14f, characters of each filenames can be used uppercases, but
-# in lha-1.14g, all are only used lowercases. ??
-.for i in WDIC.MAN TECH.DIC TEL.DIC RAIL.DIC ORG.DIC STD.DIC \
- COMM.DIC INFO.DIC MISC.DIC MOE1.DIC RCMP.DIC MOE2.DIC PASO.DIC \
- TRAN.DIC ELEC.DIC GAME.DIC SOFT.DIC YOGO.DIC KNOW.DIC DEV.DIC
-	t=`${ECHO} $i | ${SED} "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"`; \
-	if [ ! -f ${WRKSRC}/wdic${DICT_VERSION}/$i ]; then \
-	  ${MV} ${WRKSRC}/wdic${DICT_VERSION}/$$t ${WRKSRC}/wdic${DICT_VERSION}/$i; \
-	fi
-.endfor
-
-post-build:
-	cd ${WRKSRC}; nkf -eSd catalogs.sjis > catalogs.txt; \
-	catdump -u catalogs.txt catalogs
+USE_ZIP=	yes
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/wdic
+EXTRACT_BEFORE_ARGS=	-qL
 
 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}/wdic/data/honmon ${PREFIX}/share/dict/wdic-fpw/wdic/data
+	${INSTALL_DATA} ${WRKSRC}/wdic/gaiji/gai16h ${PREFIX}/share/dict/wdic-fpw/wdic/gaiji
 	${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
+.for i in readme.1st readme.txt
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/wdic-fpw
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/wdic-fpw/distinfo b/japanese/wdic-fpw/distinfo
index f7fa3db3b04d..8787b9bb79af 100644
--- a/japanese/wdic-fpw/distinfo
+++ b/japanese/wdic-fpw/distinfo
@@ -1,3 +1 @@
-MD5 (wdic-fpw1.1b-src.tar.gz) = 17a92c775f12039263ae92e27a7eef6f
-MD5 (wdc002.lzh) = bc1e44a4343d890487fe5be508a8becf
-MD5 (wdc00p12.lzh) = 30a5fd862ed34f6e88633180c3c84ee2
+MD5 (wdic-fpw1.1b.zip) = c0bc741e44e383da6805ceaa06292fa3