Move conversion tables from canna-server to canna-lib.

Submitted by:	nork (long time ago)
Feature safe:	yes

6 files changed, 78 insertions, 52 deletions

diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index d963790e21c5..2bde5f775c2e 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	canna
 PORTVERSION=	3.7p3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	canna/9565/
diff --git a/japanese/canna-lib/files/patch-Imakefile b/japanese/canna-lib/files/patch-Imakefile
index 122c2663323b..e5209ca481d2 100644
--- a/japanese/canna-lib/files/patch-Imakefile
+++ b/japanese/canna-lib/files/patch-Imakefile
@@ -1,6 +1,15 @@
 --- Imakefile.orig	2004-05-20 00:39:22.000000000 +0900
-+++ Imakefile	2008-09-07 15:25:52.000000000 +0900
-@@ -129,7 +129,7 @@
++++ Imakefile	2009-04-13 02:34:56.483862702 +0900
+@@ -122,14 +122,14 @@
+ 
+ CANNAROOT = .
+ SERVERDIR = server dic/phono dic/ideo
+-CLIENTDIR = cmd dic/phono misc
+-SGSDIR = canna lib
++CLIENTDIR = cmd
++SGSDIR = canna lib dic/phono misc
+ MOSTDIR = lib canna server cmd dic/phono misc doc
+ 
  install:: mkbindir mklibdir mkdicdir mkerrdir
  instserver:: mkdicdir mkerrdir
  instclient:: mkbindir mkdicdir
diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist
index ad94f923df95..26ec14a5ba84 100644
--- a/japanese/canna-lib/pkg-plist
+++ b/japanese/canna-lib/pkg-plist
@@ -17,4 +17,53 @@ lib/libcanna.so.1
 lib/libcanna16.a
 lib/libcanna16.so
 lib/libcanna16.so.1
+%%DATADIR%%/default.canna
+%%DATADIR%%/dic/default.cbp
+%%DATADIR%%/dic/english.cbp
+%%DATADIR%%/dic/jdaemon.cbp
+%%DATADIR%%/dic/just.cbp
+%%DATADIR%%/dic/kaisoku.cbp
+%%DATADIR%%/dic/kana.cbp
+%%DATADIR%%/dic/lan5.cbp
+%%DATADIR%%/dic/matsu.cbp
+%%DATADIR%%/dic/newjis.cbp
+%%DATADIR%%/dic/romaji.cbp
+%%DATADIR%%/dic/sokuon.cbp
+%%DATADIR%%/dic/tut.cbp
+%%DATADIR%%/dic/vje.cbp
+%%DATADIR%%/dic/wx2+.cbp
+%%DATADIR%%/sample/1.1.canna
+%%DATADIR%%/sample/1.2.canna
+%%DATADIR%%/sample/fixer.canna
+%%DATADIR%%/sample/jdemon.canna
+%%DATADIR%%/sample/just.canna
+%%DATADIR%%/sample/lan5.canna
+%%DATADIR%%/sample/matsu.canna
+%%DATADIR%%/sample/modes.canna
+%%DATADIR%%/sample/sample.canna
+%%DATADIR%%/sample/skk.canna
+%%DATADIR%%/sample/src/default.ctd
+%%DATADIR%%/sample/src/english.ctd
+%%DATADIR%%/sample/src/is.c
+%%DATADIR%%/sample/src/jdaemon.ctd
+%%DATADIR%%/sample/src/just.ctd
+%%DATADIR%%/sample/src/kaisoku.ctd
+%%DATADIR%%/sample/src/kana.ctd
+%%DATADIR%%/sample/src/lan5.ctd
+%%DATADIR%%/sample/src/matsu.ctd
+%%DATADIR%%/sample/src/newjis.ctd
+%%DATADIR%%/sample/src/romaji.ctd
+%%DATADIR%%/sample/src/sokuon.ctd
+%%DATADIR%%/sample/src/tut.ctd
+%%DATADIR%%/sample/src/vje.ctd
+%%DATADIR%%/sample/src/wx2+.ctd
+%%DATADIR%%/sample/tut.canna
+%%DATADIR%%/sample/unix.canna
+%%DATADIR%%/sample/verbose.canna
+%%DATADIR%%/sample/vje.canna
+%%DATADIR%%/sample/wx2+.canna
 @dirrm include/canna
+@dirrm %%DATADIR%%/sample/src
+@dirrm %%DATADIR%%/sample
+@dirrmtry %%DATADIR%%/dic
+@dirrmtry %%DATADIR%%
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index fe050661d10a..4644d812e7dd 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	canna
 PORTVERSION=	3.7p3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	canna/9565/
diff --git a/japanese/canna-server/files/patch-Imakefile b/japanese/canna-server/files/patch-Imakefile
new file mode 100644
index 000000000000..c25e771ea5a5
--- /dev/null
+++ b/japanese/canna-server/files/patch-Imakefile
@@ -0,0 +1,15 @@
+--- Imakefile.orig	2004-05-20 00:39:22.000000000 +0900
++++ Imakefile	2009-04-13 02:58:31.905200512 +0900
+@@ -121,9 +121,9 @@
+ 	$(CANNAROOT)/confwrapper mkenv CFLAGS $(PURE_CFLAGS) >> $@
+ 
+ CANNAROOT = .
+-SERVERDIR = server dic/phono dic/ideo
+-CLIENTDIR = cmd dic/phono misc
+-SGSDIR = canna lib
++SERVERDIR = server dic/ideo
++CLIENTDIR = cmd
++SGSDIR = canna lib dic/phono misc
+ MOSTDIR = lib canna server cmd dic/phono misc doc
+ 
+ install:: mkbindir mklibdir mkdicdir mkerrdir
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index af75614f85f4..0e5c383b8784 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -30,7 +30,6 @@ bin/rmdic
 bin/splitword
 bin/syncdic
 bin/wtoc
-%%DATADIR%%/default.canna
 %%DATADIR%%/dic/canna/bushu.cld
 %%DATADIR%%/dic/canna/chimei.ctd
 %%DATADIR%%/dic/canna/dics.dir
@@ -46,55 +45,9 @@ bin/wtoc
 %%DATADIR%%/dic/canna/number.ctd
 %%DATADIR%%/dic/canna/software.ctd
 %%DATADIR%%/dic/canna/suffix.ctd
-%%DATADIR%%/dic/default.cbp
-%%DATADIR%%/dic/english.cbp
-%%DATADIR%%/dic/jdaemon.cbp
-%%DATADIR%%/dic/just.cbp
-%%DATADIR%%/dic/kaisoku.cbp
-%%DATADIR%%/dic/kana.cbp
-%%DATADIR%%/dic/lan5.cbp
-%%DATADIR%%/dic/matsu.cbp
-%%DATADIR%%/dic/newjis.cbp
-%%DATADIR%%/dic/romaji.cbp
-%%DATADIR%%/dic/sokuon.cbp
-%%DATADIR%%/dic/tut.cbp
-%%DATADIR%%/dic/vje.cbp
-%%DATADIR%%/dic/wx2+.cbp
-%%DATADIR%%/sample/1.1.canna
-%%DATADIR%%/sample/1.2.canna
-%%DATADIR%%/sample/fixer.canna
-%%DATADIR%%/sample/jdemon.canna
-%%DATADIR%%/sample/just.canna
-%%DATADIR%%/sample/lan5.canna
-%%DATADIR%%/sample/matsu.canna
-%%DATADIR%%/sample/modes.canna
-%%DATADIR%%/sample/sample.canna
-%%DATADIR%%/sample/skk.canna
-%%DATADIR%%/sample/src/default.ctd
-%%DATADIR%%/sample/src/english.ctd
-%%DATADIR%%/sample/src/is.c
-%%DATADIR%%/sample/src/jdaemon.ctd
-%%DATADIR%%/sample/src/just.ctd
-%%DATADIR%%/sample/src/kaisoku.ctd
-%%DATADIR%%/sample/src/kana.ctd
-%%DATADIR%%/sample/src/lan5.ctd
-%%DATADIR%%/sample/src/matsu.ctd
-%%DATADIR%%/sample/src/newjis.ctd
-%%DATADIR%%/sample/src/romaji.ctd
-%%DATADIR%%/sample/src/sokuon.ctd
-%%DATADIR%%/sample/src/tut.ctd
-%%DATADIR%%/sample/src/vje.ctd
-%%DATADIR%%/sample/src/wx2+.ctd
-%%DATADIR%%/sample/tut.canna
-%%DATADIR%%/sample/unix.canna
-%%DATADIR%%/sample/verbose.canna
-%%DATADIR%%/sample/vje.canna
-%%DATADIR%%/sample/wx2+.canna
 sbin/cannaserver
 sbin/cannakill
-@dirrm %%DATADIR%%/sample/src
-@dirrm %%DATADIR%%/sample
-@dirrm %%DATADIR%%/dic/canna
+@dirrmtry %%DATADIR%%/dic/canna
 @dirrmtry %%DATADIR%%/dic/user/user
 @dirrmtry %%DATADIR%%/dic/user
 @dirrmtry %%DATADIR%%/dic/group