7 files changed, 49 insertions, 66 deletions

diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index b11d9b1c7c26..9172357f0b49 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ibus-anthy
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.2.2.20101015
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/japanese/ibus-anthy/distinfo b/japanese/ibus-anthy/distinfo
index 0787fde2a4ae..df43ccb1d347 100644
--- a/japanese/ibus-anthy/distinfo
+++ b/japanese/ibus-anthy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ibus-anthy-1.2.1.tar.gz) = a1b8adc10d4afd84f113da6999cd5f05
-SHA256 (ibus-anthy-1.2.1.tar.gz) = fb5328cbc690e3e32b3887f1ed2562af71783c9e55ba38571f9a590b77b267c5
-SIZE (ibus-anthy-1.2.1.tar.gz) = 477811
+MD5 (ibus-anthy-1.2.2.20101015.tar.gz) = 23eb716da64c4d9dfc7dc867bacec1a4
+SHA256 (ibus-anthy-1.2.2.20101015.tar.gz) = f3d64f8f7839266e1f13f2cd89b6da82717d9a0a3d4047559d51917e8f935e4c
+SIZE (ibus-anthy-1.2.2.20101015.tar.gz) = 495273
diff --git a/japanese/ibus-anthy/files/patch-configure b/japanese/ibus-anthy/files/patch-configure
index 687cda0ee77b..c09d51ad63e3 100644
--- a/japanese/ibus-anthy/files/patch-configure
+++ b/japanese/ibus-anthy/files/patch-configure
@@ -1,54 +1,38 @@
---- configure.org	2010-04-24 10:42:38.837524472 +0900
-+++ configure	2010-04-24 11:04:12.291498371 +0900
-@@ -17904,9 +17904,9 @@
- #define HAVE_DECL_NTH_UNCONVERTED_CANDIDATE 0
- _ACEOF
+--- configure.org	2010-10-16 12:51:27.685179297 +0900
++++ configure	2010-10-16 12:54:44.860181986 +0900
+@@ -16347,7 +16347,7 @@
+ if test $ac_have_decl = 1; then :
  
--{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
--$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
--   { (exit 1); exit 1; }; }
-+#{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
-+#$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
-+#   { (exit 1); exit 1; }; }
+ else
+-  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
++#  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: checking whether NTH_KATAKANA_CANDIDATE is declared" >&5
- $as_echo_n "checking whether NTH_KATAKANA_CANDIDATE is declared... " >&6; }
-@@ -17974,9 +17974,9 @@
- #define HAVE_DECL_NTH_KATAKANA_CANDIDATE 0
- _ACEOF
+ ac_fn_c_check_decl "$LINENO" "NTH_KATAKANA_CANDIDATE" "ac_cv_have_decl_NTH_KATAKANA_CANDIDATE" "#include <anthy/anthy.h>
+ "
+@@ -16363,7 +16363,7 @@
+ if test $ac_have_decl = 1; then :
  
--{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
--$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
--   { (exit 1); exit 1; }; }
-+#{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
-+#$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
-+#   { (exit 1); exit 1; }; }
+ else
+-  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
++#  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: checking whether NTH_HIRAGANA_CANDIDATE is declared" >&5
- $as_echo_n "checking whether NTH_HIRAGANA_CANDIDATE is declared... " >&6; }
-@@ -18044,9 +18044,9 @@
- #define HAVE_DECL_NTH_HIRAGANA_CANDIDATE 0
- _ACEOF
+ ac_fn_c_check_decl "$LINENO" "NTH_HIRAGANA_CANDIDATE" "ac_cv_have_decl_NTH_HIRAGANA_CANDIDATE" "#include <anthy/anthy.h>
+ "
+@@ -16379,7 +16379,7 @@
+ if test $ac_have_decl = 1; then :
  
--{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
--$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
--   { (exit 1); exit 1; }; }
-+#{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
-+#$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
-+#   { (exit 1); exit 1; }; }
+ else
+-  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
++#  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
  fi
- { $as_echo "$as_me:$LINENO: checking whether NTH_HALFKANA_CANDIDATE is declared" >&5
- $as_echo_n "checking whether NTH_HALFKANA_CANDIDATE is declared... " >&6; }
-@@ -18114,9 +18114,9 @@
- #define HAVE_DECL_NTH_HALFKANA_CANDIDATE 0
- _ACEOF
+ ac_fn_c_check_decl "$LINENO" "NTH_HALFKANA_CANDIDATE" "ac_cv_have_decl_NTH_HALFKANA_CANDIDATE" "#include <anthy/anthy.h>
+ "
+@@ -16395,7 +16395,7 @@
+ if test $ac_have_decl = 1; then :
  
