Update to 2.4:

In fact very little has changed in V2.4.  A few bugs were fixed, and one
new feature, namely the display of multiple results in a
multi-dictionary lookup, was added. One bug-fix was to re-instate a
feature that was accidently dropped out in the V2.2 -> V2.3 update.
(Only one user noticed....)

Pkgsrc change: depend on new edict and kanjidic packages instead of
including a copy of the files.

5 files changed, 46 insertions, 30 deletions

diff --git a/misc/xjdic/Makefile b/misc/xjdic/Makefile
index eefc4a2ac62..115ef31e13f 100644
--- a/misc/xjdic/Makefile
+++ b/misc/xjdic/Makefile
@@ -1,26 +1,30 @@
-# $NetBSD: Makefile,v 1.6 2003/11/29 04:15:43 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/02 03:17:53 wiz Exp $
 #
 
-DISTNAME=	xjdic23
-PKGNAME=	xjdic-2.3
-PKGREVISION=	2
+DISTNAME=	xjdic24
+PKGNAME=	xjdic-2.4
 WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese misc
-MASTER_SITES=	http://www.bcit-broadcast.com/monash/
+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.sedl.org/pub/mirrors/nihongo/ \
+		ftp://ftp.net.usf.edu/pub/monash/ \
+		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/
 EXTRACT_SUFX=	.tgz
-DISTFILES+=	edict.gz \
-		kanjidic.gz \
-		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.csse.monash.edu.au/~jwb/xjdic/
 COMMENT=	Japanese dictionary
 
+DEPENDS+=	edict-[0-9]*:../../misc/edict
+DEPENDS+=	kanjidic-[0-9]*:../../misc/kanjidic
+
 MESSAGE_SUBST+=	PREFIX=${PREFIX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-DIST_SUBDIR=	${PKGNAME}
-
 do-install:
 		cd ${WRKSRC} ; \
 		for i in exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen ; \
@@ -40,14 +44,13 @@ do-install:
 		${INSTALL_MAN} \
 			${WRKSRC}/xjdic22.WHATSNEW \
 			${WRKSRC}/xjdic23.WHATSNEW \
-			${WRKSRC}/xjdic23.inf \
-			${WRKSRC}/xjdic23.install \
+			${WRKSRC}/xjdic24.WHATSNEW \
+			${WRKSRC}/xjdic24.inf \
+			${WRKSRC}/xjdic24.install \
 			${PREFIX}/share/doc/xjdic
 		${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
-		${GZIP_CMD} -cd ${DISTDIR}/${DIST_SUBDIR}/kanjidic.gz \
-			>${PREFIX}/share/xjdic/kanjidic
-		${GZIP_CMD} -cd ${DISTDIR}/${DIST_SUBDIR}/edict.gz \
-			>${PREFIX}/share/xjdic/edict
+		${LN} -s ../edict/edict ${PREFIX}/share/xjdic/edict
+		${LN} -s ../kanjidic/kanjidic ${PREFIX}/share/xjdic/kanjidic
 		${PREFIX}/bin/xjdxgen ${PREFIX}/share/xjdic/edict
 		${PREFIX}/bin/xjdxgen ${PREFIX}/share/xjdic/kanjidic
 		${SED} \
diff --git a/misc/xjdic/PLIST b/misc/xjdic/PLIST
index e27c6fb3d22..f76cb878b94 100644
--- a/misc/xjdic/PLIST
+++ b/misc/xjdic/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 12:59:46 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/02 03:17:54 wiz Exp $
 bin/exjdxgen
 bin/xjdic_cl
 bin/xjdic
@@ -6,8 +6,9 @@ bin/xjdserver
 bin/xjdxgen
 share/doc/xjdic/xjdic22.WHATSNEW
 share/doc/xjdic/xjdic23.WHATSNEW
-share/doc/xjdic/xjdic23.inf
-share/doc/xjdic/xjdic23.install
+share/doc/xjdic/xjdic24.WHATSNEW
+share/doc/xjdic/xjdic24.inf
+share/doc/xjdic/xjdic24.install
 share/doc/xjdic/.xjdicrc
 share/xjdic/kanjstroke
 share/xjdic/radkfile
diff --git a/misc/xjdic/distinfo b/misc/xjdic/distinfo
index 7067b2e3ba5..2cfe7a702f2 100644
--- a/misc/xjdic/distinfo
+++ b/misc/xjdic/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/11/11 09:56:37 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/01/02 03:17:54 wiz Exp $
 
-SHA1 (xjdic-2.3nb2/edict.gz) = d3ca4e6c6110c75172d06400e964f96ec29023d5
-Size (xjdic-2.3nb2/edict.gz) = 1891382 bytes
-SHA1 (xjdic-2.3nb2/kanjidic.gz) = 6239492e5c0645d4ff3b6b085a5002f660b77d1d
-Size (xjdic-2.3nb2/kanjidic.gz) = 496280 bytes
-SHA1 (xjdic-2.3nb2/xjdic23.tgz) = f5b364b7b50abaa4ffc862f5140d0c47b4438d16
-Size (xjdic-2.3nb2/xjdic23.tgz) = 136415 bytes
+SHA1 (xjdic24.tgz) = 732b2922c3e7229baedfb8be958dc3b92a8a06b8
+Size (xjdic24.tgz) = 140091 bytes
 SHA1 (patch-aa) = 7e3dad15962b0ac69bf25c6f98cbbff8925aed8d
-SHA1 (patch-ab) = 32dfe757b0a20a72cb336177eec08ba85e89231a
+SHA1 (patch-ab) = 26bfeffcb8d56d99922164410b9ffe98ec5e8412
+SHA1 (patch-ac) = 06e8b8ebace1c12e7dbf944d9d6b34d8f5c9acc8
diff --git a/misc/xjdic/patches/patch-ab b/misc/xjdic/patches/patch-ab
index f17f358362c..ec17bd5359d 100644
--- a/misc/xjdic/patches/patch-ab
+++ b/misc/xjdic/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 12:59:46 seb Exp $
+$NetBSD: patch-ab,v 1.2 2004/01/02 03:17:54 wiz Exp $
 
---- xjdic.h.orig	Thu Sep  3 11:05:28 1998
+--- xjdic.h.orig	2003-12-24 04:27:00.000000000 +0100
 +++ xjdic.h
 @@ -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 VMAX 600       /* maximum entries in the verb table */
 -#define DEFAULT_DICDIR ""    /* could be: "/usr/local/lib/xjdic"   */
 +#define DEFAULT_DICDIR PREFIX "share/xjdic"    /* could be: "/usr/local/lib/xjdic"   */
  #define NOHITS 1000       /* size of hittab  */
diff --git a/misc/xjdic/patches/patch-ac b/misc/xjdic/patches/patch-ac
new file mode 100644
index 00000000000..1d0c9e60ffb
--- /dev/null
+++ b/misc/xjdic/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2004/01/02 03:17:54 wiz Exp $
+
+--- .xjdicrc.skel.orig	1998-09-03 15:01:27.000000000 +0200
++++ .xjdicrc.skel
+@@ -12,8 +12,8 @@ kdicfile	kanjidic_b
+ # kanjd212 files
+ #	dicfile	(default is edict alone)
+ dicfile edict
+-dicfile jddict
+-dicfile compdic
++#dicfile jddict
++#dicfile compdic
+ #	kdnosho	(no default)
+ kdnoshow YELUQMKZ
+ #	filt	(no defaults)