anthy: update to 9100e

6 files changed, 142 insertions, 121 deletions

diff --git a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy-native/native-helpers.patch
index ab7fb42eaa..5746ac18c8 100644
--- a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
+++ b/packages/anthy/anthy-native/native-helpers.patch
@@ -1,3 +1,6 @@
+Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, 
+calctrans and proccorpus.
+
 --- anthy-7811/mkanthydic/Makefile.am~	2006-05-13 18:28:35.000000000 +0900
 +++ anthy-7811/mkanthydic/Makefile.am	2006-06-18 10:56:25.770000000 +0900
 @@ -3,7 +3,7 @@
@@ -29,17 +32,17 @@
 -noinst_PROGRAMS = mkworddic
 +#noinst_PROGRAMS = mkworddic
 +bin_PROGRAMS = mkworddic
- mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
+ mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
  mkworddic_LDADD = ../src-worddic/libanthydic.la
+
+--- anthy-9100e.orig/calctrans/Makefile.am	2008-05-08 15:04:13.000000000 +0200
++++ anthy-9100e/calctrans/Makefile.am	2008-05-08 15:04:24.000000000 +0200
+@@ -3,7 +3,7 @@
+  corpus.3.txt corpus.4.txt corpus.5.txt\
+  corpus_info weak_words
  
---- anthy-7811/mkmatrix/Makefile.am~	2006-06-18 11:29:52.110000000 +0900
-+++ anthy-7811/mkmatrix/Makefile.am	2006-06-18 11:32:30.630000000 +0900
-@@ -1,6 +1,7 @@
- EXTRA_DIST = dep.sorted
+-noinst_PROGRAMS = calctrans proccorpus
++bin_PROGRAMS = calctrans proccorpus
+ INCLUDES = -I$(top_srcdir)/
  
--noinst_PROGRAMS = mkmatrix
-+#noinst_PROGRAMS = mkmatrix
-+bin_PROGRAMS = mkmatrix
- INCLUDES = -I$(top_srcdir)/include
- mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
- mkmatrix_SOURCES = mkmatrix.c
+ calctrans_SOURCES = calctrans.c input_set.c input_set.h corpus.c
diff --git a/packages/anthy/anthy-native_7811.bb b/packages/anthy/anthy-native_9100e.bb
index 38305ddf84..38305ddf84 100644
--- a/packages/anthy/anthy-native_7811.bb
+++ b/packages/anthy/anthy-native_9100e.bb
diff --git a/packages/anthy/anthy/native-helpers.patch b/packages/anthy/anthy/native-helpers.patch
new file mode 100644
index 0000000000..d9ed766363
--- /dev/null
+++ b/packages/anthy/anthy/native-helpers.patch
@@ -0,0 +1,117 @@
+Use native helpers staged by anthy-native.
+
+Index: anthy-9100e/mkanthydic/Makefile.am
+===================================================================
+--- anthy-9100e.orig/mkanthydic/Makefile.am	2008-05-05 00:36:35.000000000 +0200
++++ anthy-9100e/mkanthydic/Makefile.am	2008-05-05 00:37:59.000000000 +0200
+@@ -3,12 +3,12 @@
+ CLEANFILES = anthy.dic
+ INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\"
+ 
+-noinst_PROGRAMS = mkfiledic
+-mkfiledic_SOURCES = mkfiledic.c
+-mkfiledic_LDADD = ../src-diclib/libdiclib.la
++#noinst_PROGRAMS = mkfiledic
++#mkfiledic_SOURCES = mkfiledic.c
++#mkfiledic_LDADD = ../src-diclib/libdiclib.la
+ 
+-anthy.dic : mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep ../calctrans/anthy.cand_info ../calctrans/anthy.trans_info ../calctrans/anthy.corpus_array ../calctrans/anthy.corpus_bucket
+-	./mkfiledic
++anthy.dic : ../mkworddic/anthy.wdic ../depgraph/anthy.dep ../calctrans/anthy.cand_info ../calctrans/anthy.trans_info ../calctrans/anthy.corpus_array ../calctrans/anthy.corpus_bucket
++	mkfiledic
+ 
+ 
+ # To install 
+Index: anthy-9100e/depgraph/Makefile.am
+===================================================================
+--- anthy-9100e.orig/depgraph/Makefile.am	2008-05-05 00:38:48.000000000 +0200
++++ anthy-9100e/depgraph/Makefile.am	2008-05-05 00:40:24.000000000 +0200
+@@ -9,11 +9,11 @@
+ EXTRA_DIST = indepword.txt $(DEPWORDS)
+ 
+ # Generate the dictionary
+-noinst_PROGRAMS = mkdepgraph
+-mkdepgraph_SOURCES = mkdepgraph.c
+-mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
++#noinst_PROGRAMS = mkdepgraph
++#mkdepgraph_SOURCES = mkdepgraph.c
++#mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
+ 
+-anthy.dep : mkdepgraph
+-	./mkdepgraph
++anthy.dep :
++	mkdepgraph
+ 
+ noinst_DATA = anthy.dep
+Index: anthy-9100e/mkworddic/Makefile.am
+===================================================================
+--- anthy-9100e.orig/mkworddic/Makefile.am	2008-05-05 00:40:57.000000000 +0200
++++ anthy-9100e/mkworddic/Makefile.am	2008-05-05 00:41:52.000000000 +0200
+@@ -16,14 +16,14 @@
+  udict dict.args.in
+ 
+ # Generate the dictionary
+-noinst_PROGRAMS = mkworddic
+-mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
+-mkworddic_LDADD = ../src-worddic/libanthydic.la
++#noinst_PROGRAMS = mkworddic
++#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
++#mkworddic_LDADD = ../src-worddic/libanthydic.la
+ 
+ noinst_DATA = anthy.wdic
+ 
+-anthy.wdic : mkworddic
+-	   ./mkworddic -f ./dict.args
++anthy.wdic :
++	   mkworddic -f ./dict.args
+ 
+ 
+ # To install
+Index: anthy-9100e/calctrans/Makefile.am
+===================================================================
+--- anthy-9100e.orig/calctrans/Makefile.am	2008-05-08 15:05:18.000000000 +0200
++++ anthy-9100e/calctrans/Makefile.am	2008-05-08 15:10:40.000000000 +0200
+@@ -15,31 +15,31 @@
+ 
+ update_params:
+ 	rm -f parsed_data2
+-	./proccorpus $(srcdir)/corpus.?.txt > parsed_data
+-	./calctrans parsed_data -o $(srcdir)/corpus_info
+-	./calctrans parsed_data -e -o $(srcdir)/weak_words
++	proccorpus $(srcdir)/corpus.?.txt > parsed_data
++	calctrans parsed_data -o $(srcdir)/corpus_info
++	calctrans parsed_data -e -o $(srcdir)/weak_words
+ 	make do_update_params
+ 
+ update_params0:
+ 	rm -f parsed_data2
+-	./proccorpus $(srcdir)/corpus.0.txt > parsed_data
+-	./calctrans parsed_data -o $(srcdir)/corpus_info
+-	./calctrans parsed_data -e -o $(srcdir)/weak_words
++	proccorpus $(srcdir)/corpus.0.txt > parsed_data
++	calctrans parsed_data -o $(srcdir)/corpus_info
++	calctrans parsed_data -e -o $(srcdir)/weak_words
+ 	make do_update_params
+ 
+ update_params2:
+-	./proccorpus $(srcdir)/corpus.?.txt >> parsed_data2
+-	./calctrans parsed_data parsed_data2 -o $(srcdir)/corpus_info
+-	./calctrans parsed_data parsed_data2 -e -o $(srcdir)/weak_words
++	proccorpus $(srcdir)/corpus.?.txt >> parsed_data2
++	calctrans parsed_data parsed_data2 -o $(srcdir)/corpus_info
++	calctrans parsed_data parsed_data2 -e -o $(srcdir)/weak_words
+ 	make do_update_params
+ 
+ do_update_params:
+-	./calctrans -c $(srcdir)/corpus_info
++	calctrans -c $(srcdir)/corpus_info
+ 	rm -f $(dict_source_files)
+ 	make $(dict_source_files)
+ 
+-$(dict_source_files): $(srcdir)/corpus_info $(srcdir)/weak_words calctrans
+-	./calctrans -c $(srcdir)/corpus_info $(srcdir)/weak_words
++$(dict_source_files): $(srcdir)/corpus_info $(srcdir)/weak_words
++	calctrans -c $(srcdir)/corpus_info $(srcdir)/weak_words
+ 
+ noinst_DATA = $(dict_source_files)
+ CLEANFILES = $(dict_source_files) parsed_data parsed_data2 anthy.feature_info
diff --git a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
deleted file mode 100644
index 86e6513d13..0000000000
--- a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- anthy-7811/mkanthydic/Makefile.am~	2006-05-13 18:28:35.000000000 +0900
-+++ anthy-7811/mkanthydic/Makefile.am	2006-06-18 11:07:19.080000000 +0900
-@@ -3,12 +3,12 @@
- CLEANFILES = anthy.dic
- INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\"
- 
--noinst_PROGRAMS = mkfiledic
--mkfiledic_SOURCES = mkfiledic.c
--mkfiledic_LDADD = ../src-diclib/libdiclib.la
-+#noinst_PROGRAMS = mkfiledic
-+#mkfiledic_SOURCES = mkfiledic.c
-+#mkfiledic_LDADD = ../src-diclib/libdiclib.la
- 
--anthy.dic : mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep
--	./mkfiledic
-+anthy.dic : ../mkworddic/anthy.wdic ../depgraph/anthy.dep
-+	mkfiledic
- 
- 
- # To install 
-
---- anthy-7811/depgraph/Makefile.am~	2006-06-02 00:20:54.000000000 +0900
-+++ anthy-7811/depgraph/Makefile.am	2006-06-18 11:08:13.350000000 +0900
-@@ -9,11 +9,11 @@
- EXTRA_DIST = indepword.txt $(DEPWORDS)
- 
- # Generate the dictionary
--noinst_PROGRAMS = mkdepgraph
--mkdepgraph_SOURCES = mkdepgraph.c
--mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
-+#noinst_PROGRAMS = mkdepgraph
-+#mkdepgraph_SOURCES = mkdepgraph.c
-+#mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
- 
--anthy.dep : mkdepgraph
--	./mkdepgraph
-+anthy.dep : 
-+	mkdepgraph
- 
- noinst_DATA = anthy.dep
-
---- anthy-7811/mkworddic/Makefile.am~	2006-05-13 18:29:07.000000000 +0900
-+++ anthy-7811/mkworddic/Makefile.am	2006-06-18 11:18:35.810000000 +0900
-@@ -16,14 +16,14 @@
-  udict dict.args.in
- 
- # Generate the dictionary
--noinst_PROGRAMS = mkworddic
--mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
--mkworddic_LDADD = ../src-worddic/libanthydic.la
-+#noinst_PROGRAMS = mkworddic
-+#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
-+#mkworddic_LDADD = ../src-worddic/libanthydic.la
- 
- noinst_DATA = anthy.wdic
- 
--anthy.wdic : mkworddic
--	   ./mkworddic -f ./dict.args
-+anthy.wdic : 
-+	   mkworddic -f ./dict.args
- 
- 
- # To install
---- anthy-7811/mkmatrix/Makefile.am~	2006-06-02 00:19:41.000000000 +0900
-+++ anthy-7811/mkmatrix/Makefile.am	2006-06-18 11:31:37.250000000 +0900
-@@ -1,12 +1,12 @@
- EXTRA_DIST = dep.sorted
- 
--noinst_PROGRAMS = mkmatrix
--INCLUDES = -I$(top_srcdir)/include
--mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
--mkmatrix_SOURCES = mkmatrix.c
-+#noinst_PROGRAMS = mkmatrix
-+#INCLUDES = -I$(top_srcdir)/include
-+#mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
-+#mkmatrix_SOURCES = mkmatrix.c
- 
- noinst_DATA = matrix
- CLEANFILES = matrix
- 
--matrix	: mkmatrix $(top_srcdir)/mkmatrix/dep.sorted
--	./mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix
-+matrix	: $(top_srcdir)/mkmatrix/dep.sorted
-+	mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix
diff --git a/packages/anthy/anthy_7811.bb b/packages/anthy/anthy_9100e.bb
index 9f5bf8d1e6..3b4b930211 100644
--- a/packages/anthy/anthy_7811.bb
+++ b/packages/anthy/anthy_9100e.bb
@@ -1,25 +1,23 @@
 DESCRIPTION = "A Japanese input method"
+DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
+DESCRIPTION_libanthy0 = "Anthy runtime library"
+DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
 AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>"
 HOMEPAGE = "http://anthy.sourceforge.jp"
+SECTION = "inputmethods"
+SECTION_libanthy0 = "libs/inputmethods"
+SECTION_libanthy-dev = "devel/libs"
 LICENSE = "GPL"
 DEPENDS = "anthy-native"
-SECTION = "inputmethods"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
-	   file://not_build_elc.patch;patch=1 \
-	   file://2ch_t.patch;patch=1 \
-	   file://change_anthy_dic_path.patch;patch=1 \
-	   file://native-mkanthydic-mkdepgraph.patch;patch=1"
+SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/29142/anthy-9100e.tar.gz \
+           file://not_build_elc.patch;patch=1 \
+           file://2ch_t.patch;patch=1 \
+           file://native-helpers.patch;patch=1"
 
 inherit autotools pkgconfig
 
-DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
-DESCRIPTION_libanthy0 = "Anthy runtime library"
-DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
-SECTION_libanthy0 = "libs/inputmethods"
-SECTION_libanthy-dev = "devel/libs"
-
 # gettext
 
 LEAD_SONAME = "libanthy.so.0"
diff --git a/packages/anthy/files/change_anthy_dic_path.patch b/packages/anthy/files/change_anthy_dic_path.patch
deleted file mode 100644
index 1ea80a6390..0000000000
--- a/packages/anthy/files/change_anthy_dic_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- anthy-7811/anthy-conf.in~	2006-05-13 18:27:50.000000000 +0900
-+++ anthy-7811/anthy-conf.in	2006-06-18 19:23:59.890000000 +0900
-@@ -1,7 +1,7 @@
- # not /usr but should be ${prefix}/share.
--ANTHYDIR @prefix@/share/anthy/
--DIC_FILE @prefix@/share/anthy/anthy.dic
-+ANTHYDIR /usr/share/anthy/
-+DIC_FILE /usr/share/anthy/anthy.dic
- INDEPWORD indepword.txt
- DEPWORD master.depword
--ZIPDICT_EUC @prefix@/share/anthy/zipcode.t
-+ZIPDICT_EUC /usr/share/anthy/zipcode.t
- WORDS_FILE /usr/share/dict/words