9 files changed, 59 insertions, 62 deletions
diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile
index 7554e5bf92c..f85bfabf4a8 100644
--- a/textproc/chasen-base/Makefile
+++ b/textproc/chasen-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/05/05 00:28:50 snj Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/06 13:32:38 taca Exp $
 #
 
 DISTNAME=		chasen-${CHASEN_VERSION}
@@ -6,15 +6,18 @@ PKGNAME=		chasen-base-${CHASEN_VERSION}
 CATEGORIES=		japanese textproc
 MASTER_SITES=		http://chasen.aist-nara.ac.jp/stable/chasen/
 
-PATCHFILES=		chasen-${CHASEN_VERSION}-nmz.diff
+PATCHFILES=		chasen-2.3.3.20030821.patch \
+			chasen-2.3.3.20030822.patch \
+			chasen-2.3.3.20031024.patch
 PATCH_SITES=		${MASTER_SITES}
-PATCH_DIST_STRIP=	-p1
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://chasen.aist-nara.ac.jp/
 COMMENT=		ChaSen, Japanese Morphological Analysis System
 
 GNU_CONFIGURE=		yes
+USE_LANGUAGE=		c c++
 USE_LIBTOOL=		yes
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
@@ -23,4 +26,5 @@ OWN_DIRS=		${CHASEN_DICDIR}
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../chasen/Makefile.common"
+.include "../../textproc/darts/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/chasen-base/PLIST b/textproc/chasen-base/PLIST
index 19f19e24343..eb09c7df8d4 100644
--- a/textproc/chasen-base/PLIST
+++ b/textproc/chasen-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:51:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/06 13:32:38 taca Exp $
 bin/chasen
 bin/chasen-config
 include/chasen.h
@@ -7,12 +7,7 @@ lib/libchasen.la
 lib/libchasen.so
 lib/libchasen.so.0
 lib/libchasen.so.0.1
-sbin/convary
-sbin/convdic
-sbin/makeint
+sbin/makeda
 sbin/makemat
-sbin/mkary
-sbin/pattool
-sbin/sortdic
 @dirrm share/chasen/dic
 @dirrm share/chasen
diff --git a/textproc/chasen-base/buildlink3.mk b/textproc/chasen-base/buildlink3.mk
new file mode 100644
index 00000000000..c3372b1e72d
--- /dev/null
+++ b/textproc/chasen-base/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/06 13:32:38 taca Exp $
+#
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+CHASEN_BASE_BUILDLINK3_MK:=	${CHASEN_BASE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	chasen-base
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nchasen-base}
+BUILDLINK_PACKAGES+=	chasen-base
+
+.if !empty(CHASEN_BASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.chasen-base+=	chasen-base>=2.3.3
+BUILDLINK_PKGSRCDIR.chasen-base?=	../../textproc/chasen-base
+.endif	# CHASEN_BASE_BUILDLINK3_MK
+
+.include "../../textproc/darts/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/chasen-base/distinfo b/textproc/chasen-base/distinfo
index 9476aba5c2e..916d41a480f 100644
--- a/textproc/chasen-base/distinfo
+++ b/textproc/chasen-base/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.2 2002/08/25 21:51:13 jlam Exp $
+$NetBSD: distinfo,v 1.3 2004/05/06 13:32:38 taca Exp $
 
-SHA1 (chasen-2.2.9.tar.gz) = bd17162f2fcb4254ded6eebf35c6aa06caecbaeb
-Size (chasen-2.2.9.tar.gz) = 578068 bytes
-SHA1 (chasen-2.2.9-nmz.diff) = 7aa1e01fbe7266468dcc1048e19171a0f2ff1cf8
-Size (chasen-2.2.9-nmz.diff) = 2779 bytes
-SHA1 (patch-ag) = 62326d1b540519a77cd2db5c422de78079afc1e3
-SHA1 (patch-ah) = 5993259634655c76c84bfccd72b3fa0e5aff8b61
-SHA1 (patch-ai) = 802354f200103d045de1b166215a45e7840027d8
-SHA1 (patch-aj) = eec8eb1afd762704844360949670038a60be1a02
-SHA1 (patch-ak) = 7782ce03186fcfbcbe8bcc28486f06469a1d0998
+SHA1 (chasen-2.3.3.tar.gz) = 711f5717ee284d26aa5616292f7aaffaef11d03a
+Size (chasen-2.3.3.tar.gz) = 425981 bytes
+SHA1 (chasen-2.3.3.20030821.patch) = c608e5e613bc8a9758436681846047099610bf4a
+Size (chasen-2.3.3.20030821.patch) = 3496 bytes
+SHA1 (chasen-2.3.3.20030822.patch) = 0728884dcdf6983a3e32774111e7996a43008722
+Size (chasen-2.3.3.20030822.patch) = 2007 bytes
+SHA1 (chasen-2.3.3.20031024.patch) = e53446124c219a883d39f627b243c1ebc241dfd8
+Size (chasen-2.3.3.20031024.patch) = 1095 bytes
+SHA1 (patch-ai) = 7a9ffd640c275c1361e34591d08c1ce519df5dc7
+SHA1 (patch-aj) = 8c440610abaa31b22950ef41149736feefc968e8
+SHA1 (patch-ak) = 05afdb444ef6a59cb2f9c86617b6dba8332ac5f3
diff --git a/textproc/chasen-base/patches/patch-ag b/textproc/chasen-base/patches/patch-ag
deleted file mode 100644
index 0b8ba1c8a44..00000000000
--- a/textproc/chasen-base/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/08/25 21:51:14 jlam Exp $
-
---- Makefile.am.orig	Sat Feb  2 10:08:19 2002
-+++ Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
- 
--SUBDIRS = doc prolog lib chasen mkchadic
-+SUBDIRS = doc lib chasen mkchadic
- EXTRA_DIRS = perl
- 
- EXTRA_DIST = README-ja INSTALL-ja NEWS-ja chasen.spec
diff --git a/textproc/chasen-base/patches/patch-ah b/textproc/chasen-base/patches/patch-ah
deleted file mode 100644
index 5e2812ae186..00000000000
--- a/textproc/chasen-base/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/08/25 21:51:14 jlam Exp $
-
---- Makefile.in.orig	Fri Feb  8 15:31:20 2002
-+++ Makefile.in
-@@ -80,7 +80,7 @@
- 
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
- 
--SUBDIRS = doc prolog lib chasen mkchadic
-+SUBDIRS = doc lib chasen mkchadic
- EXTRA_DIRS = perl
- 
- EXTRA_DIST = README-ja INSTALL-ja NEWS-ja chasen.spec
diff --git a/textproc/chasen-base/patches/patch-ai b/textproc/chasen-base/patches/patch-ai
index 9d788fa1283..cad93b2e7ae 100644
--- a/textproc/chasen-base/patches/patch-ai
+++ b/textproc/chasen-base/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2002/08/25 21:51:14 jlam Exp $
+$NetBSD: patch-ai,v 1.3 2004/05/06 13:32:38 taca Exp $
 
---- chasen-config.in.orig	Thu Mar  1 08:54:17 2001
+--- chasen-config.in.orig	2003-06-10 16:39:01.000000000 +0900
 +++ chasen-config.in
-@@ -92,7 +92,7 @@
+@@ -88,7 +88,7 @@ while test $# -gt 0; do
         	;;
  
      --mkchadic)
