UTF-8-version of japanese/edict dictionary files

PR:		ports/69745
Submitted by:	Michael Johnson

6 files changed, 62 insertions, 278 deletions

diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index e88db675835..d5e2ef7d330 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -5,20 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	edict
+PORTNAME=	edict-utf-8
 PORTVERSION=	19990714
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/ \
 		ftp://ftp.cc.monash.edu.au/pub/nihongo/
-EXTRACT_SUFX=
-DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
+DISTFILES=	${DICTFILES}
+EXTRACT_ONLY=	# intentionally left blank
 
-MAINTAINER=	jhanna@shaw.ca
-COMMENT=	Japanese-English dictionaries with access and maintenance utilities
+MAINTAINER=	ahze@ahze.net
+COMMENT=	Japanese-English edict UTF-8 dictionaries
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
+USE_ICONV=	yes
+ICONV?=		iconv
+CONVERT_CMD=	${ICONV} -c -f EUC-JP -t UTF-8
+NO_BUILD=	yes
+
 DIST_SUBDIR=	edict
 
 DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
@@ -28,52 +33,24 @@ DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
 		aviation.zip findic.zip mktdic.zip \
 		compverb.gz 4jwords.gz concrete.zip
 
-SRCFILES=	xjdic23.tgz
-
-DOCFILES=	edict_doc.txt edict_doc.html edicth.doc \
+NODOCFILES=	edict_doc.txt edict_doc.html edicth.doc \
 		enamdict_doc.txt enamdict_doc.html jddict.doc \
 		j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \
 		lawgldoc.new lingdic.txt geodic.doc aviation.txt \
 		findic.doc mktdic.doc compverb.doc 4jwords.doc \
-		concrete.doc
-
-#
-# These change too often and are not made into executables.
-#
-IGNOREFILES=	$(DICTFILES) $(DOCFILES)
+		concrete.doc ${DICTFILES:S/zip/jdx/}
 
-BINFILES=	exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen
+PLIST_FILES=	${DICTFILES:S|^|%%DATADIR%%/|:S|.gz||:S|.zip||}
+PLIST_DIRS=	%%DATADIR%%
 
 # Where to install the data files
-DATADIR=	${PREFIX}/share/dict/edict
-DOCDIR=		${PREFIX}/share/doc/xjdic
-MAN1=		xjdic.1
+DATADIR=	${PREFIX}/share/dict/edict-utf-8
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not build"
-.endif
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@for file in ${SRCFILES}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
-		then \
-			exit 1; \
-		fi \
-	done
-
 do-install:
-	@for file in ${BINFILES}; do \
-		if ! ${INSTALL_PROGRAM} ${WRKDIR}/$$file ${PREFIX}/bin ;\
-		then \
-			exit 1; \
-		fi \
-	done
 	@if [ ! -d ${DATADIR} ] ; \
 	then \
 		${MKDIR} ${DATADIR} ; \
@@ -82,16 +59,8 @@ do-install:
 		case $$file in \
 		*.gz) \
 			instfile=`${BASENAME} $$file .gz` ; \
-			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
-			then \
-				${TRUE} ; \
-			else \
-				exit 1; \
-			fi \
-			;; \
-		*.Z) \
-			instfile=`${BASENAME} $$file .Z` ; \
-			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
+			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file | ${CONVERT_CMD} \
+				> ${DATADIR}/$$instfile ; \
 			then \
 				${TRUE} ; \
 			else \
@@ -100,7 +69,8 @@ do-install:
 			;; \
 		*.zip) \
 			instfile=`${BASENAME} $$file .zip` ; \
-			if unzip -o ${_DISTDIR}/$$file $$instfile -d ${DATADIR} ; \
+			if ${UNZIP_CMD} -c ${_DISTDIR}/$$file -x ${NODOCFILES} 2>/dev/null \
+			| ${CONVERT_CMD} > ${DATADIR}/$$instfile ; \
 			then \
 				${TRUE} ; \
 			else \
@@ -109,58 +79,14 @@ do-install:
 			;; \
 		*) \
 			instfile=`${BASENAME} $$file` ; \
