Convert to buildlink3.

Depend on edict and kanjidic packages for input files.
Bump PKGREVISION.

5 files changed, 19 insertions, 23 deletions

diff --git a/misc/kdrill/MESSAGE b/misc/kdrill/MESSAGE
index 4b94863b6ee..a757004a95a 100644
--- a/misc/kdrill/MESSAGE
+++ b/misc/kdrill/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 10:29:50 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2004/05/09 23:46:53 wiz Exp $
 
 To learn kana, start kdrill with:
 
@@ -7,9 +7,4 @@ To learn kana, start kdrill with:
 
 or any of the other edic files from ${PREFIX}/share/kdrill.
 
-To learn kanji, download edict.gz and kanjidic.gz from
-
-	ftp://ftp.monash.edu.au/pub/nihongo/
-
-and install them in ${PREFIX}/share/kdrill.
 ===========================================================================
diff --git a/misc/kdrill/Makefile b/misc/kdrill/Makefile
index 98f063ea71c..d0c5b39b977 100644
--- a/misc/kdrill/Makefile
+++ b/misc/kdrill/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:01:16 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/09 23:46:53 wiz Exp $
 #
 
 DISTNAME=	kdrill5.11.6
 PKGNAME=	kdrill-5.11.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	japanese misc
 MASTER_SITES=	http://www.bolthole.com/kdrill/
 
@@ -11,8 +11,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.bolthole.com/kdrill/
 COMMENT=	Kanji quiz and japanese dictionary
 
-USE_BUILDLINK2=	yes
+DEPENDS+=	edict-[0-9]*:../../misc/edict
+DEPENDS+=	kanjidic-[0-9]*:../../misc/kanjidic
+
+USE_BUILDLINK3=	yes
 USE_IMAKE=	yes
+USE_X11=	yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/kdrill
@@ -23,5 +27,9 @@ post-install:
 		fullkatahira.edic; do \
 		${GZIP_CMD} -9 ${PREFIX}/share/kdrill/$$f; \
 	done
+	${GZIP_CMD} -c ${PREFIX}/share/edict/edict > \
+		${PREFIX}/share/kdrill/edict.gz
+	${GZIP_CMD} -c ${PREFIX}/share/kanjidic/kanjidic > \
+		${PREFIX}/share/kdrill/kanjidic.gz
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdrill/PLIST b/misc/kdrill/PLIST
index bca19047c13..d7dbd950f41 100644
--- a/misc/kdrill/PLIST
+++ b/misc/kdrill/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2003/03/04 04:15:23 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/05/09 23:46:53 wiz Exp $
 bin/kdrill
 lib/X11/app-defaults/KDrill
 ${IMAKE_MAN_DIR}/kdrill.${IMAKE_MANNEWSUFFIX}
+share/kdrill/edict.gz
+share/kdrill/fullkatahira.edic.gz
 share/kdrill/hira.edic.gz
 share/kdrill/hiraplus.edic.gz
+share/kdrill/kanjidic.gz
 share/kdrill/kata.edic.gz
 share/kdrill/kataplus.edic.gz
-share/kdrill/fullkatahira.edic.gz
 @unexec ${RMDIR} %D/share/kdrill 2>/dev/null || ${TRUE}
diff --git a/misc/kdrill/distinfo b/misc/kdrill/distinfo
index d6746225052..a1ac418580a 100644
--- a/misc/kdrill/distinfo
+++ b/misc/kdrill/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/03/08 21:50:41 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/05/09 23:46:53 wiz Exp $
 
 SHA1 (kdrill5.11.6.tar.gz) = 8ce3594c81f717a4fd1488a952b0a05111679cd0
 Size (kdrill5.11.6.tar.gz) = 182956 bytes
-SHA1 (patch-aa) = c8e05c7555fc3f8932730ad7a7137945b5690f11
+SHA1 (patch-aa) = 42fc93ca33c380cc947a526c97cb887c2e778ebb
diff --git a/misc/kdrill/patches/patch-aa b/misc/kdrill/patches/patch-aa
index 4bb25946040..83c7b44a7cd 100644
--- a/misc/kdrill/patches/patch-aa
+++ b/misc/kdrill/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/03/08 21:50:41 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/09 23:46:53 wiz Exp $
 
 --- Imakefile.orig	Wed Feb  6 01:56:16 2002
 +++ Imakefile
@@ -13,12 +13,3 @@ $NetBSD: patch-aa,v 1.2 2002/03/08 21:50:41 wiz Exp $
  
  # If for some reason, the user prefs stuff isn't working for you, 
  # and you can't compile, uncomment this
-@@ -67,7 +67,7 @@
- /* 
-  * I don't like putting <X11/...> for everything, so..
-  */
--INCLUDES = -I$(INCROOT)/X11
-+INCLUDES = -I$(BUILDLINK_X11_DIR)/include/X11
- 
- /*
-  *  If you need to debug things, use this