8 files changed, 19 insertions, 35 deletions

diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile
index 13deef4c6b5e..345b40fd435d 100644
--- a/japanese/chasen-base/Makefile
+++ b/japanese/chasen-base/Makefile
@@ -7,14 +7,14 @@
 #
 
 PORTNAME=	chasen
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://chasen.aist-nara.ac.jp/stable/chasen/
 PKGNAMESUFFIX=	-base
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	chasen-${PORTVERSION}-nmz.diff
-PATCH_DIST_STRIP=	-p1
+PATCHFILES=	chasen-2.3.3.20030821.patch chasen-2.3.3.20030822.patch chasen-2.3.3.20031024.patch
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese Morphological Analysis System
@@ -22,6 +22,7 @@ COMMENT=	Japanese Morphological Analysis System
 BUILD_DEPENDS=	${LOCALBASE}/include/darts.h:${PORTSDIR}/devel/darts
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-darts=${LOCALBASE}/include --with-libiconv=${LOCALBASE}
 #USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/japanese/chasen-base/distinfo b/japanese/chasen-base/distinfo
index c34649997e39..a6afe6572d3f 100644
--- a/japanese/chasen-base/distinfo
+++ b/japanese/chasen-base/distinfo
@@ -1,4 +1,8 @@
-MD5 (chasen-2.3.0.tar.gz) = 2df887bca632b9311ca4b22f74439553
-SIZE (chasen-2.3.0.tar.gz) = 407097
-MD5 (chasen-2.3.0-nmz.diff) = dec1708511a1aa7d0854da788ef655e7
-SIZE (chasen-2.3.0-nmz.diff) = 2707
+MD5 (chasen-2.3.3.tar.gz) = 629e90d9490bac95606c38c2d344cc5f
+SIZE (chasen-2.3.3.tar.gz) = 425981
+MD5 (chasen-2.3.3.20030821.patch) = 44b14a50c8269f982fc0d59cb580ecc5
+SIZE (chasen-2.3.3.20030821.patch) = 3496
+MD5 (chasen-2.3.3.20030822.patch) = 22466f08c3916b415d222508fdcc9bbe
+SIZE (chasen-2.3.3.20030822.patch) = 2007
+MD5 (chasen-2.3.3.20031024.patch) = 1b8e836d5ed378e6f8b7d43fa8cf7b68
+SIZE (chasen-2.3.3.20031024.patch) = 1095
diff --git a/japanese/chasen-base/pkg-plist b/japanese/chasen-base/pkg-plist
index 4857987550b6..accf6ff18300 100644
--- a/japanese/chasen-base/pkg-plist
+++ b/japanese/chasen-base/pkg-plist
@@ -5,14 +5,8 @@ include/chasen.h
 lib/libchasen.a
 lib/libchasen.so
 lib/libchasen.so.0
-libexec/chasen/convary
-libexec/chasen/convdic
 libexec/chasen/makeda
-libexec/chasen/makeint
 libexec/chasen/makemat
-libexec/chasen/mkary
-libexec/chasen/pattool
-libexec/chasen/sortdic
 @dirrm libexec/chasen
 @exec mkdir -p %D/share/chasen/dic >/dev/null 2>&1 || true
 @dirrm share/chasen/dic
diff --git a/japanese/chasen/Makefile b/japanese/chasen/Makefile
index 75ba9e42f304..6d25249bf7c8 100644
--- a/japanese/chasen/Makefile
+++ b/japanese/chasen/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	chasen
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index bf889dc803e6..09a5c86dca66 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -7,21 +7,17 @@
 #
 
 PORTNAME=	ipadic
-PORTVERSION=	2.5.1.1
+PORTVERSION=	2.7.0
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://chasen.aist-nara.ac.jp/stable/ipadic/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese Morphological Dictionary for ChaSen
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${PORTNAME}-${PORTVERSION}.diff
-PATCH_DIST_STRIP=	-p1
-
 BUILD_DEPENDS=	chasen:${PORTSDIR}/japanese/chasen-base
 
 GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-dicdir=${PREFIX}/share/chasen/dic
 USE_LIBTOOL_VER=13
 
 post-install:
diff --git a/japanese/ipadic/distinfo b/japanese/ipadic/distinfo
index 4ef93c951ec9..81c6057216c5 100644
--- a/japanese/ipadic/distinfo
+++ b/japanese/ipadic/distinfo
@@ -1,4 +1,2 @@
-MD5 (ipadic-2.5.1.tar.gz) = 18c37ad9d02aa79e9f9ce752ee4ecea6
-SIZE (ipadic-2.5.1.tar.gz) = 4212891
-MD5 (ipadic-2.5.1.1.diff) = dde7bd70e77cd48644ff35ddde2bb744
-SIZE (ipadic-2.5.1.1.diff) = 5352
+MD5 (ipadic-2.7.0.tar.gz) = f36d315cae25b086a889b7090c674977
+SIZE (ipadic-2.7.0.tar.gz) = 4300102
diff --git a/japanese/ipadic/pkg-plist b/japanese/ipadic/pkg-plist
index 2b92b2b4d740..f5b3e5b4d124 100644
--- a/japanese/ipadic/pkg-plist
+++ b/japanese/ipadic/pkg-plist
@@ -1,18 +1,9 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2001/01/10 14:47:47 taca Exp $
-@unexec install-info --delete --info-dir=%D/info %D/info/ipadic-ja.info
-info/ipadic-ja.info
-info/ipadic-ja.info-1
-info/ipadic-ja.info-2
-info/ipadic-ja.info-3
-@exec install-info --info-dir=%D/info %D/info/ipadic-ja.info
 share/chasen/dic/ipadic/Makefile.bat
 share/chasen/dic/ipadic/cforms.cha
-share/chasen/dic/ipadic/chadic.ary
 share/chasen/dic/ipadic/chadic.da
 share/chasen/dic/ipadic/chadic.dat
-share/chasen/dic/ipadic/chadic.int
 share/chasen/dic/ipadic/chadic.lex
-share/chasen/dic/ipadic/chadic.pat
 share/chasen/dic/ipadic/chasenrc
 @unexec if cmp -s %D/etc/chasenrc %D/share/chasen/dic/ipadic/chasenrc.example; then rm -f %D/etc/chasenrc; else true; fi
 share/chasen/dic/ipadic/chasenrc.example
diff --git a/japanese/p5-Text-ChaSen/Makefile b/japanese/p5-Text-ChaSen/Makefile
index e02b444db1e5..9ef404652400 100644
--- a/japanese/p5-Text-ChaSen/Makefile
+++ b/japanese/p5-Text-ChaSen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Text-ChaSen
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	http://chasen.aist-nara.ac.jp/stable/chasen/
 DISTNAME=	chasen-${CHASEN_VERSION}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	chasen.0:${PORTSDIR}/japanese/chasen-base
 
 MD5_FILE=	${.CURDIR}/../chasen-base/distinfo
 
-CHASEN_VERSION=	2.3.0
+CHASEN_VERSION=	2.3.3
 
 WRKSRC=		${WRKDIR}/chasen-${CHASEN_VERSION}/perl
 PERL_CONFIGURE=	yes