5 files changed, 17 insertions, 16 deletions

diff --git a/japanese/cannadic/Makefile b/japanese/cannadic/Makefile
index 5e56a0539bb5..f225f24f2b0f 100644
--- a/japanese/cannadic/Makefile
+++ b/japanese/cannadic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cannadic
 PORTVERSION=	0.95c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://cannadic.oucrc.org/
 
@@ -18,18 +18,21 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/cannaserver:${PORTSDIR}/japanese/canna-server
 BUILD_DEPENDS=	crxdic:${PORTSDIR}/japanese/canna-server
 
 ALL_TARGET=	maindic
+SUB_FILES=	README.FreeBSD pkg-message
+PORTDOCS=	README.ja README.FreeBSD
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 DICS=		gcanna.cbd gcanna.cld gcannaf.ctd
 DICSFILE=	dics.dir.gpl_canna
-DICDIR=		${PREFIX}/share/canna/dic/canna
+DICDIR=		${LOCALBASE}/share/canna/dic/canna
 
 do-install:
-	cd ${WRKSRC};\
+	cd ${WRKSRC} && \
 	${INSTALL} -c -g bin -m 664 -o bin ${DICS} ${DICSFILE} ${DICDIR}
+	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${WRKSRC}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/japanese/cannadic/files/README.FreeBSD b/japanese/cannadic/files/README.FreeBSD.in
index 8eae58d11c6a..79d3dcf4c4f7 100644
--- a/japanese/cannadic/files/README.FreeBSD
+++ b/japanese/cannadic/files/README.FreeBSD.in
@@ -4,23 +4,23 @@
 手動で行わなければならないことを，かんな辞書のマニュアルから抜粋したものです．
 
 
-1) 辞書登録ファイルの ${LOCALBASE}/share/canna/dic/canna/dics.dir に、
-   ${LOCALBASE}/share/canna/dic/canna/dics.dir.gpl_canna の内容を追加します。
+1) 辞書登録ファイルの %%LOCALBASE%%/share/canna/dic/canna/dics.dir に、
+   %%LOCALBASE%%/share/canna/dic/canna/dics.dir.gpl_canna の内容を追加します。
 
-# cd /usr/local/share/canna/dic/canna
+# cd %%LOCALBASE%%/share/canna/dic/canna
 # cp dics.dir dics.dir.orig
 # cat dics.dir.gpl_canna >> dics.dir
 
 2) cannaserver を停止，起動します。
 
 (かんなサーバ停止)
-# /usr/local/etc/rc.d/canna.sh stop
+# %%LOCALBASE%%/etc/rc.d/canna stop
 
 (cannaserverが停止していることを確認してください。停止していなければ
  killコマンドでプロセスを停止させてください)
 
 (かんなサーバ起動)
-# /usr/local/etc/rc.d/canna.sh start
+# %%LOCALBASE%%/etc/rc.d/canna start
 
 3) ユーザ権限に戻って、ホームディレクトリに存在する各ユーザの .canna の
    (use-dictionary ...) の部分に "gcanna" "gcannaf" の二行を付け足して
diff --git a/japanese/cannadic/files/pkg-message.in b/japanese/cannadic/files/pkg-message.in
new file mode 100644
index 000000000000..463f2fc01691
--- /dev/null
+++ b/japanese/cannadic/files/pkg-message.in
@@ -0,0 +1,3 @@
+
+You should do set up after the installation.
+See %%LOCALBASE%%/share/doc/cannadic/README.FreeBSD
diff --git a/japanese/cannadic/pkg-message b/japanese/cannadic/pkg-message
deleted file mode 100644
index 40ca3a0e13f8..000000000000
--- a/japanese/cannadic/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-
-You should do set up after the installation.
-See ${LOCALBASE}/share/doc/cannadic/README.FreeBSD
diff --git a/japanese/cannadic/pkg-plist b/japanese/cannadic/pkg-plist
index 6ec9037a068d..44051a75eebd 100644
--- a/japanese/cannadic/pkg-plist
+++ b/japanese/cannadic/pkg-plist
@@ -1,7 +1,5 @@
+@comment $FreeBSD$
 share/canna/dic/canna/dics.dir.gpl_canna
 share/canna/dic/canna/gcanna.cld
 share/canna/dic/canna/gcanna.cbd
 share/canna/dic/canna/gcannaf.ctd
-%%PORTDOCS%%share/doc/cannadic/README.ja
-%%PORTDOCS%%share/doc/cannadic/README.FreeBSD
-%%PORTDOCS%%@dirrm share/doc/cannadic