-			${CP} ${_DISTDIR}/$$file ${DATADIR} ; \
+			${CONVERT_CMD} ${_DISTDIR}/$$file >${DATADIR}/$$instfile \
 			;; \
 		esac ; \
 		( \
-			${ECHO} cd ${DATADIR} ; \
 			cd ${DATADIR} ; \
-			${ECHO} ${PREFIX}/bin/xjdxgen $$instfile ; \
-			${PREFIX}/bin/xjdxgen $$instfile ; \
-			${CHOWN} ${SHAREOWN}:${SHAREGRP} $$instfile $$instfile.xjdx; \
-			${CHMOD} ${SHAREMODE} $$instfile $$instfile.xjdx ; \
+			${CHOWN} ${SHAREOWN}:${SHAREGRP} $$instfile ; \
+			${CHMOD} ${SHAREMODE} $$instfile  ; \
 		) ; \
 	done
-	${RM} -f ${PREFIX}/bin/xjdic
-	${LN} -s ${PREFIX}/bin/xjdic_sa ${PREFIX}/bin/xjdic
-	${INSTALL_DATA} ${WRKDIR}/radicals.tm ${DATADIR} ;
-	${INSTALL_DATA} ${WRKDIR}/radkfile ${DATADIR} ;
-	${INSTALL_DATA} ${WRKDIR}/kanjstroke ${DATADIR} ;
-	${INSTALL_DATA} ${WRKDIR}/romkana.cnv ${DATADIR} ;
-	${INSTALL_DATA} ${WRKDIR}/vconj ${DATADIR} ;
-	#
-	# Only 9 dictionaries can be enabled
-	#
-	@${ECHO_CMD} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile edict >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile enamdict >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile compdic >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile ediclsd3 >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile j_places >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile lawgledt >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile geodic >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile pandpdic >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile aviation >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile compverb >> ${DATADIR}/.xjdicrc
-	@${ECHO_CMD} dicfile 4jwords >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
-	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/.xjdicrc
-	@${CHMOD} ${SHAREMODE} ${DATADIR}/.xjdicrc
-	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@if [ ! -d ${DOCDIR} ] ; \
-	then \
-		${MKDIR} ${DOCDIR} ; \
-	fi
-	${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCDIR}
-	@for docfile in ${DOCFILES} ; do \
-		${ECHO_CMD} Installing  ${DOCDIR}/$$docfile ; \
-		${INSTALL_MAN}  ${_DISTDIR}/$$docfile ${DOCDIR} ; \
-	done
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/edict-utf-8/distinfo b/japanese/edict-utf-8/distinfo
index 386d4fba6d5..dd8c7d23d4c 100644
--- a/japanese/edict-utf-8/distinfo
+++ b/japanese/edict-utf-8/distinfo
@@ -1,40 +1,38 @@
-MD5 (edict/xjdic23.tgz) = bbfbf80a944c24c39f02a273a55ded65
-SIZE (edict/xjdic23.tgz) = 136415
-MD5 (edict/edict.gz) = IGNORE
-MD5 (edict/edicth) = IGNORE
-MD5 (edict/enamdict.gz) = IGNORE
-MD5 (edict/compdic.gz) = IGNORE
-MD5 (edict/jddict.v02.gz) = IGNORE
-MD5 (edict/j_places.gz) = IGNORE
-MD5 (edict/ediclsd3.zip) = IGNORE
-MD5 (edict/kanjidic.gz) = IGNORE
-MD5 (edict/kanjd212.gz) = IGNORE
-MD5 (edict/lawgledt.zip) = IGNORE
-MD5 (edict/lingdic.zip) = IGNORE
-MD5 (edict/geodic.gz) = IGNORE
-MD5 (edict/pandpdic.zip) = IGNORE
-MD5 (edict/aviation.zip) = IGNORE
-MD5 (edict/findic.zip) = IGNORE
-MD5 (edict/mktdic.zip) = IGNORE
-MD5 (edict/compverb.gz) = IGNORE
-MD5 (edict/4jwords.gz) = IGNORE
-MD5 (edict/concrete.zip) = IGNORE
-MD5 (edict/edict_doc.txt) = IGNORE
-MD5 (edict/edict_doc.html) = IGNORE
-MD5 (edict/edicth.doc) = IGNORE
-MD5 (edict/enamdict_doc.txt) = IGNORE
-MD5 (edict/enamdict_doc.html) = IGNORE
-MD5 (edict/jddict.doc) = IGNORE
-MD5 (edict/j_places.inf) = IGNORE
-MD5 (edict/kanjidic.doc) = IGNORE
-MD5 (edict/kanjd212.doc) = IGNORE
-MD5 (edict/ediclsd3.rme) = IGNORE
-MD5 (edict/lawgldoc.new) = IGNORE
-MD5 (edict/lingdic.txt) = IGNORE
-MD5 (edict/geodic.doc) = IGNORE
-MD5 (edict/aviation.txt) = IGNORE
-MD5 (edict/findic.doc) = IGNORE
-MD5 (edict/mktdic.doc) = IGNORE
-MD5 (edict/compverb.doc) = IGNORE
-MD5 (edict/4jwords.doc) = IGNORE
-MD5 (edict/concrete.doc) = IGNORE
+MD5 (edict/edict.gz) = 08e14b4a0b6c206cc71ee52b84712149
+SIZE (edict/edict.gz) = 1911548
+MD5 (edict/edicth) = 522c9d10d8f1fa3e7ff0824c8f3a3eb7
+SIZE (edict/edicth) = 3965
+MD5 (edict/enamdict.gz) = 67aa774aeabc774b84ccb59153046c03
+SIZE (edict/enamdict.gz) = 2972869
+MD5 (edict/compdic.gz) = 7cfe919cfa8f060df5f45c1a962f270d
+SIZE (edict/compdic.gz) = 199327
+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) = 7c190b1cc3255473bcaea254e83c7b84
+SIZE (edict/kanjidic.gz) = 496280
+MD5 (edict/kanjd212.gz) = fb48552aaf53dda43eba09560ce307e0
+SIZE (edict/kanjd212.gz) = 193814
+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
diff --git a/japanese/edict-utf-8/files/patch-aa b/japanese/edict-utf-8/files/patch-aa
deleted file mode 100644
index bf66c1d716d..00000000000
--- a/japanese/edict-utf-8/files/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.orig	Wed Sep 16 04:08:01 1998
-+++ Makefile	Sat Jul 17 21:33:01 1999
-@@ -54,7 +54,7 @@
- #
- #LIBS= -lsocket -lnsl
- #
--CC=gcc -g
-+#CC=gcc -g
- all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
- client: xjdic_cl
- server: xjdserver
-@@ -80,7 +80,7 @@
- #
- SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
- #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
--SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
-+SACFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDDIC -DMMAP ${CFLAGS}
- #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DRAM_LOAD
- xjdic_sa: $(SAOBJECTS)
- 	$(CC) $(SAOBJECTS) -o xjdic_sa
-@@ -97,7 +97,7 @@
- #	C L I E N T
- #
- CLOBJECTS = xjdclient.o xjdcomm_cl.o xjdfrontend_cl.o
--CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV
-+CLCFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDCLSERV ${CFLAGS}
- xjdic_cl: $(CLOBJECTS)
- 	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
- xjdclient.o: xjdclient.c
-@@ -112,7 +112,7 @@
- #
- SVOBJECTS = xjdcomm_sv.o xjdservcomm_sv.o xjdserver.o
- #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DDEMAND_PAGING
--SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP
-+SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP ${CFLAGS}
- #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DRAM_LOAD
- xjdserver: $(SVOBJECTS)
- 	$(CC) $(SVOBJECTS) $(LIBS) -o xjdserver
diff --git a/japanese/edict-utf-8/files/patch-ab b/japanese/edict-utf-8/files/patch-ab
deleted file mode 100644
index 2dc40879b18..00000000000
--- a/japanese/edict-utf-8/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- xjdic.h.orig	Thu Sep  3 02:05:28 1998
-+++ xjdic.h	Wed Oct  7 11:55:52 1998
-@@ -3,7 +3,7 @@
- #define NRKANA 250*2   /*  size of the romaji to kana tables*/
- #define NOFILT 10      /* maximum number of general filters */
- #define VMAX 350       /* maximum entries in the verb table */
--#define DEFAULT_DICDIR ""    /* could be: "/usr/local/lib/xjdic"   */
-+#define DEFAULT_DICDIR "/usr/local/share/dict/edict"    /* could be: "/usr/local/lib/xjdic"   */
- #define NOHITS 1000       /* size of hittab  */
- #define SPTAG '@'         /* character that flags priority entries */
- #define KFBUFFSIZE 2000   /* size of the KFlush buffer */
diff --git a/japanese/edict-utf-8/pkg-descr b/japanese/edict-utf-8/pkg-descr
index e2f3b369377..c18943b41d0 100644
--- a/japanese/edict-utf-8/pkg-descr
+++ b/japanese/edict-utf-8/pkg-descr
@@ -1,24 +1,5 @@
-XJDIC V2.3, XJDSERVER V2.3 -- (Copyright: J.W. Breen - 1998)
+UTF-8 version of edict's dictionary files
 