--{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
--$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
--   { (exit 1); exit 1; }; }
-+#{ { $as_echo "$as_me:$LINENO: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&5
-+#$as_echo "$as_me: error: Could not find NTH_*_CANDIDATE values in anthy.h" >&2;}
-+#   { (exit 1); exit 1; }; }
+ else
+-  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
++#  as_fn_error "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
  fi
  
  
diff --git a/japanese/ibus-anthy/files/patch-engine_Makefile.am b/japanese/ibus-anthy/files/patch-engine_Makefile.am
index 06f9bec923e4..c418d8650ccd 100644
--- a/japanese/ibus-anthy/files/patch-engine_Makefile.am
+++ b/japanese/ibus-anthy/files/patch-engine_Makefile.am
@@ -1,10 +1,10 @@
---- engine/Makefile.am.org	2010-04-24 10:42:38.834643939 +0900
-+++ engine/Makefile.am	2010-04-24 11:04:49.592487463 +0900
+--- engine/Makefile.am.org	2010-10-16 13:00:16.421182336 +0900
++++ engine/Makefile.am	2010-10-16 13:01:08.049202378 +0900
 @@ -62,7 +62,7 @@
  enginedir = $(datadir)/ibus/component
  
  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
 +	$(SWIG) -python -I/usr/include ${ANTHY_CFLAGS} -o anthy_wrap.c $(srcdir)/anthy.i
  
  anthy.xml: anthy.xml.in
diff --git a/japanese/ibus-anthy/files/patch-engine_Makefile.in b/japanese/ibus-anthy/files/patch-engine_Makefile.in
index 24deef53b44d..7a67ad14a991 100644
--- a/japanese/ibus-anthy/files/patch-engine_Makefile.in
+++ b/japanese/ibus-anthy/files/patch-engine_Makefile.in
@@ -1,10 +1,10 @@
---- engine/Makefile.in.org	2010-04-24 10:42:38.834643939 +0900
-+++ engine/Makefile.in	2010-04-24 11:05:23.963922380 +0900
-@@ -790,7 +790,7 @@
+--- engine/Makefile.in.org	2010-10-16 13:01:13.435184675 +0900
++++ engine/Makefile.in	2010-10-16 13:01:29.179176998 +0900
+@@ -791,7 +791,7 @@
  
  
  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
 +	$(SWIG) -python -I/usr/include ${ANTHY_CFLAGS} -o anthy_wrap.c $(srcdir)/anthy.i
  
  anthy.xml: anthy.xml.in
diff --git a/japanese/ibus-anthy/files/patch-po_Makefile.in.in b/japanese/ibus-anthy/files/patch-po_Makefile.in.in
index 16ae17ee6815..df0f46fead1e 100644
--- a/japanese/ibus-anthy/files/patch-po_Makefile.in.in
+++ b/japanese/ibus-anthy/files/patch-po_Makefile.in.in
@@ -1,5 +1,5 @@
---- po/Makefile.in.in.org	2010-04-24 10:42:38.834643939 +0900
-+++ po/Makefile.in.in	2010-04-24 11:07:14.455718125 +0900
+--- po/Makefile.in.in.org	2010-10-16 13:01:37.296180136 +0900
++++ po/Makefile.in.in	2010-10-16 13:01:58.430185436 +0900
 @@ -34,7 +34,7 @@
  datarootdir = @datarootdir@
  libdir = @libdir@
diff --git a/japanese/ibus-anthy/files/patch-setup_main.py b/japanese/ibus-anthy/files/patch-setup_main.py
index 5a098105d9ed..657c5e3d7dd4 100644
--- a/japanese/ibus-anthy/files/patch-setup_main.py
+++ b/japanese/ibus-anthy/files/patch-setup_main.py
@@ -1,11 +1,11 @@
---- setup/main.py.org	2010-04-24 10:42:38.831762846 +0900
-+++ setup/main.py	2010-04-24 11:10:28.306490779 +0900
-@@ -59,7 +59,7 @@
+--- setup/main.py.org	2010-10-16 13:02:02.581179207 +0900
++++ setup/main.py	2010-10-16 13:02:18.694191336 +0900
+@@ -58,7 +58,7 @@
+         # glade "icon_name" property has a custom scaling and it seems
+         # to be difficult to show the complicated small icon in metacity.
          # This can add the pixbuf without scaling.
-         anthydir = path.dirname(path.dirname(__file__))
+-        anthydir = path.dirname(path.dirname(__file__))
++        anthydir = "@@LOCALBASE@@/share/ibus-anthy"
          if not anthydir:
--            anthydir = "/usr/share/ibus-anthy"
-+            anthydir = "@@LOCALBASE@@/share/ibus-anthy"
+             anthydir = "/usr/share/ibus-anthy"
          icon_path = path.join(anthydir, "icons", "ibus-anthy.png")
-         if path.exists(icon_path):
-             xml.get_widget('main').set_icon_from_file(icon_path)