Update to 0.93a.

PR:		ports/33871
Submitted by:	maintainer

6 files changed, 15 insertions, 38 deletions

diff --git a/japanese/cannadic/Makefile b/japanese/cannadic/Makefile
index e7c0dae6a7f5..ef6347356de2 100644
--- a/japanese/cannadic/Makefile
+++ b/japanese/cannadic/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	cannadic
-PORTVERSION=	0.92
-PORTREVISION=	1
+PORTVERSION=	0.93a
 CATEGORIES=	japanese
-MASTER_SITES=	http://cgi3.osk.3web.ne.jp/~nowaki/computer/
+MASTER_SITES=	http://cannadic.oucrc.org/
 
 MAINTAINER=	toga@puyo.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/canna/dic/canna/dics.dir:${PORTSDIR}/japanese/Canna
-BUILD_DEPENDS=	mkbindic:${PORTSDIR}/japanese/Canna
+BUILD_DEPENDS=	crxdic:${PORTSDIR}/japanese/Canna
 
-ALL_TARGET=	bindic
+ALL_TARGET=	maindic subdic
 
 DICS=		gcanna.cbd gcanna.cld gcannaf.cbd gcannaf.cld
 DICSFILE=	dics.dir
@@ -31,6 +30,10 @@ do-install:
 	${CAT} ./${ORIGDICSFILE} ./${CANNADICSFILE} > ./${DICSFILE}; \
 	${INSTALL} -c -g bin -m 664 -o bin ${DICS} ${DICDIR} ; \
 	${INSTALL} -c -g bin -m 664 -o bin ${DICSFILE} ${CANNADICSFILE} ${ORIGDICSFILE} ${DICDIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
 post-install:
 	@if [ -e /tmp/.iroha_unix/IROHA ]; then \
diff --git a/japanese/cannadic/distinfo b/japanese/cannadic/distinfo
index 268ffad4fb25..be46ce9428f0 100644
--- a/japanese/cannadic/distinfo
+++ b/japanese/cannadic/distinfo
@@ -1 +1 @@
-MD5 (cannadic-0.92.tar.gz) = 96b1a11aee2aa0b021986f39c2c111df
+MD5 (cannadic-0.93a.tar.gz) = 74fcb6878db0554f9c11fa05649292f7
diff --git a/japanese/cannadic/files/patch-aa b/japanese/cannadic/files/patch-aa
deleted file mode 100644
index c3c737522514..000000000000
--- a/japanese/cannadic/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	Fri Feb 16 03:12:21 2001
-+++ Makefile	Sun Apr  8 08:33:24 2001
-@@ -40,10 +40,6 @@
- 	mkbindic -s ${SUBDIC}
- 
- bindic-old-version:
--	mv ${MAINDIC} ${MAINDIC}.orig
--	sed -e 's/\#KYme/\#KY/g' ${MAINDIC}.orig |\
--	  sed -e 's/\#KYmime/\#KY/' |\
--	  sed -e 's///' > ${MAINDIC}
- 	mkbindic -m ${MAINDIC}
- 	mkbindic -s ${SUBDIC}
- 
diff --git a/japanese/cannadic/pkg-descr b/japanese/cannadic/pkg-descr
index 595fd26bbb87..b17f58e2a8e0 100644
--- a/japanese/cannadic/pkg-descr
+++ b/japanese/cannadic/pkg-descr
@@ -1,12 +1,4 @@
 This is a canna dictionary that contains a lot of words.
-The words come from many dictionaries(pubdic, SKK, kakasi...).
+The words come from many dictionaries(FreeWnn, kakasi...).
 
-After installing, you have to add lines to your .canna.
-(use-dictionary
-	"iroha" ; and more....
-
-	"gcanna"  ; add this!
-	"gcannas" ; add this!
-)
-
-toga@puyo.org
+WWW: http://cannadic.oucrc.org/
diff --git a/japanese/cannadic/pkg-message b/japanese/cannadic/pkg-message
index 4f7b5d2d5933..c580d03a3beb 100644
--- a/japanese/cannadic/pkg-message
+++ b/japanese/cannadic/pkg-message
@@ -1,10 +1,3 @@
 
-After the installation, lines like the following need to be added to
-your .canna.
-
-    (use-dictionary
-      "iroha"; and more....
-      "gcanna"  ; add this!
-      "gcannaf" ; add this!
-    )
-
+All users should do set up after the installation.
+See ${LOCALBASE}/share/doc/cannadic/README.
diff --git a/japanese/cannadic/pkg-plist b/japanese/cannadic/pkg-plist
index c0155c1eec9f..0304ede76e3f 100644
--- a/japanese/cannadic/pkg-plist
+++ b/japanese/cannadic/pkg-plist
@@ -5,3 +5,5 @@ lib/canna/dic/canna/gcanna.cld
 lib/canna/dic/canna/gcanna.cbd
 lib/canna/dic/canna/gcannaf.cld
 lib/canna/dic/canna/gcannaf.cbd
+%%PORTDOCS%%share/doc/cannadic/README
+%%PORTDOCS%%@dirrm share/doc/cannadic