-XJDIC is an  electronic  Japanese-English  dictionary  program  designed  to 
-operate  in  the  X11 window environment.  In particular,  it must run in an 
-"xterm" environment which has Japanese language support such as provided  by 
-"kterm" or internationalized xterm, aixterm, etc. 
-
-It  is based on JDIC and JREADER which were developed to run under MS-DOS on 
-IBM PCs or clones. 
-
-XJDIC functions as: 
-
-(a) an English to  Japanese  dictionary  (eiwa  jiten),  searching  for  and 
-displaying entries for key-words entered in English; 
-
-(b)  a  Japanese  to  English  dictionary  (waei  jiten),  searching for and 
-displaying entries for keywords  or  phrases  entered  in  Japanese  (kanji, 
-hiragana or katakana); 
-
-(c)  a  Japanese-English  Character  dictionary  (kanei  jiten),  capable of 
-selecting kanji characters by JIS code, radical, stroke count,  Nelson Index 
-number or reading, and displaying compounds containing that kanji. 
+see japanese/edict/pkg-descr for more information
 
 WWW: ftp://ftp.cc.monash.edu.au/pub/nihongo/00INDEX.html
diff --git a/japanese/edict-utf-8/pkg-plist b/japanese/edict-utf-8/pkg-plist
deleted file mode 100644
index 9bd9d255884..00000000000
--- a/japanese/edict-utf-8/pkg-plist
+++ /dev/null
@@ -1,72 +0,0 @@
-bin/exjdxgen
-bin/xjdic
-bin/xjdic_sa
-bin/xjdic_cl
-bin/xjdserver
-bin/xjdxgen
-share/dict/edict/4jwords
-share/dict/edict/4jwords.xjdx
-share/dict/edict/aviation
-share/dict/edict/aviation.xjdx
-share/dict/edict/compdic
-share/dict/edict/compdic.xjdx
-share/dict/edict/compverb
-share/dict/edict/compverb.xjdx
-share/dict/edict/concrete
-share/dict/edict/concrete.xjdx
-share/dict/edict/ediclsd3
-share/dict/edict/ediclsd3.xjdx
-share/dict/edict/edict
-share/dict/edict/edict.xjdx
-share/dict/edict/edicth
-share/dict/edict/edicth.xjdx
-share/dict/edict/enamdict
-share/dict/edict/enamdict.xjdx
-share/dict/edict/findic
-share/dict/edict/findic.xjdx
-share/dict/edict/geodic
-share/dict/edict/geodic.xjdx
-share/dict/edict/j_places
-share/dict/edict/j_places.xjdx
-share/dict/edict/jddict.v02
-share/dict/edict/jddict.v02.xjdx
-share/dict/edict/kanjd212
-share/dict/edict/kanjd212.xjdx
-share/dict/edict/kanjidic
-share/dict/edict/kanjidic.xjdx
-share/dict/edict/kanjstroke
-share/dict/edict/lawgledt
-share/dict/edict/lawgledt.xjdx
-share/dict/edict/lingdic
-share/dict/edict/lingdic.xjdx
-share/dict/edict/mktdic
-share/dict/edict/mktdic.xjdx
-share/dict/edict/pandpdic
-share/dict/edict/pandpdic.xjdx
-share/dict/edict/radicals.tm
-share/dict/edict/radkfile
-share/dict/edict/romkana.cnv
-share/dict/edict/vconj
-share/dict/edict/.xjdicrc
-@dirrm share/dict/edict
-share/doc/xjdic/4jwords.doc
-share/doc/xjdic/aviation.txt
-share/doc/xjdic/compverb.doc
-share/doc/xjdic/concrete.doc
-share/doc/xjdic/ediclsd3.rme
-share/doc/xjdic/edict_doc.html
-share/doc/xjdic/edict_doc.txt
-share/doc/xjdic/edicth.doc
-share/doc/xjdic/enamdict_doc.html
-share/doc/xjdic/enamdict_doc.txt
-share/doc/xjdic/findic.doc
-share/doc/xjdic/geodic.doc
-share/doc/xjdic/j_places.inf
-share/doc/xjdic/jddict.doc
-share/doc/xjdic/kanjd212.doc
-share/doc/xjdic/kanjidic.doc
-share/doc/xjdic/lawgldoc.new
-share/doc/xjdic/lingdic.txt
-share/doc/xjdic/mktdic.doc
-share/doc/xjdic/xjdic23.inf
-@dirrm share/doc/xjdic