Update ibus-anthy to 1.2.2.20101015.

* Fixed NetBSD ENV issue (#1029)
* Fixed commit_nth_segment
* Added custom key table.
* Updated anthy icon.
* Added menu item labels.
* Fix ATOK commit_selected_segment
* Fix sh equal and swig include path. #883, #884

4 files changed, 6 insertions, 49 deletions

diff --git a/inputmethod/ibus-anthy/Makefile b/inputmethod/ibus-anthy/Makefile
index d5cacf0a37c..3fecc7d6e5b 100644
--- a/inputmethod/ibus-anthy/Makefile
+++ b/inputmethod/ibus-anthy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/04 05:04:57 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/10/16 06:04:27 obache Exp $
 #
 
-DISTNAME=	ibus-anthy-1.2.1
+DISTNAME=	ibus-anthy-1.2.2.20101015
 CATEGORIES=	inputmethod japanese
 MASTER_SITES=	http://ibus.googlecode.com/files/
 
@@ -34,8 +34,6 @@ SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	engine/ibus-engine-anthy.in setup/ibus-setup-anthy.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
-.include "../../inputmethod/ibus/bad-env-usage.mk"
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 PY_PATCHPLIST=		yes
diff --git a/inputmethod/ibus-anthy/distinfo b/inputmethod/ibus-anthy/distinfo
index c772701632d..0964856044b 100644
--- a/inputmethod/ibus-anthy/distinfo
+++ b/inputmethod/ibus-anthy/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/08/07 01:50:52 obache Exp $
+$NetBSD: distinfo,v 1.2 2010/10/16 06:04:27 obache Exp $
 
-SHA1 (ibus-anthy-1.2.1.tar.gz) = 7f9c6b0def9037e80cab034f0a34a8342438645d
-RMD160 (ibus-anthy-1.2.1.tar.gz) = e852f7f078463680e3d64594c0064e68dc86db42
-Size (ibus-anthy-1.2.1.tar.gz) = 477811 bytes
-SHA1 (patch-aa) = e3f6f574215b16d5814bcc1a1dc2b1440df28b8f
-SHA1 (patch-ab) = ceb4ce8e0ad5f8e052c72ab4f578ccd4ef1548c3
+SHA1 (ibus-anthy-1.2.2.20101015.tar.gz) = 34899469b3a6ee08eb70d29b5f321c9c3938cd34
+RMD160 (ibus-anthy-1.2.2.20101015.tar.gz) = 9b9051b4e1d8efa60781ce53782a89a03df69870
+Size (ibus-anthy-1.2.2.20101015.tar.gz) = 495273 bytes
diff --git a/inputmethod/ibus-anthy/patches/patch-aa b/inputmethod/ibus-anthy/patches/patch-aa
deleted file mode 100644
index dc9fb9e2559..00000000000
--- a/inputmethod/ibus-anthy/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/08/07 01:50:52 obache Exp $
-
-http://code.google.com/p/ibus/issues/detail?id=883
-
---- configure.orig	2010-01-15 03:27:24.000000000 +0000
-+++ configure
-@@ -18156,7 +18156,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--if test x"$SWIG" == x""; then
-+if test x"$SWIG" = x""; then
-      { { $as_echo "$as_me:$LINENO: error: can not find swig" >&5
- $as_echo "$as_me: error: can not find swig" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -18464,7 +18464,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--if test x"$PYTHON_CONFIG" == x""; then
-+if test x"$PYTHON_CONFIG" = x""; then
-     # Extract the first word of "python-config", so it can be a program name with args.
- set dummy python-config; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/inputmethod/ibus-anthy/patches/patch-ab b/inputmethod/ibus-anthy/patches/patch-ab
deleted file mode 100644
index e3cbfe0c070..00000000000
--- a/inputmethod/ibus-anthy/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/08/07 01:50:52 obache Exp $
-
-http://code.google.com/p/ibus/issues/detail?id=884
-
---- engine/Makefile.in.orig	2010-01-15 03:27:22.000000000 +0000
-+++ engine/Makefile.in
-@@ -787,7 +787,7 @@ uninstall-am: uninstall-anthyDATA uninst
- 
- 
- anthy.py anthy_wrap.c: anthy.i
--	$(SWIG) -python -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
-+	$(SWIG) -python ${ANTHY_CFLAGS} -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
- 
- anthy.xml: anthy.xml.in
- 	( \