- update chasen to sys2.02-ipadic2.1.

7 files changed, 64 insertions, 47 deletions

diff --git a/japanese/chasen/Makefile b/japanese/chasen/Makefile
index 3ee09f64a70..38264cb8dbd 100644
--- a/japanese/chasen/Makefile
+++ b/japanese/chasen/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1999/06/07 09:54:39 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/07 13:30:57 taca Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/10/27 14:31:25 kuriyama Exp $
 
-DISTNAME=	chasen-sys2.0b6-ipadic1.0
-PKGNAME=	chasen-2.0b6
+DISTNAME=	chasen-sys2.02-ipadic2.1
+PKGNAME=	chasen-2.02
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.aist-nara.ac.jp/pub/lab/nlp/tools/chasen/ \
-		http://cactus.aist-nara.ac.jp/~akira-k/cha/arc/
+		http://cl.aist-nara.ac.jp/lab/nlt/chasen/package/
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://cactus.aist-nara.ac.jp/lab/nlt/chasen.html
 
-WRKSRC=		${WRKDIR}/chasen-2.0b6
+WRKSRC=		${WRKDIR}/chasen-2.02
+MAKEENV+=	LOCALBASE=\"${LOCALBASE}\"
 
 post-build:
 	${ECHO_MSG} "Making dictionaries"
diff --git a/japanese/chasen/files/md5 b/japanese/chasen/files/md5
index a5337212e7a..56942f6ddfc 100644
--- a/japanese/chasen/files/md5
+++ b/japanese/chasen/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/06/07 09:54:39 sakamoto Exp $
+$NetBSD: md5,v 1.3 2001/01/07 13:30:57 taca Exp $
 
-MD5 (chasen-sys2.0b6-ipadic1.0.tar.gz) = af7d083065f826f7e9158f2de1c9f3de
+MD5 (chasen-sys2.02-ipadic2.1.tar.gz) = d0f05a0f348205f751fa6f3d1f333710
diff --git a/japanese/chasen/files/patch-sum b/japanese/chasen/files/patch-sum
index 76cf60432b4..04984e772a3 100644
--- a/japanese/chasen/files/patch-sum
+++ b/japanese/chasen/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:16 agc Exp $
+$NetBSD: patch-sum,v 1.2 2001/01/07 13:30:57 taca Exp $
 
-MD5 (patch-aa) = 4b24cb9fbfabeff532ae93c12e4d35fd
-MD5 (patch-ab) = 24e8161e6b149aaabc0c87223070d74e
+MD5 (patch-aa) = 791ce255e5fc375e696cdf6319d8b470
+MD5 (patch-ac) = 73b3cb4c67d49c4f90a5c6fe3d855b06
diff --git a/japanese/chasen/patches/patch-aa b/japanese/chasen/patches/patch-aa
index 95aed29893f..1e1c3e4b104 100644
--- a/japanese/chasen/patches/patch-aa
+++ b/japanese/chasen/patches/patch-aa
@@ -1,12 +1,35 @@
-$NetBSD: patch-aa,v 1.2 1999/06/07 09:54:39 sakamoto Exp $
---- ./Makefile.orig	Thu Apr 22 17:08:15 1999
-+++ ./Makefile	Mon Jun  7 18:09:47 1999
-@@ -17,6 +17,6 @@
+$NetBSD: patch-aa,v 1.3 2001/01/07 13:30:57 taca Exp $
+
+--- Makefile.orig	Wed Dec 29 01:12:01 1999
++++ Makefile
+@@ -9,7 +9,7 @@
+ #
  
- # --- install directories
+ # --- commands & flags
+-CC	 = gcc
++CC	 = cc
+ CFLAGS	 = -O2
+ CCOUT    = 
+ LDFLAGS  =
+@@ -19,9 +19,9 @@
+ 
+ # --- installation files and directories
+ CHASEN = chasen
 -BINDIR = /usr/local/bin
 -LIBDIR = /usr/local/lib/chasen