diff --git a/textproc/chasen-base/patches/patch-aj b/textproc/chasen-base/patches/patch-aj
index 4d8b571386f..ff03bbd54b4 100644
--- a/textproc/chasen-base/patches/patch-aj
+++ b/textproc/chasen-base/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2002/08/25 21:51:14 jlam Exp $
+$NetBSD: patch-aj,v 1.3 2004/05/06 13:32:38 taca Exp $
 
---- mkchadic/Makefile.am.orig	Sun Jun 24 15:19:02 2001
+--- mkchadic/Makefile.am.orig	2003-07-12 18:18:58.000000000 +0900
 +++ mkchadic/Makefile.am
-@@ -2,7 +2,7 @@
- LDADD = $(top_builddir)/lib/libchasen.la
- DEFS = -DRCPATH=\""$(RCPATH)\"" @DEFS@
+@@ -5,7 +5,7 @@ DEFS = -DRCPATH=\""$(RCPATH)\"" @DEFS@
+ LINK = $(LIBTOOL) --mode=link \
+ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
  
 -pkglibexecdir = ${libexecdir}/chasen
 +pkglibexecdir = ${sbindir}
- pkglibexec_PROGRAMS = convdic makeint makemat mkary pattool sortdic convary
+ pkglibexec_PROGRAMS = makemat makeda
  
- convdic_SOURCES =  convdic.c
+ makemat_SOURCES = makemat.c
diff --git a/textproc/chasen-base/patches/patch-ak b/textproc/chasen-base/patches/patch-ak
index f3078d588ef..16a567556ff 100644
--- a/textproc/chasen-base/patches/patch-ak
+++ b/textproc/chasen-base/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.2 2002/08/25 21:51:14 jlam Exp $
+$NetBSD: patch-ak,v 1.3 2004/05/06 13:32:38 taca Exp $
 
---- mkchadic/Makefile.in.orig	Fri Feb  8 15:31:51 2002
+--- mkchadic/Makefile.in.orig	2003-08-15 13:00:56.000000000 +0900
 +++ mkchadic/Makefile.in
-@@ -82,7 +82,7 @@
- LDADD = $(top_builddir)/lib/libchasen.la
- DEFS = -DRCPATH=\""$(RCPATH)\"" @DEFS@
+@@ -96,7 +96,7 @@ LINK = $(LIBTOOL) --mode=link \
+ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+ 
  
 -pkglibexecdir = ${libexecdir}/chasen
 +pkglibexecdir = ${sbindir}
- pkglibexec_PROGRAMS = convdic makeint makemat mkary pattool sortdic convary
+ pkglibexec_PROGRAMS = makemat makeda
  
- convdic_SOURCES = convdic.c
+ makemat_SOURCES = makemat.c