4 files changed, 103 insertions, 96 deletions

diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index cf7388dc39cf..1c4f3447913f 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -6,44 +6,27 @@
 #
 
 PORTNAME=	edict-utf-8
-PORTVERSION=	20050310
-PORTREVISION=	1
+PORTVERSION=	20061125
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
-		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
-		ftp://ftp.nrc.ca/pub/packages/nihongo/ \
-		http://www.bcit-broadcast.com/monash/ \
-		ftp://ftp.mirrorservice.org/sites/ftp.cc.monash.edu.au/pub/nihongo/ \
-		ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
-		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/ \
-		ftp://ftp.funet.fi/pub/culture/japan/mirrors/monash/pub/nihongo/ \
-		ftp://ftp.uni-duisburg.de/Mirrors/ftp.monash.edu.au/pub/nihongo/
+MASTER_SITES=	http://redundancy.redundancy.org/mirror/${PORTNAME}/
 DISTFILES=	${DICTFILES}
-EXTRACT_ONLY=	# intentionally left blank
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	Japanese-English edict UTF-8 dictionaries
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-BROKEN=		Size mismatch
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
 USE_ICONV=	yes
 ICONV?=		iconv
 CONVERT_CMD=	${ICONV} -c -f EUC-JP -t UTF-8
-NO_BUILD=	yes
 
-DIST_SUBDIR=	edict
+DIST_SUBDIR=	edict-utf8
 
-DICTFILES=	edict.gz edicth compdic.gz \
-		jddict.v02.gz j_places.gz ediclsd3.zip \
-		kanjidic.gz kanjd212.gz lawgledt.zip \
-		lingdic.zip geodic.gz pandpdic.zip \
-		aviation.zip findic.zip mktdic.zip \
-		compverb.gz 4jwords.gz concrete.zip
-BROKENDICTFILES=	enamdict.gz
+DICTFILES=	edict.gz edicth compdic.gz jddict.v02.gz \
+		j_places.gz ediclsd3.zip kanjidic.gz kanjd212.gz \
+		lawgledt.zip lingdic.zip geodic.gz pandpdic.zip \
+		aviation.zip findic.zip mktdic.zip compverb.gz \
+		4jwords.gz concrete.zip enamdict.gz
 
 NODOCFILES=	edict_doc.txt edict_doc.html edicth.doc \
 		enamdict_doc.txt enamdict_doc.html jddict.doc \
@@ -62,46 +45,44 @@ NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
-do-install:
-	@if [ ! -d ${DATADIR} ] ; \
-	then \
-		${MKDIR} ${DATADIR} ; \
-	fi
+do-extract:
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
 	@for file in ${DICTFILES}; do \
-		echo $$file; \
+		${ECHO} "Extracting $$file"; \
 		case $$file in \
 		*.gz) \
 			instfile=`${BASENAME} $$file .gz` ; \
-			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file | ${CONVERT_CMD} \
-				> ${DATADIR}/$$instfile ; \
-			then \
-				${TRUE} ; \
-			else \
-				exit 1; \
-			fi \
+			${GZIP_CMD} -dc ${_DISTDIR}/$$file > ${WRKSRC}/$$instfile.euc-jp \
 			;; \
 		*.zip) \
 			instfile=`${BASENAME} $$file .zip` ; \
-			if ${UNZIP_CMD} -c ${_DISTDIR}/$$file -x ${NODOCFILES} 2>/dev/null \
-			| ${CONVERT_CMD} > ${DATADIR}/$$instfile ; \
-			then \
-				${TRUE} ; \
-			else \
-				exit 1; \
-			fi \
+			${UNZIP_CMD} -c ${_DISTDIR}/$$file -x ${NODOCFILES} 2>/dev/null \
+			> ${WRKSRC}/$$instfile.euc-jp \
 			;; \
 		*) \
-			instfile=`${BASENAME} $$file` ; \
-			${CONVERT_CMD} ${_DISTDIR}/$$file >${DATADIR}/$$instfile \
+			instfile=$$file ; \
+			${CP} ${_DISTDIR}/$$file ${WRKSRC}/$$file.euc-jp \
 			;; \
 		esac ; \
