10 files changed, 37 insertions, 109 deletions

diff --git a/japanese/edict-fpw/Makefile b/japanese/edict-fpw/Makefile
index 73aa74b9734b..5487bfc6a8e8 100644
--- a/japanese/edict-fpw/Makefile
+++ b/japanese/edict-fpw/Makefile
@@ -8,43 +8,25 @@
 PORTNAME=	edict-fpw
 PORTVERSION=	1.2.1
 CATEGORIES=	japanese
-MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/edict/ \
-		ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
-		ftp://ftp.cdrom.com/pub/japanese/monash/ \
-		ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
-		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/
-DISTNAME=	${PORTNAME}${PORTVERSION}-src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		edict.gz \
-		edict_doc.txt
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/edict/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		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.txt ${WRKSRC}/source
-	${GZIP_CMD} -d ${WRKSRC}/source/edict.gz
-
-do-build:
-		cd ${WRKSRC}; fpwmake > /dev/null; \
-		fpwmake catalogs
+USE_ZIP=	yes
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/edict
+EXTRACT_BEFORE_ARGS=	-qL
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/edict-fpw/edict/data
-	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/edict-fpw/edict/data
+	${INSTALL_DATA} ${WRKSRC}/edict/data/honmon ${PREFIX}/share/dict/edict-fpw/edict/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/edict-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${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
+.for i in readme.pkg edict.txt
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/edict-fpw
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/edict-fpw/distinfo b/japanese/edict-fpw/distinfo
index 3ef3a9dfd6f7..6aa85f376dab 100644
--- a/japanese/edict-fpw/distinfo
+++ b/japanese/edict-fpw/distinfo
@@ -1,3 +1 @@
-MD5 (edict-fpw1.2.1-src.tar.gz) = 14f9ff3d93c581e0573ab75baa23a606
-MD5 (edict.gz) = 74a63377992a6b71b30b7eb711a88b8b
-MD5 (edict_doc.txt) = 995588917f41023527f314f3f7ae9160
+MD5 (edict-fpw1.2.1.zip) = f9958bcb087847de9c1cbe3ff620c796
diff --git a/japanese/edict-fpw/pkg-plist b/japanese/edict-fpw/pkg-plist
index dc2086e59fbd..517d7bd5f4da 100644
--- a/japanese/edict-fpw/pkg-plist
+++ b/japanese/edict-fpw/pkg-plist
@@ -1,8 +1,8 @@
-share/dict/edict-fpw/edict/data/honmon
 share/dict/edict-fpw/catalogs
-share/doc/edict-fpw/edict_doc.txt
-share/doc/edict-fpw/README.PKG
+share/dict/edict-fpw/edict/data/honmon
 @dirrm share/dict/edict-fpw/edict/data
 @dirrm share/dict/edict-fpw/edict
 @dirrm share/dict/edict-fpw
+share/doc/edict-fpw/edict.txt
+share/doc/edict-fpw/readme.pkg
 @dirrm share/doc/edict-fpw
diff --git a/japanese/web1913-fpw/Makefile b/japanese/web1913-fpw/Makefile
index adc701889e09..ce0a1c38b5e4 100644
--- a/japanese/web1913-fpw/Makefile
+++ b/japanese/web1913-fpw/Makefile
@@ -6,48 +6,26 @@
 #
 
 PORTNAME=	web1913-fpw
-PORTVERSION=	${WEB_VER}.${WEBFPW_VER}
+PORTVERSION=	${WEBFPW_VER}
 CATEGORIES=	japanese
-MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/web1913/ \
-		ftp://ftp.dict.org/pub/dict/pre/
-DISTNAME=	web1913-fpw${WEBFPW_VER}-src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		dict-web1913-${WEB_VER}-pre.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/web1913/
+DISTNAME=	${PORTNAME}${WEBFPW_VER}
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		catdump:${PORTSDIR}/japanese/epwutil
-
-WRKSRC=		${WRKDIR}/web1913-fpw${WEBFPW_VER}
+USE_ZIP=	yes
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/web
+EXTRACT_BEFORE_ARGS=	-qL
 WEBFPW_VER=	1.1.1
-WEB_VER=	1.4
-
-post-extract:
-	cd ${WRKSRC}; \
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${_DISTDIR}/dict-web1913-${WEB_VER}-pre.tar.gz \
-		${EXTRACT_AFTER_ARGS}; \
-	${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} web1913.dict.dz > web1913.dict
-
-post-patch:
-	cd ${WRKSRC}; \
-	${PATCH} ${PATCH_ARGS} < web1913.patch
-
-do-build:
-		cd ${WRKSRC}; \
-		fpwmake ;\
-		fpwmake catalogs
-#		fpwmake > /dev/null; \
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/web-fpw/web/data
-	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/web-fpw/web/data
+	${INSTALL_DATA} ${WRKSRC}/web/data/honmon ${PREFIX}/share/dict/web-fpw/web/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/web-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/web-fpw
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/web-fpw
+	${INSTALL_DATA} ${WRKSRC}/readme ${PREFIX}/share/doc/web-fpw
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/web1913-fpw/distinfo b/japanese/web1913-fpw/distinfo
index 56dcdef0a746..d640e0496354 100644
--- a/japanese/web1913-fpw/distinfo
+++ b/japanese/web1913-fpw/distinfo
@@ -1,2 +1 @@
-MD5 (web1913-fpw1.1.1-src.tar.gz) = 962484ca6c226890c38b15d03b8588c6
-MD5 (dict-web1913-1.4-pre.tar.gz) = 63a8d25ace68dff135185a8c96dd5f3c
+MD5 (web1913-fpw1.1.1.zip) = f5fa2e2af89cfe9dc7e227e6fc19b10b
diff --git a/japanese/web1913-fpw/pkg-plist b/japanese/web1913-fpw/pkg-plist
index 0575b359032f..667beb8bc936 100644
--- a/japanese/web1913-fpw/pkg-plist
+++ b/japanese/web1913-fpw/pkg-plist
@@ -1,7 +1,7 @@
-share/dict/web-fpw/web/data/honmon
 share/dict/web-fpw/catalogs
-share/doc/web-fpw/README
+share/dict/web-fpw/web/data/honmon
 @dirrm share/dict/web-fpw/web/data
 @dirrm share/dict/web-fpw/web
 @dirrm share/dict/web-fpw
+share/doc/web-fpw/readme
 @dirrm share/doc/web-fpw
diff --git a/japanese/wordnet-fpw/Makefile b/japanese/wordnet-fpw/Makefile
index 8c18d3268315..029573904c23 100644
--- a/japanese/wordnet-fpw/Makefile
+++ b/japanese/wordnet-fpw/Makefile
@@ -8,43 +8,26 @@
 PORTNAME=	wordnet-fpw
 PORTVERSION=	${WN_VER}.${WNFPW_VER}
 CATEGORIES=	japanese
-MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/wordnet/ \
-		ftp://ftp.dict.org/pub/dict/pre/
-DISTNAME=	wordnet-${WN_VER}-fpw${WNFPW_VER}-src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		dict-wn-${WN_ORG_VER}-pre.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/wordnet/
+DISTNAME=	wordnet-${WN_VER}-fpw${WNFPW_VER}
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		catdump:${PORTSDIR}/japanese/epwutil \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
-
-WRKSRC=		${WRKDIR}/wordnet-${WN_VER}-fpw${WNFPW_VER}
+USE_ZIP=	yes
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/wordnet
+EXTRACT_BEFORE_ARGS=	-qL
 WNFPW_VER=	1.1.2
 WN_VER=		1.6
-WN_ORG_VER=	1.5
-
-post-extract:
-	cd ${WRKSRC}; \
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${_DISTDIR}/dict-wn-${WN_ORG_VER}-pre.tar.gz \
-		${EXTRACT_AFTER_ARGS}; \
-	${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} wn.dict.dz > wn.dict
 
-do-build:
-		cd ${WRKSRC}; \
-		fpwmake > /dev/null; \
-		fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/wordnet-fpw/wordnet/data
-	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/wordnet-fpw/wordnet/data
+	${INSTALL_DATA} ${WRKSRC}/wordnet/data/honmon ${PREFIX}/share/dict/wordnet-fpw/wordnet/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/wordnet-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/wordnet-fpw
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wordnet-fpw
+	${INSTALL_DATA} ${WRKSRC}/readme ${PREFIX}/share/doc/wordnet-fpw
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/wordnet-fpw/distinfo b/japanese/wordnet-fpw/distinfo
index 1dc5d82e630b..d899ace1a741 100644
--- a/japanese/wordnet-fpw/distinfo
+++ b/japanese/wordnet-fpw/distinfo
@@ -1,2 +1 @@
-MD5 (wordnet-1.6-fpw1.1.2-src.tar.gz) = 3620a7e449efb5a3bba51b87810b757e
-MD5 (dict-wn-1.5-pre.tar.gz) = 1f6ae6284018044dbd9e3c5fae914f32
+MD5 (wordnet-1.6-fpw1.1.2.zip) = de4bb3805f9073d2dddd937146929827
diff --git a/japanese/wordnet-fpw/files/patch-aa b/japanese/wordnet-fpw/files/patch-aa
deleted file mode 100644
index 9ff88a4bd9ef..000000000000
--- a/japanese/wordnet-fpw/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.~1~	Sat Feb 26 10:20:56 2000
-+++ Makefile	Mon Jun 19 13:10:21 2000
-@@ -14,7 +14,7 @@
- PACKAGE = wordnet-1.6-fpw1.1.2
- PACKAGEEXTRA = README.pkg=README
- ARCHIVEEXTRA = README.pkg
--DIR = wordnet
-+DIR = wordnet-fpw
- 
- SRCDIR = .
- FPWPARSER = fpwwordnet
diff --git a/japanese/wordnet-fpw/pkg-plist b/japanese/wordnet-fpw/pkg-plist
index 8687b87b4ef0..9fc67a3303ee 100644
--- a/japanese/wordnet-fpw/pkg-plist
+++ b/japanese/wordnet-fpw/pkg-plist
@@ -1,7 +1,7 @@
-share/dict/wordnet-fpw/wordnet/data/honmon
 share/dict/wordnet-fpw/catalogs
-share/doc/wordnet-fpw/README
+share/dict/wordnet-fpw/wordnet/data/honmon
 @dirrm share/dict/wordnet-fpw/wordnet/data
 @dirrm share/dict/wordnet-fpw/wordnet
 @dirrm share/dict/wordnet-fpw
+share/doc/wordnet-fpw/readme
 @dirrm share/doc/wordnet-fpw