Update kakasi to 2.3.1

	some minor bugfix.
	add kakasidict to package.

4 files changed, 37 insertions, 15 deletions

diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index 0cdc7cae5d7..f62f93beea2 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -1,25 +1,16 @@
-# $NetBSD: Makefile,v 1.3 1999/09/30 05:49:41 sakamoto Exp $
+# $NetBSD: Makefile,v 1.4 1999/11/16 09:28:49 sakamoto Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
-DISTNAME=	kakasi-2.3.0
+DISTNAME=	kakasi-2.3.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://kakasi.namazu.org/pub/kakasi/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} kakasidict.940620.gz
-
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://kakasi.namazu.org/
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
+USE_GMAKE=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
-ALL_TARGET=	all dict
-INSTALL_TARGET=	install dict-install
-
-post-extract:
-	@${GZCAT} ${DISTDIR}/kakasidict.940620.gz > ${WRKSRC}/kakasidict
 
 post-configure:
 	@${RM} -f ${WRKSRC}/libtool
diff --git a/japanese/kakasi/files/md5 b/japanese/kakasi/files/md5
index d085de59644..8d7c351a1af 100644
--- a/japanese/kakasi/files/md5
+++ b/japanese/kakasi/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.3 1999/09/30 05:49:41 sakamoto Exp $
+$NetBSD: md5,v 1.4 1999/11/16 09:28:50 sakamoto Exp $
 
-MD5 (kakasi-2.3.0.tar.gz) = af1dbc7cab3fe552033cf92288fcb727
-MD5 (kakasidict.940620.gz) = 33fc2427d7f3d3787d6bf1ef23c3f8c9
+MD5 (kakasi-2.3.1.tar.gz) = 74057ccb3fb03533fcd2ba6e71a1549f
diff --git a/japanese/kakasi/files/patch-sum b/japanese/kakasi/files/patch-sum
new file mode 100644
index 00000000000..21b1568f495
--- /dev/null
+++ b/japanese/kakasi/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.3 1999/11/16 09:28:51 sakamoto Exp $
+
+MD5 (patch-aa) = cbbcdd9016d72d917c023fe98bba214d
diff --git a/japanese/kakasi/patches/patch-aa b/japanese/kakasi/patches/patch-aa
new file mode 100644
index 00000000000..e4e460d7119
--- /dev/null
+++ b/japanese/kakasi/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.4 1999/11/16 09:28:53 sakamoto Exp $
+
+--- ./src/mkkanwa.c.orig	Fri Oct 29 14:18:45 1999
++++ ./src/mkkanwa.c	Tue Nov 16 18:14:40 1999
+@@ -26,10 +26,8 @@
+ #include "jj2.h"
+ 
+-static void usage(argv, options)
++static void usage(argv)
+      char **argv;
+-     char *options;
+ {
+-    (void)fprintf(stderr, "usage: %s kanwadict %s dict1 [dict2,,,]\n",
+-		  argv[0], options);
++    (void)fprintf(stderr, "usage: %s kanwadict dict1 [dict2,,,]\n", argv[0]);
+     exit (2);
+ }
+@@ -80,9 +78,9 @@
+ 	  case 'h':
+ 	  default:
+-	    usage(argv, options);
++	    usage(argv);
+ 	}
+     }
+     if (optind >= argc)
+-	usage(argv, options);
++	usage(argv);
+     if ((kdict = fopen(argv[optind],"wb")) == NULL) {
+ 	perror(argv[optind]);