6 files changed, 31 insertions, 83 deletions
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index cfb01bbe276..0cdc7cae5d7 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -1,36 +1,32 @@
-# $NetBSD: Makefile,v 1.2 1999/06/08 09:57:48 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 1999/09/30 05:49:41 sakamoto Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
-DISTNAME=	kakasi-2.2.5
+DISTNAME=	kakasi-2.3.0
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://sunsite.sut.ac.jp/pub/asia-info/japanese-src/packages/ \
-	ftp://ftp.kusastro.kyoto-u.ac.jp/pub/baba/wais/ \
-		ftp://etlport.etl.go.jp/pub/mule/contrib/ \
-		ftp://ftp.cs.buffalo.edu/pub/mule/contrib/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/contrib/ \
-		ftp://ftp.funet.fi/pub/gnu/funet/emacs/mule/contrib/ \
-		ftp://ftp.iij.ad.jp/pub/misc/mule/contrib/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} kakasidict.940620.gz \
-		kakasi-ext.tar.gz
+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_LIBTOOL=	YES
+GNU_CONFIGURE=	YES
+ALL_TARGET=	all dict
+INSTALL_TARGET=	install dict-install
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} kakasi-ext.tar.gz
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 post-extract:
 	@${GZCAT} ${DISTDIR}/kakasidict.940620.gz > ${WRKSRC}/kakasidict
 
-pre-patch:
-	@${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/kakasi-ext/patch.kakasi-2.2.5
+post-configure:
+	@${RM} -f ${WRKSRC}/libtool
+	@${LN} -s ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1
-	${MKDIR} ${PREFIX}/share/doc/kakasi
-	${INSTALL_DATA} ${WRKSRC}/JISYO ${PREFIX}/share/doc/kakasi
-	${INSTALL_DATA} ${WRKSRC}/../README* ${PREFIX}/share/doc/kakasi
-	${INSTALL_DATA} ${WRKDIR}/kakasi-ext/KAKASI.DOC \
-	  ${PREFIX}/share/doc/kakasi/kakasi-ext.doc
+	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.cat ${PREFIX}/man/ja_JP.EUC/cat1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/kakasi/files/md5 b/japanese/kakasi/files/md5
index fa586fbb94b..d085de59644 100644
--- a/japanese/kakasi/files/md5
+++ b/japanese/kakasi/files/md5
@@ -1,5 +1,4 @@
-$NetBSD: md5,v 1.2 1999/06/08 09:57:49 sakamoto Exp $
+$NetBSD: md5,v 1.3 1999/09/30 05:49:41 sakamoto Exp $
 
-MD5 (kakasi-2.2.5.tar.gz) = b65739665a2e43d2dbf4c1f5b2e5ad0e
+MD5 (kakasi-2.3.0.tar.gz) = af1dbc7cab3fe552033cf92288fcb727
 MD5 (kakasidict.940620.gz) = 33fc2427d7f3d3787d6bf1ef23c3f8c9
-MD5 (kakasi-ext.tar.gz) = 47837bb1777f68bd8f6c4309616b3807
diff --git a/japanese/kakasi/files/patch-sum b/japanese/kakasi/files/patch-sum
deleted file mode 100644
index 9527ca6b41e..00000000000
--- a/japanese/kakasi/files/patch-sum
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:17 agc Exp $
-
-MD5 (patch-aa) = df2646ce57d0f741923f87cb2350ee0e
-MD5 (patch-ab) = 67795e54f774c15acbbf7b19fe375b3c
diff --git a/japanese/kakasi/patches/patch-aa b/japanese/kakasi/patches/patch-aa
deleted file mode 100644
index 59ea445e708..00000000000
--- a/japanese/kakasi/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/06/08 09:57:49 sakamoto Exp $
-
---- Makefile.orig	Tue Jun  8 16:57:09 1999
-+++ Makefile	Tue Jun  8 17:22:45 1999
-@@ -27,7 +27,7 @@
- # Please assign next values.
- 
- # Directories of Dictionary and Utilities installed 
--PREFIX=/usr/local
-+PREFIX?=/usr/local
- 
- # Preferable Compiler and Options on your system
- CC=cc
-@@ -73,8 +73,14 @@
- 	lint $(CFLAGS) $(SOURCES)
- 
- install: kakasi mkkanwa atoc-conv rdic-conv
--	cp kakasi $(BINDIR)
--	cp $(STDDICTS) mkkanwa atoc-conv rdic-conv $(LIBDIR)
-+	@(for f in ${BINDIR} ${LIBDIR}; do  \
-+	  if [ ! -d "$$f" ]; then mkdir -p "$$f"; fi; \
-+	done)
-+	install -s -c -o bin -g bin -m 755 kakasi $(BINDIR)
-+	install -s -c -o bin -g bin -m 755 mkkanwa $(LIBDIR)
-+	install -s -c -o bin -g bin -m 755 atoc-conv $(LIBDIR)
-+	install -s -c -o bin -g bin -m 755 rdic-conv $(LIBDIR)
-+	cp $(STDDICTS) $(LIBDIR)
- 	./mkkanwa $(LIBDIR)/kanwadict kakasidict
- 
- clean: 
diff --git a/japanese/kakasi/patches/patch-ab b/japanese/kakasi/patches/patch-ab
deleted file mode 100644
index 572085e18aa..00000000000
--- a/japanese/kakasi/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/06/08 09:57:49 sakamoto Exp $
-
---- ./dict.c.org	Sun Jun 19 17:05:23 1994
-+++ ./dict.c	Thu Mar 28 20:51:18 1996
-@@ -28,7 +28,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "kakasi.h"
- #include "J2.h"
- 
diff --git a/japanese/kakasi/pkg/PLIST b/japanese/kakasi/pkg/PLIST
index 125cbbc6353..2498f934132 100644
--- a/japanese/kakasi/pkg/PLIST
+++ b/japanese/kakasi/pkg/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 1999/06/08 09:57:49 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/09/30 05:49:41 sakamoto Exp $
+bin/atoc_conv
 bin/kakasi
-lib/kakasi/rdic-conv
-lib/kakasi/atoc-conv
-lib/kakasi/mkkanwa
-lib/kakasi/itaijidict
-lib/kakasi/kanwadict
+bin/mkkanwa
+bin/rdic_conv
+bin/wx2_conv
+include/libkakasi.h
+lib/libkakasi.a
+lib/libkakasi.so.2.0
+man/ja_JP.EUC/cat1/kakasi.cat
 man/ja_JP.EUC/man1/kakasi.1
-share/doc/kakasi/README
-share/doc/kakasi/README.jpn
-share/doc/kakasi/kakasi-ext.doc
-share/doc/kakasi/JISYO
-@dirrm share/doc/kakasi
-@dirrm lib/kakasi
+share/kakasi/itaijidict
+share/kakasi/kanwadict
+@dirrm share/kakasi