* Add README.FreeBSD. This contains FreeBSD specific information.

* Remove "modifying dics.dir" codes. It may cause original dics.dir
 broken in some cases.

PR:		ports/34230
Submitted by:	maintainer

4 files changed, 49 insertions, 18 deletions

diff --git a/japanese/cannadic/Makefile b/japanese/cannadic/Makefile
index ef6347356de2..05e88cef2df7 100644
--- a/japanese/cannadic/Makefile
+++ b/japanese/cannadic/Makefile
@@ -7,40 +7,31 @@
 
 PORTNAME=	cannadic
 PORTVERSION=	0.93a
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://cannadic.oucrc.org/
 
 MAINTAINER=	toga@puyo.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/canna/dic/canna/dics.dir:${PORTSDIR}/japanese/Canna
+RUN_DEPENDS=	${LOCALBASE}/sbin/cannaserver:${PORTSDIR}/japanese/Canna
 BUILD_DEPENDS=	crxdic:${PORTSDIR}/japanese/Canna
 
 ALL_TARGET=	maindic subdic
 
 DICS=		gcanna.cbd gcanna.cld gcannaf.cbd gcannaf.cld
-DICSFILE=	dics.dir
-ORIGDICSFILE=	dics.dir.orig
-CANNADICSFILE=	dics.dir.gpl_canna
-CANNASH=	${PREFIX}/etc/rc.d/canna.sh
+DICSFILE=	dics.dir.gpl_canna
 DICDIR=		${PREFIX}/lib/canna/dic/canna
 
 do-install:
 	cd ${WRKSRC};\
-	${CP} ${DICDIR}/${DICSFILE} ./${ORIGDICSFILE}; \
-	${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}
+	${INSTALL} -c -g bin -m 664 -o bin ${DICS} ${DICSFILE} ${DICDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 .endif
 
 post-install:
-	@if [ -e /tmp/.iroha_unix/IROHA ]; then \
-	   ${ECHO} "Restarting Canna server..."; \
-	   ${CANNASH} stop > /dev/null 2>&1 ; \
-	   ${CANNASH} start > /dev/null 2>&1 ; \
-	 fi
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/cannadic/files/README.FreeBSD b/japanese/cannadic/files/README.FreeBSD
new file mode 100644
index 000000000000..f331f37bcb28
--- /dev/null
+++ b/japanese/cannadic/files/README.FreeBSD
@@ -0,0 +1,41 @@
+かんな辞書 FreeBSD ports インストールマニュアル
+
+このマニュアルは，かんな辞書を FreeBSD ports でインストールする場合に，
+手動で行わなければならないことを，かんな辞書のマニュアルから抜粋したものです．
+
+
+1) 辞書登録ファイルの ${LOCALBASE}/lib/canna/dic/canna/dics.dir に、
+   ${LOCALBASE}/lib/canna/dic/canna/dics.dir.gpl_canna の内容を追加します。
+
+# cd /usr/local/lib/canna/dic/canna
+# mv dics.dir dics.dir.orig
+# cat dics.dir.orig dics.dir.gpl_canna > dics.dir
+
+2) cannaserver を再起動します。
+
+(かんなサーバ再起動)
+# /usr/local/etc/rc.d/canna.sh stop
+# /usr/local/etc/rc.d/canna.sh start
+
+3) ユーザ権限に戻って、ホームディレクトリに存在する各ユーザの .canna の
+   (use-dictionary ...) の部分に "gcanna" "gcannaf" の二行を付け足して
+   ください。抜粋するとこんな感じです。
+
+(use-dictionary
+ "gcanna"  ← これを追加
+ "gcannaf"  ← これを追加
+ ;;"iroha" ← 上位互換なので iroha はコメントアウトしてもかまいません
+ "fuzokugo"
+ "hojomwd"
+ "hojoswd"
+ :bushu "bushu"
+ :user "user"
+ )
+
+4) 最後に頻度辞書を作成します。既に同名のユーザ辞書がインストールされている
+   場合、辞書を上書きするかどうか質問されます。上書きしてもかまわなければ
+   yes を選択してください。
+
+$ mkdic -fq gcanna
+Personal learning file of dictionary "gcanna" exists. Do you overwrite it ? (y/n)
+
diff --git a/japanese/cannadic/pkg-message b/japanese/cannadic/pkg-message
index c580d03a3beb..40ca3a0e13f8 100644
--- a/japanese/cannadic/pkg-message
+++ b/japanese/cannadic/pkg-message
@@ -1,3 +1,3 @@
 
-All users should do set up after the installation.
-See ${LOCALBASE}/share/doc/cannadic/README.
+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 0304ede76e3f..d43e8b5f1f17 100644
--- a/japanese/cannadic/pkg-plist
+++ b/japanese/cannadic/pkg-plist
@@ -1,9 +1,8 @@
 lib/canna/dic/canna/dics.dir.gpl_canna
-@exec (echo "Updating %D/lib/canna/dic/canna/dics.dir" ; mv %D/lib/canna/dic/canna/dics.dir %D/lib/canna/dic/canna/dics.dir.orig ; cat %D/lib/canna/dic/canna/dics.dir.orig %D/lib/canna/dic/canna/dics.dir.gpl_canna > %D/lib/canna/dic/canna/dics.dir ; chown bin:bin %D/lib/canna/dic/canna/dics.dir ; chmod 464 %D/lib/canna/dic/canna/dics.dir ; if [ -e /tmp/.iroha_unix/IROHA ] ; then echo "Restarting Canna server..." ; %D/etc/rc.d/canna.sh stop > /dev/null 2>&1; %D/etc/rc.d/canna.sh start > /dev/null 2>&1 ; fi)
-@unexec (echo "Restoring old %D/lib/canna/dic/canna/dics.dir..." ; mv %D/lib/canna/dic/canna/dics.dir.orig %D/lib/canna/dic/canna/dics.dir ; if [ -e /tmp/.iroha_unix/IROHA ]; then echo "Restarting Canna server..." ; %D/etc/rc.d/canna.sh stop > /dev/null 2>&1 ; %D/etc/rc.d/canna.sh start > /dev/null 2>&1 ; fi)
 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%%share/doc/cannadic/README.FreeBSD
 %%PORTDOCS%%@dirrm share/doc/cannadic