5 files changed, 61 insertions, 12 deletions

diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 3e89d1c1b7cb..4c6fc9e53b95 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ibus
-PORTVERSION=	1.1.0.20090311
-PORTREVISION=	2
+PORTVERSION=	1.1.0.20090612
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/textproc/ibus/distinfo b/textproc/ibus/distinfo
index d756807f0647..8096475ade13 100644
--- a/textproc/ibus/distinfo
+++ b/textproc/ibus/distinfo
@@ -1,3 +1,3 @@
-MD5 (ibus-1.1.0.20090311.tar.gz) = 0a5dca579d10bdcc7eba4f475b5a0c2b
-SHA256 (ibus-1.1.0.20090311.tar.gz) = ce6043acad88ad690a814eb35a2e21dba6f14ba6a24afbb71d8f73722d35af97
-SIZE (ibus-1.1.0.20090311.tar.gz) = 1108376
+MD5 (ibus-1.1.0.20090612.tar.gz) = 108fe12f49f5b55453293104b4c8e19e
+SHA256 (ibus-1.1.0.20090612.tar.gz) = 02192cceefa822f590dad1f8a8564e72541b07c87fc5717349c7cc5defdbe80d
+SIZE (ibus-1.1.0.20090612.tar.gz) = 1227074
diff --git a/textproc/ibus/files/patch-po_Makefile.in.in b/textproc/ibus/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..f46b94abb208
--- /dev/null
+++ b/textproc/ibus/files/patch-po_Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	2007-09-25 01:35:53.000000000 +0900
++++ po/Makefile.in.in	2007-09-25 01:36:59.000000000 +0900
+@@ -33,7 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
++DATADIRNAME = share
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+ subdir = po
+ install_sh = @install_sh@
diff --git a/textproc/ibus/pkg-message b/textproc/ibus/pkg-message
index df7477ae39fb..6583436d8f1f 100644
--- a/textproc/ibus/pkg-message
+++ b/textproc/ibus/pkg-message
@@ -19,7 +19,8 @@ setenv XMODIFIERS @im=ibus
 setenv XIM_PROGRAM ibus-daemon
 setenv XIM_ARGS "--daemonize --xim"
 
-If you are using KDE4, you may create a shell script in $HOME/.kde4/env, and add following lines:
+If you are using KDE4, you may create a shell script in $HOME/.kde4/env, 
+and add following lines:
 
 #!/bin/sh
 export XIM=ibus
@@ -32,4 +33,9 @@ export XIM_ARGS="--daemonize --xim"
 Following input methods are available in ports:
 
 chinese/ibus-pinyin		The PinYin input method
+japanese/ibus-anthy		Anthy engine for IBus
+
+If ibus cannot start or the panel does not appear, please ensure
+that you are using up-to-date python.
+There's a bug in python 2.5, which may prevent the panel from appearing.
 -------------------------------------------------------------------
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index 2d6a8c905bdd..dcda7dcd2918 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -18,6 +18,7 @@ include/ibus-1.0/ibushotkey.h
 include/ibus-1.0/ibusinputcontext.h
 include/ibus-1.0/ibuskeysyms.h
 include/ibus-1.0/ibuslookuptable.h
+include/ibus-1.0/ibusmainloop.h
 include/ibus-1.0/ibusmarshalers.h
 include/ibus-1.0/ibusmessage.h
 include/ibus-1.0/ibusobject.h
@@ -148,26 +149,31 @@ libexec/ibus-ui-gtk
 libexec/ibus-x11
 share/applications/ibus-setup.desktop
 share/applications/ibus.desktop
-share/gtk-doc/html/ibus/IBusAttrList.html
+share/gtk-doc/html/ibus/IBusAttribute.html
 share/gtk-doc/html/ibus/IBusBus.html
 share/gtk-doc/html/ibus/IBusComponent.html
 share/gtk-doc/html/ibus/IBusConfig.html
+share/gtk-doc/html/ibus/IBusConfigService.html
 share/gtk-doc/html/ibus/IBusConnection.html
 share/gtk-doc/html/ibus/IBusEngine.html
 share/gtk-doc/html/ibus/IBusEngineDesc.html
-share/gtk-doc/html/ibus/IBusFactoryInfo.html
+share/gtk-doc/html/ibus/IBusFactory.html
 share/gtk-doc/html/ibus/IBusHotkeyProfile.html
 share/gtk-doc/html/ibus/IBusInputContext.html
 share/gtk-doc/html/ibus/IBusLookupTable.html
 share/gtk-doc/html/ibus/IBusObject.html
 share/gtk-doc/html/ibus/IBusObservedPath.html
-share/gtk-doc/html/ibus/IBusPropList.html
+share/gtk-doc/html/ibus/IBusProperty.html
 share/gtk-doc/html/ibus/IBusProxy.html
 share/gtk-doc/html/ibus/IBusSerializable.html
 share/gtk-doc/html/ibus/IBusServer.html
 share/gtk-doc/html/ibus/IBusService.html
 share/gtk-doc/html/ibus/IBusText.html
 share/gtk-doc/html/ibus/ch01.html
+share/gtk-doc/html/ibus/ch02.html
+share/gtk-doc/html/ibus/ch03.html
+share/gtk-doc/html/ibus/ch04.html
+share/gtk-doc/html/ibus/ch05.html
 share/gtk-doc/html/ibus/home.png
 share/gtk-doc/html/ibus/ibus-ibusdebug.html
 share/gtk-doc/html/ibus/ibus-ibusenumtypes.html
@@ -197,6 +203,9 @@ share/gtk-doc/html/ibus/up.png
 %%DATADIR%%/icons/ibus-locale.svg
 %%DATADIR%%/icons/ibus-zh.svg
 %%DATADIR%%/icons/ibus.svg
+%%DATADIR%%/setup/engineabout.py
+%%DATADIR%%/setup/engineabout.pyc
+%%DATADIR%%/setup/engineabout.pyo
 %%DATADIR%%/setup/enginecombobox.py
 %%DATADIR%%/setup/enginecombobox.pyc
 %%DATADIR%%/setup/enginecombobox.pyo
@@ -216,6 +225,9 @@ share/gtk-doc/html/ibus/up.png
 %%DATADIR%%/ui/gtk/candidatepanel.py
 %%DATADIR%%/ui/gtk/candidatepanel.pyc
 %%DATADIR%%/ui/gtk/candidatepanel.pyo
+%%DATADIR%%/ui/gtk/engineabout.py
+%%DATADIR%%/ui/gtk/engineabout.pyc
+%%DATADIR%%/ui/gtk/engineabout.pyo
 %%DATADIR%%/ui/gtk/handle.py
 %%DATADIR%%/ui/gtk/handle.pyc
 %%DATADIR%%/ui/gtk/handle.pyo
@@ -243,19 +255,40 @@ share/gtk-doc/html/ibus/up.png
 %%DATADIR%%/ui/gtk/toolitem.py
 %%DATADIR%%/ui/gtk/toolitem.pyc
 %%DATADIR%%/ui/gtk/toolitem.pyo
+%%NLS%%share/locale/ar/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/as/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/da/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ibus.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/ibus.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/kn/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/ml/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/or/LC_MESSAGES/ibus.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/te/LC_MESSAGES/ibus.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus.mo
 share/pixmaps/ibus-setup.svg
 share/pixmaps/ibus.svg
 @dirrm %%DATADIR%%/ui/gtk
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/engine
-@dirrm %%DATADIR%%/component
+@dirrmtry %%DATADIR%%/engine
+@dirrmtry %%DATADIR%%/component
 @dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%
 @dirrm share/gtk-doc/html/ibus
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc