anthy: update to 7811

6 files changed, 139 insertions, 59 deletions

diff --git a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
index 209232ed6d..ab7fb42eaa 100644
--- a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
+++ b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
@@ -1,16 +1,16 @@
---- anthy-6801/mkanthydic/Makefile.am.orig	2005-08-06 12:08:56 +0200
-+++ anthy-6801/mkanthydic/Makefile.am	2005-08-06 12:11:18 +0200
-@@ -15,7 +15,7 @@
-  udict dict.args.in
+--- 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 @@
+ CLEANFILES = anthy.dic
+ INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\"
  
- # Generate the dictionary
--noinst_PROGRAMS = mkanthydic
-+bin_PROGRAMS = mkanthydic
- mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
- mkanthydic_LDADD = ../src-diclib/libanthydic.la
+-noinst_PROGRAMS = mkfiledic
++bin_PROGRAMS = mkfiledic
+ mkfiledic_SOURCES = mkfiledic.c
+ mkfiledic_LDADD = ../src-diclib/libdiclib.la
  
---- anthy-6801/depgraph/Makefile.am.orig	2005-08-06 12:08:33 +0200
-+++ anthy-6801/depgraph/Makefile.am	2005-08-06 12:11:28 +0200
+--- anthy-7811/depgraph/Makefile.am~	2006-06-02 00:20:54.000000000 +0900
++++ anthy-7811/depgraph/Makefile.am	2006-06-18 10:57:19.420000000 +0900
 @@ -9,7 +9,7 @@
  EXTRA_DIST = indepword.txt $(DEPWORDS)
  
@@ -18,5 +18,28 @@
 -noinst_PROGRAMS = mkdepgraph
 +bin_PROGRAMS = mkdepgraph
  mkdepgraph_SOURCES = mkdepgraph.c
- mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la
+ mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
+ 
+--- anthy-7811/mkworddic/Makefile.am~	2006-05-13 18:29:07.000000000 +0900
++++ anthy-7811/mkworddic/Makefile.am	2006-06-18 11:21:56.300000000 +0900
+@@ -16,7 +16,8 @@
+  udict dict.args.in
+ 
+ # Generate the dictionary
+-noinst_PROGRAMS = mkworddic
++#noinst_PROGRAMS = mkworddic
++bin_PROGRAMS = mkworddic
+ mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
+ mkworddic_LDADD = ../src-worddic/libanthydic.la
+ 
+--- 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 = mkmatrix
++#noinst_PROGRAMS = mkmatrix
++bin_PROGRAMS = mkmatrix
+ INCLUDES = -I$(top_srcdir)/include
+ mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
+ mkmatrix_SOURCES = mkmatrix.c
diff --git a/packages/anthy/anthy-native_6801.bb b/packages/anthy/anthy-native_7811.bb
index dbcf851024..dbcf851024 100644
--- a/packages/anthy/anthy-native_6801.bb
+++ b/packages/anthy/anthy-native_7811.bb
diff --git a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
index e5cecbf570..86e6513d13 100644
--- a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
+++ b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
@@ -1,40 +1,84 @@
---- anthy-6801/mkanthydic/Makefile.am.orig	2005-08-06 12:14:58 +0200
-+++ anthy-6801/mkanthydic/Makefile.am	2005-08-06 12:15:13 +0200
-@@ -15,12 +15,12 @@
-  udict dict.args.in
+--- 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)\"
  
- # Generate the dictionary
--noinst_PROGRAMS = mkanthydic
--mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
--mkanthydic_LDADD = ../src-diclib/libanthydic.la
-+#noinst_PROGRAMS = mkanthydic
-+#mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
-+#mkanthydic_LDADD = ../src-diclib/libanthydic.la
+-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 : mkanthydic
--	  ./mkanthydic -f ./dict.args
-+anthy.dic :
-+	  mkanthydic -f ./dict.args
+-anthy.dic : mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep
+-	./mkfiledic
++anthy.dic : ../mkworddic/anthy.wdic ../depgraph/anthy.dep
++	mkfiledic
  
  
- # To install
---- anthy-6801/depgraph/Makefile.am.orig	2005-08-06 12:14:03 +0200
-+++ anthy-6801/depgraph/Makefile.am	2005-08-06 12:15:43 +0200
-@@ -9,12 +9,12 @@
+ # 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-diclib/libanthydic.la ../src-main/libanthy.la
+-mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
 +#noinst_PROGRAMS = mkdepgraph
 +#mkdepgraph_SOURCES = mkdepgraph.c
-+#mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la
++#mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
  
 -anthy.dep : mkdepgraph
 -	./mkdepgraph
-+anthy.dep :
++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
- pkgdata_DATA = anthy.dep
+--- 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_6801.bb b/packages/anthy/anthy_7811.bb
index c277639430..a6c8eff200 100644
--- a/packages/anthy/anthy_6801.bb
+++ b/packages/anthy/anthy_7811.bb
@@ -6,16 +6,17 @@ DEPENDS = "anthy-native"
 SECTION = "libs/inputmethod"
 PR = "r0"
 
-SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/15893/anthy-6801.tar.gz \
+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"
+
 S = "${WORKDIR}/anthy-${PV}"
 
 inherit autotools pkgconfig
 
-PACKAGES = "${PN} libanthy0 libanthy-dev"
+PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev"
 
 DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
 DESCRIPTION_libanthy0 = "Anthy runtime library"
@@ -27,9 +28,19 @@ LEAD_SONAME = "libanthy.so.0"
 RDEPENDS_anthy = "libanthy0"
 
 FILES_libanthy0 = "${libdir}/libanthy.so.*	\
-		   ${libdir}/libanthydic.so.*	\
-		   ${libdir}/libanthyinput.so.*"
-FILES_libanthy-dev = "${libdir}/libanthy* \
-		      ${includedir}/anthy	\
-		      ${libdir}/pkgconfig/anthy.pc"
-FILES_${PN} = "${bindir}/* ${datadir}/* ${sysconfdir}/*"
+           		   ${libdir}/libanthydic.so.*	\
+		           ${libdir}/libanthyinput.so.*"
+FILES_libanthy-dev = "${libdir}/libanthy*.la \
+                      ${libdir}/libanthy*.a \
+                      ${libdir}/libanthy*.so \
+	 	              ${includedir}/anthy	\
+		              ${libdir}/pkgconfig/anthy.pc"
+FILES_${PN}-el = "${datadir}/emacs/*"
+FILES_${PN} = "${datadir}/* \
+               ${bindir}/* \
+               ${sysconfdir}/anthy-conf"
+
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/anthy/files/change_anthy_dic_path.patch b/packages/anthy/files/change_anthy_dic_path.patch
index 7d6356bc38..1ea80a6390 100644
--- a/packages/anthy/files/change_anthy_dic_path.patch
+++ b/packages/anthy/files/change_anthy_dic_path.patch
@@ -1,11 +1,13 @@
-diff -urNad anthy/anthy-conf.in /tmp/dpep.kiMfmZ/anthy/anthy-conf.in
---- anthy/anthy-conf.in	2004-05-02 20:31:25.000000000 +0900
-+++ /tmp/dpep.kiMfmZ/anthy/anthy-conf.in	2004-10-24 08:40:37.000000000 +0900
-@@ -1,6 +1,6 @@
+--- 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/
+-ANTHYDIR @prefix@/share/anthy/
 -DIC_FILE @prefix@/share/anthy/anthy.dic
-+DIC_FILE /var/lib/anthy/anthy.dic
++ANTHYDIR /usr/share/anthy/
++DIC_FILE /usr/share/anthy/anthy.dic
  INDEPWORD indepword.txt
  DEPWORD master.depword
- #ZIPDICT_EUC /var/lib/canna/dic/canna/zipcode.ctd
+-ZIPDICT_EUC @prefix@/share/anthy/zipcode.t
++ZIPDICT_EUC /usr/share/anthy/zipcode.t
+ WORDS_FILE /usr/share/dict/words
diff --git a/packages/anthy/files/not_build_elc.patch b/packages/anthy/files/not_build_elc.patch
index 56368027e7..d3f269c46a 100644
--- a/packages/anthy/files/not_build_elc.patch
+++ b/packages/anthy/files/not_build_elc.patch
@@ -1,13 +1,13 @@
-diff -urNad /home/omote/debian/debian-official/japanese/anthy/anthy-4k/anthy-4809/src-util/Makefile.am anthy-4809/src-util/Makefile.am
---- /home/omote/debian/debian-official/japanese/anthy/anthy-4k/anthy-4809/src-util/Makefile.am	2003-11-24 20:59:35.000000000 +0900
-+++ anthy-4809/src-util/Makefile.am	2003-12-11 19:22:56.000000000 +0900
-@@ -5,7 +5,8 @@
- ELISP_FILES = anthy.el anthy-isearch.el anthy-dic.el anthy-conf.el leim-list.el
+diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am
+--- anthy-7811/src-util.orig/Makefile.am	2006-06-18 10:47:55.790000000 +0900
++++ anthy-7811/src-util/Makefile.am	2006-06-18 10:48:23.860000000 +0900
+@@ -6,7 +6,8 @@
+  anthy-isearch.el anthy-azik.el anthy-kyuri.el
  EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt rcsize.rb
- bin_PROGRAMS = anthy-dic-tool anthy-agent
--ELCFILES = anthy.elc anthy-dic.elc
-+#ELCFILES = anthy.elc anthy-dic.elc
-+ELCFILES =
+ bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer
+-ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc
++#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc
++ELCFILES = 
  if ELISP
  lisp_LISP = $(ELISP_FILES)
  endif