-+BINDIR = $(PREFIX)/bin
-+LIBDIR = $(PREFIX)/share/chasen
- MKDICDIR = $(LIBDIR)/mkchadic
+-MKDICDIR = $(LIBDIR)/mkchadic
++BINDIR = ${LOCALBASE}/bin
++LIBDIR = ${LOCALBASE}/share/chasen
++MKDICDIR = ${LOCALBASE}/libexec/mkchadic
  DICDIR = $(LIBDIR)/dic
+ 
+ # --- user definitions
+@@ -32,7 +32,7 @@
+ #KOCHA   = -DKOCHA2 -DVGRAM # Korean language version
+ #SJIS	 = -DSJIS
+ 
+-RCPATH   = $(DICDIR)/chasenrc
++RCPATH   = $(LIBDIR)/chasenrc
+ SYSVER   = 2.02
+ DICNAME  = ipadic
+ DICVER   = 2.1
diff --git a/japanese/chasen/patches/patch-ab b/japanese/chasen/patches/patch-ab
deleted file mode 100644
index b2b4237cd0f..00000000000
--- a/japanese/chasen/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/01/05 01:10:02 wiz Exp $
---- lib/pat.h~	Tue May 27 06:12:58 1997
-+++ lib/pat.h	Thu Oct 22 00:58:38 1998
-@@ -14,6 +14,7 @@
- #define OL(x)  /* */
- #endif
- 
-+#include <sys/types.h>
- #ifndef NO_MMAP
- #ifdef _WIN32
- #define ONMEM_DIC
-@@ -21,7 +22,6 @@
- #include <sys/mman.h>
- #endif
- #endif /* !NO_MMAP */
--#include <sys/types.h>
- #include <sys/stat.h>
- 
- #ifdef ONMEM_DIC
diff --git a/japanese/chasen/patches/patch-ac b/japanese/chasen/patches/patch-ac
new file mode 100644
index 00000000000..6a03950256e
--- /dev/null
+++ b/japanese/chasen/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2001/01/07 13:30:58 taca Exp $
+
+--- dic/Makefile.orig	Wed Dec 29 11:19:41 1999
++++ dic/Makefile
+@@ -73,7 +73,8 @@
+ install:
+ 	-mkdir -p $(DICDIR)
+ 	sed 's#^MKDICDIR.*$$#MKDICDIR=$(MKDICDIR)#' Makefile > $(DICDIR)/Makefile
+-	-$(CP) *.cha chadic.* chasenrc $(DICDIR)
++	-$(CP) chasenrc $(LIBDIR)
++	-$(CP) *.cha chadic.* $(DICDIR)
+ #	-$(CP) chasen.* *.cha chadic.* chasenrc $(DICDIR)
+ 
+ clean:
diff --git a/japanese/chasen/pkg/PLIST b/japanese/chasen/pkg/PLIST
index 89be5e2d470..be0920f44c0 100644
--- a/japanese/chasen/pkg/PLIST
+++ b/japanese/chasen/pkg/PLIST
@@ -1,23 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 1999/06/07 09:54:39 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/07 13:30:58 taca Exp $
 bin/chasen
+libexec/mkchadic/convdic
+libexec/mkchadic/makeint
+libexec/mkchadic/makemat
+libexec/mkchadic/mkary
+libexec/mkchadic/pattool
+libexec/mkchadic/sortdic
+@dirrm libexec/mkchadic
 share/chasen/chasenrc
 share/chasen/dic/Makefile
 share/chasen/dic/cforms.cha
-share/chasen/dic/chadic.ary
 share/chasen/dic/chadic.int
 share/chasen/dic/chadic.pat
-share/chasen/dic/chasenrc
 share/chasen/dic/connect.cha
 share/chasen/dic/ctypes.cha
 share/chasen/dic/grammar.cha
 share/chasen/dic/matrix.cha
 share/chasen/dic/table.cha
-share/chasen/mkchadic/convgram
-share/chasen/mkchadic/makeint
-share/chasen/mkchadic/makemat
-share/chasen/mkchadic/mkary
-share/chasen/mkchadic/pattool
-share/chasen/mkchadic/sortdic
-@dirrm share/chasen/mkchadic
 @dirrm share/chasen/dic
 @dirrm share/chasen