9 files changed, 20 insertions, 67 deletions

diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index d4703d80b6ac..35b734622ef6 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ibus-anthy
-PORTVERSION=	1.2.0.20100313
-PORTREVISION=	2
+PORTVERSION=	1.2.1
+PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/japanese/ibus-anthy/distinfo b/japanese/ibus-anthy/distinfo
index d199d61003e5..0787fde2a4ae 100644
--- a/japanese/ibus-anthy/distinfo
+++ b/japanese/ibus-anthy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ibus-anthy-1.2.0.20100313.tar.gz) = 060b160281142aedc8652fa3af5584c6
-SHA256 (ibus-anthy-1.2.0.20100313.tar.gz) = 38a056ee388e02e3b8b7b906111bcc1c0cff4328d449a8dd1b347d0d311a84d4
-SIZE (ibus-anthy-1.2.0.20100313.tar.gz) = 472719
+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
diff --git a/japanese/ibus-anthy/files/patch-configure b/japanese/ibus-anthy/files/patch-configure
index 757ccdc715c4..687cda0ee77b 100644
--- a/japanese/ibus-anthy/files/patch-configure
+++ b/japanese/ibus-anthy/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2010-03-16 18:01:57.094452930 +0900
-+++ configure	2010-03-16 18:01:03.005537719 +0900
-@@ -17898,9 +17898,9 @@
+--- 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
  
@@ -13,7 +13,7 @@
  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; }
-@@ -17968,9 +17968,9 @@
+@@ -17974,9 +17974,9 @@
  #define HAVE_DECL_NTH_KATAKANA_CANDIDATE 0
  _ACEOF
  
@@ -26,7 +26,7 @@
  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; }
-@@ -18038,9 +18038,9 @@
+@@ -18044,9 +18044,9 @@
  #define HAVE_DECL_NTH_HIRAGANA_CANDIDATE 0
  _ACEOF
  
@@ -39,7 +39,7 @@
  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; }
-@@ -18108,9 +18108,9 @@
+@@ -18114,9 +18114,9 @@
  #define HAVE_DECL_NTH_HALFKANA_CANDIDATE 0
  _ACEOF
  
@@ -52,21 +52,3 @@
  fi
  
  
-@@ -18156,7 +18156,7 @@
- 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 @@
- 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/japanese/ibus-anthy/files/patch-engine_Makefile.am b/japanese/ibus-anthy/files/patch-engine_Makefile.am
index 9e6ebaadf14a..06f9bec923e4 100644
--- a/japanese/ibus-anthy/files/patch-engine_Makefile.am
+++ b/japanese/ibus-anthy/files/patch-engine_Makefile.am
@@ -1,5 +1,5 @@
---- engine/Makefile.am.orig	2010-03-16 10:43:50.056295118 +0900
-+++ engine/Makefile.am	2010-03-16 10:38:02.428703901 +0900
+--- engine/Makefile.am.org	2010-04-24 10:42:38.834643939 +0900
++++ engine/Makefile.am	2010-04-24 11:04:49.592487463 +0900
 @@ -62,7 +62,7 @@
  enginedir = $(datadir)/ibus/component
  
diff --git a/japanese/ibus-anthy/files/patch-engine_Makefile.in b/japanese/ibus-anthy/files/patch-engine_Makefile.in
index 885503d523bd..24deef53b44d 100644
--- a/japanese/ibus-anthy/files/patch-engine_Makefile.in
+++ b/japanese/ibus-anthy/files/patch-engine_Makefile.in
@@ -1,6 +1,6 @@
---- engine/Makefile.in.orig	2010-03-16 10:44:01.101570984 +0900
-+++ engine/Makefile.in	2010-03-16 10:38:32.610537905 +0900
-@@ -787,7 +787,7 @@
+--- 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 @@
  
  
  anthy.py anthy_wrap.c: anthy.i
diff --git a/japanese/ibus-anthy/files/patch-engine_engine.py b/japanese/ibus-anthy/files/patch-engine_engine.py
deleted file mode 100644
index b5a2c4bc2b77..000000000000
--- a/japanese/ibus-anthy/files/patch-engine_engine.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- engine/engine.py.orig	2010-03-16 17:26:28.900007826 +0900
-+++ engine/engine.py	2010-03-16 17:26:52.344325749 +0900
-@@ -89,7 +89,7 @@
-     It's better to load config.py(.in) in engine and setup instead and
-     I will move KASUMI_IMG_PATH.
- '''
--KASUMI_IMG_PATH = "/usr/share/pixmaps/kasumi.png"
-+KASUMI_IMG_PATH = "@@LOCALBASE@@/share/pixmaps/kasumi.png"
- 
- KP_Table = {}
- for s in dir(keysyms):
diff --git a/japanese/ibus-anthy/files/patch-po_Makefile.in.in b/japanese/ibus-anthy/files/patch-po_Makefile.in.in
index 55275a260a1b..16ae17ee6815 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.orig	2010-03-16 10:44:57.077555362 +0900
-+++ po/Makefile.in.in	2010-03-16 10:39:22.280659667 +0900
+--- 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
 @@ -34,7 +34,7 @@
  datarootdir = @datarootdir@
  libdir = @libdir@
diff --git a/japanese/ibus-anthy/files/patch-setup_anthyprefs.py b/japanese/ibus-anthy/files/patch-setup_anthyprefs.py
deleted file mode 100644
index 562fa9abf7d6..000000000000
--- a/japanese/ibus-anthy/files/patch-setup_anthyprefs.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- setup/anthyprefs.py.orig	2010-03-16 17:30:03.668452978 +0900
-+++ setup/anthyprefs.py	2010-03-16 17:28:25.641496479 +0900
-@@ -185,11 +185,11 @@
-     },
- 
-     'dict': {
--        'anthy_zipcode': ['/usr/share/anthy/zipcode.t'],
--        'ibus_symbol': ['/usr/share/ibus-anthy/dicts/symbol.t'],
-+        'anthy_zipcode': ['@@LOCALBASE@@/share/anthy/zipcode.t'],
-+        'ibus_symbol': ['@@LOCALBASE@@/share/ibus-anthy/dicts/symbol.t'],
-         'files': [
--            '/usr/share/anthy/zipcode.t',
--            '/usr/share/ibus-anthy/dicts/symbol.t',
-+            '@@LOCALBASE@@/share/anthy/zipcode.t',
-+            '@@LOCALBASE@@/share/ibus-anthy/dicts/symbol.t',
-         ],
-     },
- 
diff --git a/japanese/ibus-anthy/files/patch-setup_main.py b/japanese/ibus-anthy/files/patch-setup_main.py
index 35cec1359951..5a098105d9ed 100644
--- a/japanese/ibus-anthy/files/patch-setup_main.py
+++ b/japanese/ibus-anthy/files/patch-setup_main.py
@@ -1,5 +1,5 @@
---- setup/main.py.orig	2010-03-16 17:32:17.110533466 +0900
-+++ setup/main.py	2010-03-16 17:33:17.660764012 +0900
+--- 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 @@
          # This can add the pixbuf without scaling.
          anthydir = path.dirname(path.dirname(__file__))