7 files changed, 28 insertions, 30 deletions

diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index bd114f6ccb3c..efb635d5364a 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	ibus-anthy
-PORTVERSION=	1.4.99.20120327
+PORTVERSION=	1.2.7
 CATEGORIES=	japanese
 PROJECTHOST=	ibus
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+PKGNAMEPREFIX=	ja-
 
 MAINTAINER=	daichi@FreeBSD.org
 COMMENT=	Anthy engine for IBus
diff --git a/japanese/ibus-anthy/distinfo b/japanese/ibus-anthy/distinfo
index a2b28b7bc955..8ec3b6244d6e 100644
--- a/japanese/ibus-anthy/distinfo
+++ b/japanese/ibus-anthy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-anthy-1.4.99.20120327.tar.gz) = d402ba6e8d3b9a57366e4f2a848a2a155650c888314f60fb87f1f44066dec5b7
-SIZE (ibus-anthy-1.4.99.20120327.tar.gz) = 541693
+SHA256 (ibus-anthy-1.2.7.tar.gz) = 33c42c1612423f84fddd8c38f8b2439b8af5f0b5fc7725ae195a01b8999d85e9
+SIZE (ibus-anthy-1.2.7.tar.gz) = 523139
diff --git a/japanese/ibus-anthy/files/patch-configure b/japanese/ibus-anthy/files/patch-configure
index 9f82bdebedc1..6f20960693f0 100644
--- a/japanese/ibus-anthy/files/patch-configure
+++ b/japanese/ibus-anthy/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-04-02 08:48:25.122728365 +0900
-+++ configure	2012-04-02 08:51:09.119726936 +0900
-@@ -17123,7 +17123,7 @@
+--- configure.orig	2012-04-08 17:47:23.699623266 +0900
++++ configure	2012-04-08 17:58:11.837622677 +0900
+@@ -17078,7 +17078,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>
  "
-@@ -17139,7 +17139,7 @@
+@@ -17094,7 +17094,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>
  "
-@@ -17155,7 +17155,7 @@
+@@ -17110,7 +17110,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>
  "
-@@ -17171,7 +17171,7 @@
+@@ -17126,7 +17126,7 @@
  if test $ac_have_decl = 1; then :
  
  else
diff --git a/japanese/ibus-anthy/files/patch-engine_Makefile.in b/japanese/ibus-anthy/files/patch-engine_Makefile.in
index 6042b6ba6cc4..ae3f97ee3532 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-04-02 08:48:25.099728584 +0900
-+++ engine/Makefile.in	2012-04-02 08:52:58.086727281 +0900
-@@ -835,7 +835,7 @@
+--- engine/Makefile.in.orig	2012-04-08 17:47:23.680622559 +0900
++++ engine/Makefile.in	2012-04-08 17:58:25.467629657 +0900
+@@ -801,7 +801,7 @@
  
  
- @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.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-po_Makefile.in.in b/japanese/ibus-anthy/files/patch-po_Makefile.in.in
index 538f17b4a4f0..8323bc4fd069 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-04-02 08:48:25.097728679 +0900
-+++ po/Makefile.in.in	2012-04-02 08:51:09.274729178 +0900
+--- po/Makefile.in.in.orig	2012-04-08 17:47:23.690620919 +0900
++++ po/Makefile.in.in	2012-04-08 17:58:36.694619782 +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 d430dc8c7dc5..c4c2fe4f516d 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-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
+--- setup/main.py.orig	2012-04-08 17:47:23.692620971 +0900
++++ setup/main.py	2012-04-08 17:58:44.140619685 +0900
+@@ -63,7 +63,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")
diff --git a/japanese/ibus-anthy/pkg-plist b/japanese/ibus-anthy/pkg-plist
index 06309e2ea6a4..d324e85c86d0 100644
--- a/japanese/ibus-anthy/pkg-plist
+++ b/japanese/ibus-anthy/pkg-plist
@@ -1,10 +1,10 @@
+%%PYTHON_SITELIBDIR%%/_anthy.la
+%%PYTHON_SITELIBDIR%%/_anthy.so
+%%PYTHON_SITELIBDIR%%/anthy.py
 libexec/ibus-engine-anthy
 libexec/ibus-setup-anthy
 %%DATADIR%%/dicts/oldchar.t
 %%DATADIR%%/dicts/symbol.t
-%%DATADIR%%/engine/_config.py
-%%DATADIR%%/engine/_config.pyc
-%%DATADIR%%/engine/_config.pyo
 %%DATADIR%%/engine/engine.py
 %%DATADIR%%/engine/engine.pyc
 %%DATADIR%%/engine/engine.pyo
@@ -33,9 +33,6 @@ libexec/ibus-setup-anthy
 %%DATADIR%%/engine/thumb.pyc
 %%DATADIR%%/engine/thumb.pyo
 %%DATADIR%%/icons/ibus-anthy.png
-%%DATADIR%%/setup/_config.py
-%%DATADIR%%/setup/_config.pyc
-%%DATADIR%%/setup/_config.pyo
 %%DATADIR%%/setup/anthyprefs.py
 %%DATADIR%%/setup/anthyprefs.pyc
 %%DATADIR%%/setup/anthyprefs.pyo
@@ -45,7 +42,7 @@ libexec/ibus-setup-anthy
 %%DATADIR%%/setup/prefs.py
 %%DATADIR%%/setup/prefs.pyc
 %%DATADIR%%/setup/prefs.pyo
-%%DATADIR%%/setup/setup.ui
+%%DATADIR%%/setup/setup.glade
 share/ibus/component/anthy.xml
 share/locale/fr/LC_MESSAGES/ibus-anthy.mo
 share/locale/ja/LC_MESSAGES/ibus-anthy.mo