Update to ibus-anthy-1.4.99.20120327

Feature safe: yes

7 files changed, 23 insertions, 34 deletions

diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index 30a033e15e23..bd114f6ccb3c 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ibus-anthy
-PORTVERSION=	1.2.6
+PORTVERSION=	1.4.99.20120327
 CATEGORIES=	japanese
 PROJECTHOST=	ibus
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
diff --git a/japanese/ibus-anthy/distinfo b/japanese/ibus-anthy/distinfo
index ef17e08f3987..a2b28b7bc955 100644
--- a/japanese/ibus-anthy/distinfo
+++ b/japanese/ibus-anthy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-anthy-1.2.6.tar.gz) = e4d5eb27c35295a69c0baa308a6589c8aea19f72317d08b692437af5512dd6f6
-SIZE (ibus-anthy-1.2.6.tar.gz) = 519488
+SHA256 (ibus-anthy-1.4.99.20120327.tar.gz) = d402ba6e8d3b9a57366e4f2a848a2a155650c888314f60fb87f1f44066dec5b7
+SIZE (ibus-anthy-1.4.99.20120327.tar.gz) = 541693
diff --git a/japanese/ibus-anthy/files/patch-configure b/japanese/ibus-anthy/files/patch-configure
index 89d1bca71027..9f82bdebedc1 100644
--- a/japanese/ibus-anthy/files/patch-configure
+++ b/japanese/ibus-anthy/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-01-14 12:14:14.987155483 +0900
-+++ configure	2012-01-14 12:24:25.699154843 +0900
-@@ -17010,7 +17010,7 @@
+--- configure.orig	2012-04-02 08:48:25.122728365 +0900
++++ configure	2012-04-02 08:51:09.119726936 +0900
+@@ -17123,7 +17123,7 @@
  if test $ac_have_decl = 1; then :
  
  else
@@ -9,7 +9,7 @@
  fi
  ac_fn_c_check_decl "$LINENO" "NTH_KATAKANA_CANDIDATE" "ac_cv_have_decl_NTH_KATAKANA_CANDIDATE" "#include <anthy/anthy.h>
  "
-@@ -17026,7 +17026,7 @@
+@@ -17139,7 +17139,7 @@
  if test $ac_have_decl = 1; then :
  
  else
@@ -18,7 +18,7 @@
  fi
  ac_fn_c_check_decl "$LINENO" "NTH_HIRAGANA_CANDIDATE" "ac_cv_have_decl_NTH_HIRAGANA_CANDIDATE" "#include <anthy/anthy.h>
  "
-@@ -17042,7 +17042,7 @@
+@@ -17155,7 +17155,7 @@
  if test $ac_have_decl = 1; then :
  
  else
@@ -27,7 +27,7 @@
  fi
  ac_fn_c_check_decl "$LINENO" "NTH_HALFKANA_CANDIDATE" "ac_cv_have_decl_NTH_HALFKANA_CANDIDATE" "#include <anthy/anthy.h>
  "
-@@ -17058,7 +17058,7 @@
+@@ -17171,7 +17171,7 @@
  if test $ac_have_decl = 1; then :
  
  else
diff --git a/japanese/ibus-anthy/files/patch-engine_Makefile.am b/japanese/ibus-anthy/files/patch-engine_Makefile.am
deleted file mode 100644
index c9dd4de9e8e8..000000000000
--- a/japanese/ibus-anthy/files/patch-engine_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- engine/Makefile.am.orig	2012-01-14 12:14:14.982155825 +0900
-+++ engine/Makefile.am	2012-01-14 12:24:26.006155593 +0900
-@@ -62,7 +62,7 @@
- enginedir = $(datadir)/ibus/component
- 
- anthy.py anthy_wrap.c: anthy.i
--	$(SWIG) -python $(ANTHY_CFLAGS) -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
-+	$(SWIG) -python -I@@INCLUDEDIR@@ ${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 a312172846dc..6042b6ba6cc4 100644
--- a/japanese/ibus-anthy/files/patch-engine_Makefile.in
+++ b/japanese/ibus-anthy/files/patch-engine_Makefile.in
@@ -1,11 +1,11 @@
---- engine/Makefile.in.orig	2012-01-14 12:14:14.982155825 +0900
-+++ engine/Makefile.in	2012-01-14 12:24:25.982156733 +0900
-@@ -795,7 +795,7 @@
+--- engine/Makefile.in.orig	2012-04-02 08:48:25.099728584 +0900
++++ engine/Makefile.in	2012-04-02 08:52:58.086727281 +0900
+@@ -835,7 +835,7 @@
  
  
- anthy.py anthy_wrap.c: anthy.i
--	$(SWIG) -python $(ANTHY_CFLAGS) -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
-+	$(SWIG) -python -I@@INCLUDEDIR@@ ${ANTHY_CFLAGS} -o anthy_wrap.c $(srcdir)/anthy.i
+ @HAVE_PYGTK2_ANTHY_TRUE@anthy.py anthy_wrap.c: anthy.i
+-@HAVE_PYGTK2_ANTHY_TRUE@	$(SWIG) -python $(ANTHY_CFLAGS) -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
++@HAVE_PYGTK2_ANTHY_TRUE@	$(SWIG) -python -I@@INCLUDEDIR@@ $(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 d7dcbbadd7b7..538f17b4a4f0 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	2012-01-14 12:14:14.985154041 +0900
-+++ po/Makefile.in.in	2012-01-13 11:29:00.154154365 +0900
+--- po/Makefile.in.in.orig	2012-04-02 08:48:25.097728679 +0900
++++ po/Makefile.in.in	2012-04-02 08:51:09.274729178 +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 762e9d9c914f..d430dc8c7dc5 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.orig	2012-01-14 12:14:14.986154797 +0900
-+++ setup/main.py	2012-01-14 12:24:25.953154304 +0900
-@@ -58,7 +58,7 @@
-         # glade "icon_name" property has a custom scaling and it seems
+--- setup/main.py.orig	2012-04-02 08:48:25.111727456 +0900
++++ setup/main.py	2012-04-02 08:51:09.382726912 +0900
+@@ -71,7 +71,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 = "@@LOCALBASE@@/share/ibus-anthy"
          if not anthydir:
-             anthydir = "/usr/share/ibus-anthy"
-         icon_path = path.join(anthydir, "icons", "ibus-anthy.png")
+             anthydir = '/usr/share/ibus-anthy'
+         icon_path = path.join(anthydir, 'icons', 'ibus-anthy.png')