Upgrade to 2.3.1.

Reminded by:	 MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>

4 files changed, 34 insertions, 35 deletions

diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index db625df6cc65..0bc7db8b885c 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -1,42 +1,29 @@
 # New ports collection makefile for:	kakasi
-# Version required:		2.2.5
+# Version required:		2.3.1
 # Date created:			26 Mar. 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kakasi-2.2.5
-PKGNAME=	ja-kakasi-2.2.5
+DISTNAME=	kakasi-2.3.1
+PKGNAME=	ja-kakasi-2.3.1
 CATEGORIES=	japanese
-MASTER_SITES=  ${MASTER_SITE_PORTS_JP}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} kakasidict.940620.gz \
-		kakasi-ext.tar.gz
+MASTER_SITES=  ftp://kakasi.namazu.org/pub/kakasi/
 
 MAINTAINER=	max@FreeBSD.org
 
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX} kakasi-ext.tar.gz
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
-PATCH_DIST_STRIP=	-p1
+GNU_CONFIGURE=	yes
+
 MANLANG=		ja
 MAN1=			kakasi.1
-post-extract:
-	@${GZCAT} ${DISTDIR}/kakasidict.940620.gz > ${WRKSRC}/kakasidict
-
-pre-patch:
-	@${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/kakasi-ext/patch.kakasi-2.2.5
 
 post-install:
-.for f in mkkanwa atoc-conv rdic-conv
-	@/usr/bin/strip ${PREFIX}/lib/kakasi/$f
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/kakasi.1 ${PREFIX}/man/${MANLANG}/man1
+	@${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/${MANLANG}/man1
 .if !defined(NOPORTDOCS)
 	${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_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/kakasi
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/kakasi/distinfo b/japanese/kakasi/distinfo
index a6e381d4528b..17704002da63 100644
--- a/japanese/kakasi/distinfo
+++ b/japanese/kakasi/distinfo
@@ -1,3 +1 @@
-MD5 (kakasi-2.2.5.tar.gz) = b65739665a2e43d2dbf4c1f5b2e5ad0e
-MD5 (kakasidict.940620.gz) = 33fc2427d7f3d3787d6bf1ef23c3f8c9
-MD5 (kakasi-ext.tar.gz) = 47837bb1777f68bd8f6c4309616b3807
+MD5 (kakasi-2.3.1.tar.gz) = 74057ccb3fb03533fcd2ba6e71a1549f
diff --git a/japanese/kakasi/pkg-descr b/japanese/kakasi/pkg-descr
index 563904469434..be892b340112 100644
--- a/japanese/kakasi/pkg-descr
+++ b/japanese/kakasi/pkg-descr
@@ -4,4 +4,6 @@ read Japanese documents.  By converting documents written in kanji to
 Roman alphabetic Japanese, those documents can be viewed on systems
 without Japanese language capability.
 
-- Masafumi
+WWW: http://kakasi.namazu.org/
+
+- Max
diff --git a/japanese/kakasi/pkg-plist b/japanese/kakasi/pkg-plist
index f65a89c08622..fccce1337085 100644
--- a/japanese/kakasi/pkg-plist
+++ b/japanese/kakasi/pkg-plist
@@ -1,12 +1,24 @@
+bin/atoc_conv
 bin/kakasi
-lib/kakasi/rdic-conv
-lib/kakasi/atoc-conv
-lib/kakasi/mkkanwa
-lib/kakasi/itaijidict
-lib/kakasi/kanwadict
-share/doc/kakasi/README
-share/doc/kakasi/README.jpn
-share/doc/kakasi/kakasi-ext.doc
+bin/mkkanwa
+bin/rdic_conv
+bin/wx2_conv
+include/libkakasi.h
+lib/libkakasi.a
+lib/libkakasi.la
+lib/libkakasi.so
+lib/libkakasi.so.2
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+share/doc/kakasi/ChangeLog.lib
 share/doc/kakasi/JISYO
+share/doc/kakasi/README.BeOS
+share/doc/kakasi/README.OS2
+share/doc/kakasi/README.lib
+share/doc/kakasi/README.wakati
+share/doc/kakasi/kakasi.1
+share/doc/kakasi/kakasi.cat
 @dirrm share/doc/kakasi
-@dirrm lib/kakasi
+share/kakasi/itaijidict
+share/kakasi/kanwadict
+@dirrm share/kakasi