-		( \
-			cd ${DATADIR} ; \
-			${CHOWN} ${SHAREOWN}:${SHAREGRP} $$instfile ; \
-			${CHMOD} ${SHAREMODE} $$instfile  ; \
-		) ; \
+		${ECHO} $$instfile >> ${WRKSRC}/filelist; \
+	done
+
+do-build:
+	@for file in `cat ${WRKSRC}/filelist`; do \
+		${ECHO} "Converting $$file"; \
+		${CONVERT_CMD} ${WRKSRC}/$$file.euc-jp > ${WRKSRC}/$$file; \
+	done
+
+do-install:
+	@if [ ! -d ${DATADIR} ] ; \
+	then \
+		${MKDIR} ${DATADIR} ; \
+	fi
+	@for file in `cat ${WRKSRC}/filelist`; do \
+		${ECHO} "Installing $$file"; \
+		${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
+		${WRKSRC}/$$file ${DATADIR}/$$file; \
 	done
 
-post-install:
-	${CAT} ${PKGMESSAGE}
 .include <bsd.port.post.mk>
diff --git a/japanese/edict-utf-8/distinfo b/japanese/edict-utf-8/distinfo
index 604ca94ae302..c25745153eff 100644
--- a/japanese/edict-utf-8/distinfo
+++ b/japanese/edict-utf-8/distinfo
@@ -1,38 +1,57 @@
-MD5 (edict/edict.gz) = f5c447af4eaf1e073804f0d935d84435
-SIZE (edict/edict.gz) = 1995732
-MD5 (edict/edicth) = 522c9d10d8f1fa3e7ff0824c8f3a3eb7
-SIZE (edict/edicth) = 3965
-MD5 (edict/enamdict.gz) = 83b56fc76b3027f26bcacf695cf7d027
-SIZE (edict/enamdict.gz) = 3898517
-MD5 (edict/compdic.gz) = 5e44bfbf35f976c6053eaaf70d960447
-SIZE (edict/compdic.gz) = 225252
-MD5 (edict/jddict.v02.gz) = 54feca633fc2f1e29b673cb70f85b276
-SIZE (edict/jddict.v02.gz) = 201223
-MD5 (edict/j_places.gz) = a5241530ecfa6b415358cf0f472edfb1
-SIZE (edict/j_places.gz) = 964036
-MD5 (edict/ediclsd3.zip) = f5619e83d73f3aab768c3483ca9be346
-SIZE (edict/ediclsd3.zip) = 991369
-MD5 (edict/kanjidic.gz) = 19e69f226a1108ea3bd9a5657163465c
-SIZE (edict/kanjidic.gz) = 499608
-MD5 (edict/kanjd212.gz) = 04e9c0afb90c7f925a395c21354bd28d
-SIZE (edict/kanjd212.gz) = 198415
-MD5 (edict/lawgledt.zip) = 5d55da32d03bdaf9ad92ee3b096ff320
-SIZE (edict/lawgledt.zip) = 133100
-MD5 (edict/lingdic.zip) = 1de53397af823ace8e296d3d8883a558
-SIZE (edict/lingdic.zip) = 50837
-MD5 (edict/geodic.gz) = a0477c4f6fe10209e46ad433e85ea902
-SIZE (edict/geodic.gz) = 20982
-MD5 (edict/pandpdic.zip) = 22f73642e22aa90af9e0f5400100db5c
-SIZE (edict/pandpdic.zip) = 14800
-MD5 (edict/aviation.zip) = 5092ece80ff75a087a7f3beb2a45ef96
-SIZE (edict/aviation.zip) = 27432
-MD5 (edict/findic.zip) = 0e8aedecf217eb696801b0528b04a63e
-SIZE (edict/findic.zip) = 25093
-MD5 (edict/mktdic.zip) = e7719d9cd89b4dfe6efa57d43475d908
-SIZE (edict/mktdic.zip) = 18560
-MD5 (edict/compverb.gz) = ae795bec98d24738c4279a8bfad6498b
-SIZE (edict/compverb.gz) = 28727
-MD5 (edict/4jwords.gz) = b6d3fb814a9df2e26aa7462b71633d7b
-SIZE (edict/4jwords.gz) = 13608
-MD5 (edict/concrete.zip) = d70fec1ded1a93362940725abb10b8e5
-SIZE (edict/concrete.zip) = 37491
+MD5 (edict-utf8/edict.gz) = c06b75a964698aae51e1c8b1cd6f073b
+SHA256 (edict-utf8/edict.gz) = 24e10d9909048f95f32c50a2faf80a4a56e3e2c39e5208b68521eeb4179c6818
+SIZE (edict-utf8/edict.gz) = 2279247
+MD5 (edict-utf8/edicth) = 522c9d10d8f1fa3e7ff0824c8f3a3eb7
+SHA256 (edict-utf8/edicth) = b1e50500cdff7005bb1155e82ed920e2f8e6648fbda10bf05d23242840621b1d
+SIZE (edict-utf8/edicth) = 3965
+MD5 (edict-utf8/compdic.gz) = 5e44bfbf35f976c6053eaaf70d960447
+SHA256 (edict-utf8/compdic.gz) = 9c33ceb7ef3c8a0ff30e58b138aa8f116ba99b5d65a8282fe8d758810471f0f5
+SIZE (edict-utf8/compdic.gz) = 225252
+MD5 (edict-utf8/jddict.v02.gz) = 54feca633fc2f1e29b673cb70f85b276
+SHA256 (edict-utf8/jddict.v02.gz) = 064687764f97fc344fcdaf8370d5c1792b08b5e48ed0ce78b9e817d504690e66
+SIZE (edict-utf8/jddict.v02.gz) = 201223
+MD5 (edict-utf8/j_places.gz) = a5241530ecfa6b415358cf0f472edfb1
+SHA256 (edict-utf8/j_places.gz) = 6fab609585c71bbd41de5832fb726090722c1309e40dbcb0043145755f2107fd
+SIZE (edict-utf8/j_places.gz) = 964036
+MD5 (edict-utf8/ediclsd3.zip) = f5619e83d73f3aab768c3483ca9be346
+SHA256 (edict-utf8/ediclsd3.zip) = 1812c90b4e373631a936921a538bd0b0eaccf250e1200c9ff730d3f0848863cf
+SIZE (edict-utf8/ediclsd3.zip) = 991369
+MD5 (edict-utf8/kanjidic.gz) = 6187e40dfc306fbc498ac541ede71f2d
+SHA256 (edict-utf8/kanjidic.gz) = a414d8ad397796b7ca9c1d8d7dc3d2e237a16ca8118b4723b4625256d2261799
+SIZE (edict-utf8/kanjidic.gz) = 503426
+MD5 (edict-utf8/kanjd212.gz) = 08b2fa361340a92313cc3e272825420f
+SHA256 (edict-utf8/kanjd212.gz) = 39255f3c6272b78439d53a5ed3c9c29102b9cc92754e6058af24a0608e5f821c
+SIZE (edict-utf8/kanjd212.gz) = 198395
+MD5 (edict-utf8/lawgledt.zip) = 5d55da32d03bdaf9ad92ee3b096ff320
+SHA256 (edict-utf8/lawgledt.zip) = b70584156499980dcaca540284c2f8bb24dbb476a57e6d7f6a644260bd3cff6a
+SIZE (edict-utf8/lawgledt.zip) = 133100
+MD5 (edict-utf8/lingdic.zip) = 1de53397af823ace8e296d3d8883a558
+SHA256 (edict-utf8/lingdic.zip) = c6ebb6567df6b841d6120f2de866881bd102b489215a52398f39f26058cfba37
+SIZE (edict-utf8/lingdic.zip) = 50837
+MD5 (edict-utf8/geodic.gz) = a0477c4f6fe10209e46ad433e85ea902
+SHA256 (edict-utf8/geodic.gz) = 48cf59a75366c35b1628d13994da9b23e091c9b66619ea0031b4cb5dfc665829
+SIZE (edict-utf8/geodic.gz) = 20982
+MD5 (edict-utf8/pandpdic.zip) = 22f73642e22aa90af9e0f5400100db5c
+SHA256 (edict-utf8/pandpdic.zip) = 183d8e05fc53cfbc02d09dee2cd6cf509aa11572ebe35421a8606ba4acb23ef6
+SIZE (edict-utf8/pandpdic.zip) = 14800
+MD5 (edict-utf8/aviation.zip) = 5092ece80ff75a087a7f3beb2a45ef96
+SHA256 (edict-utf8/aviation.zip) = 99cc61fee51ae963d6eb52c34fa8f52f2d966de6348efe208bbae2fdced318e9
+SIZE (edict-utf8/aviation.zip) = 27432
+MD5 (edict-utf8/findic.zip) = 0e8aedecf217eb696801b0528b04a63e
+SHA256 (edict-utf8/findic.zip) = ccded1ac5894089fb65a13dda0e09bdf8e38b1f7b9712d10a6478bd61282715d
+SIZE (edict-utf8/findic.zip) = 25093
+MD5 (edict-utf8/mktdic.zip) = e7719d9cd89b4dfe6efa57d43475d908
+SHA256 (edict-utf8/mktdic.zip) = 0c36e4c73354b9c5c184d41c578401757be25471407459002f58687d1dbbc096
+SIZE (edict-utf8/mktdic.zip) = 18560
+MD5 (edict-utf8/compverb.gz) = ae795bec98d24738c4279a8bfad6498b
+SHA256 (edict-utf8/compverb.gz) = 5c9be9a2cda979e394b5ba02d6ea598463c630d9caacd5ff960c007761bfdd91
+SIZE (edict-utf8/compverb.gz) = 28727
+MD5 (edict-utf8/4jwords.gz) = b6d3fb814a9df2e26aa7462b71633d7b
+SHA256 (edict-utf8/4jwords.gz) = 8c6d079ec7f2bd7a18d32859a93ecf1fae287da3de81e00cbd85d59ad5a680f1
+SIZE (edict-utf8/4jwords.gz) = 13608
+MD5 (edict-utf8/concrete.zip) = d70fec1ded1a93362940725abb10b8e5
+SHA256 (edict-utf8/concrete.zip) = 9691d1d6219747d656f6f778b554ad89be879e131d151c7d1b8089632b74b2cb
+SIZE (edict-utf8/concrete.zip) = 37491
+MD5 (edict-utf8/enamdict.gz) = 13921dbf5377641de59b748e4f3a010f
+SHA256 (edict-utf8/enamdict.gz) = 945d7eec8d891b77c8d35905590547859db766f9ff707f18fa69b388f670b4e7
+SIZE (edict-utf8/enamdict.gz) = 7056231
diff --git a/japanese/edict-utf-8/files/patch-enamdict.euc-jp b/japanese/edict-utf-8/files/patch-enamdict.euc-jp
new file mode 100644
index 000000000000..61e89fbb95fe
--- /dev/null
+++ b/japanese/edict-utf-8/files/patch-enamdict.euc-jp
@@ -0,0 +1,10 @@
+--- enamdict.euc-jp.old	Sat Nov 25 17:42:21 2006
++++ enamdict.euc-jp	Sat Nov 25 17:48:11 2006
+@@ -108585,7 +108585,6 @@
+ 磯部公彦 [いそべきみひこ] /Isobe Kimihiko (h) (1958.1.14-)/
+ 磯部克 [いそべかつ] /Isobe Katsu (h)/
+ 磯部山谷 [いそべさんや] /Isobesanya (p)/
+-磯部周平 [いそべしゅうへい] /Isobe Shuuhei (h)/
+ 磯部修三 [いそべしゅうぞう] /Isobe Shuuzou (h) (1940.4.15-)/
+ 磯部新保 [いそべしんぼ] /Isobeshinbo (p)/
+ 磯部真妃 [いそべまき] /Isobe Maki (h)/
diff --git a/japanese/edict-utf-8/pkg-message b/japanese/edict-utf-8/pkg-message
deleted file mode 100644
index 1712eab13809..000000000000
--- a/japanese/edict-utf-8/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-Plesae note that the words in the dictionary `enamdict.gz' have
-been removed because iconv wasn't able to process them. If you have
-the skills, please see if you can find what is causing this.