- Canna doesn't use /var/run any longer.

- Improve the startup script.
- Modify the pkg-plist so that pkg_delete won't complain even when
  user dictionaries are installed.
- Use correct syntax for chown (bin.bin -> bin:bin)
Credits:	nyan@jp.FreeBSD.org
		nork@FreeBSD.org
		takachan@running-dog.net
		knu@iDaemons.org

1 files changed, 6 insertions, 9 deletions

diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index 5b2eecaf85e5..ca5fbe3b89ce 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -109,18 +109,15 @@ lib/libcanna16.so
 lib/libcanna16.so.1
 sbin/cannaserver
 sbin/cannakill
-@exec mkdir /var/run/canna
-@exec chown bin.bin /var/run/canna
 @exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group
-@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
+@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
 @exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
-@unexec /bin/rmdir /var/run/canna
 @dirrm lib/canna/sample/src
 @dirrm lib/canna/sample
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
-@dirrm lib/canna/dic/group
 @dirrm lib/canna/dic/canna
-@dirrm lib/canna/dic
-@dirrm lib/canna
 @dirrm include/canna
+@unexec rmdir %D/lib/canna/dic/user/user 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/user      2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/group     2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic           2>/dev/null || true
+@unexec rmdir %D/lib/canna               2>/dev/null || true