5 files changed, 22 insertions, 59 deletions

diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 8848709a23eb..b010b01a18e3 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ibus
-PORTVERSION=	1.2.0.20091024
-PORTREVISION=	3
+PORTVERSION=	1.3.3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/textproc/ibus/distinfo b/textproc/ibus/distinfo
index 220bf4ba63a8..794934aae115 100644
--- a/textproc/ibus/distinfo
+++ b/textproc/ibus/distinfo
@@ -1,3 +1,3 @@
-MD5 (ibus-1.2.0.20091024.tar.gz) = 2133a37805abff86f6aa160f08dcd4f4
-SHA256 (ibus-1.2.0.20091024.tar.gz) = 72a70c51184718cb81e2c31988538d9daac655353a9712e06f2dcbe6361fd863
-SIZE (ibus-1.2.0.20091024.tar.gz) = 1444736
+MD5 (ibus-1.3.3.tar.gz) = 2be859019b593685b1cec8310627426f
+SHA256 (ibus-1.3.3.tar.gz) = 25173a99c57a415638a242f8527ef2c867e9ec1e487340b11bff6b2d5ab78be1
+SIZE (ibus-1.3.3.tar.gz) = 1219150
diff --git a/textproc/ibus/files/patch-src_ibusconfigprivate.h b/textproc/ibus/files/patch-src_ibusconfigprivate.h
deleted file mode 100644
index 356e8602a06d..000000000000
--- a/textproc/ibus/files/patch-src_ibusconfigprivate.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/ibusconfigprivate.h.orig	2009-11-14 11:44:58.000000000 +0800
-+++ src/ibusconfigprivate.h	2009-11-14 11:45:31.000000000 +0800
-@@ -28,7 +28,7 @@
-     g_assert (iter != NULL);
-     g_assert (value != NULL);
- 
--    gint type;
-+    GType type;
-     IBusMessageIter sub_iter;
- 
-     type = ibus_message_iter_get_arg_type (iter);
-@@ -83,7 +83,7 @@
-         if (type == IBUS_TYPE_ARRAY) {
-             GValue v = { 0 };
-             IBusMessageIter sub_iter;
--            gint sub_type;
-+            GType sub_type;
-             GValueArray *array;
- 
- 
diff --git a/textproc/ibus/files/patch-util_IMdkit_Makefile.in b/textproc/ibus/files/patch-util_IMdkit_Makefile.in
deleted file mode 100644
index 7ae1f8c99f69..000000000000
--- a/textproc/ibus/files/patch-util_IMdkit_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- util/IMdkit/Makefile.in.orig	2009-11-10 13:51:17.000000000 +0800
-+++ util/IMdkit/Makefile.in	2009-11-10 14:03:55.000000000 +0800
-@@ -306,6 +306,9 @@
- 	IMValues.c \
- 	$(NULL)
- 
-+libIMdkit_la_CFLAGS = \
-+	@X11_CFLAGS@
-+
- noinst_HEADERS = \
- 	FrameMgr.h \
- 	IMdkit.h \
-@@ -396,7 +399,7 @@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	$(LTCOMPILE) ${libIMdkit_la_CFLAGS} -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index d9deea2ea929..ee2a9e4a8a3f 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -2,6 +2,7 @@
 %%DATADIR%%/component/gtkpanel.xml
 %%DATADIR%%/keymaps/common
 %%DATADIR%%/keymaps/jp
+%%DATADIR%%/keymaps/kr
 %%DATADIR%%/keymaps/modifiers
 %%DATADIR%%/keymaps/us
 %%DATADIR%%/setup/engineabout.py
@@ -67,6 +68,7 @@
 %%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/it/LC_MESSAGES/ibus.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/ibus.mo
 %%NLS%%share/locale/kn/LC_MESSAGES/ibus.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/ibus.mo
@@ -194,6 +196,7 @@ bin/ibus-setup
 etc/xdg/autostart/ibus.desktop
 include/ibus-1.0/ibus.h
 include/ibus-1.0/ibusattribute.h
+include/ibus-1.0/ibusattrlist.h
 include/ibus-1.0/ibusbus.h
 include/ibus-1.0/ibuscomponent.h
 include/ibus-1.0/ibusconfig.h
@@ -215,8 +218,10 @@ include/ibus-1.0/ibusmarshalers.h
 include/ibus-1.0/ibusmessage.h
 include/ibus-1.0/ibusobject.h
 include/ibus-1.0/ibusobservedpath.h
+include/ibus-1.0/ibuspanelservice.h
 include/ibus-1.0/ibuspendingcall.h
 include/ibus-1.0/ibusproperty.h
+include/ibus-1.0/ibusproplist.h
 include/ibus-1.0/ibusproxy.h
 include/ibus-1.0/ibusserializable.h
 include/ibus-1.0/ibusserver.h
@@ -230,14 +235,14 @@ lib/gtk-2.0/2.10.0/immodules/im-ibus.la
 lib/gtk-2.0/2.10.0/immodules/im-ibus.so
 lib/libibus.la
 lib/libibus.so
-lib/libibus.so.1
+lib/libibus.so.2
 libdata/pkgconfig/ibus-1.0.pc
 libexec/ibus-gconf
 libexec/ibus-ui-gtk
 libexec/ibus-x11
 share/applications/ibus-setup.desktop
 share/applications/ibus.desktop
-share/gtk-doc/html/ibus/IBusAttribute.html
+share/gtk-doc/html/ibus/IBusAttrList.html
 share/gtk-doc/html/ibus/IBusBus.html
 share/gtk-doc/html/ibus/IBusComponent.html
 share/gtk-doc/html/ibus/IBusConfig.html
@@ -248,36 +253,36 @@ share/gtk-doc/html/ibus/IBusEngineDesc.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/IBusKeymap.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/IBusPanelService.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/ch06.html
 share/gtk-doc/html/ibus/home.png
-share/gtk-doc/html/ibus/ibus-IBusKeymap.html
+share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
+share/gtk-doc/html/ibus/ibus-IBusMessage.html
+share/gtk-doc/html/ibus/ibus-IBusPendingCall.html
+share/gtk-doc/html/ibus/ibus-ibusattribute.html
 share/gtk-doc/html/ibus/ibus-ibusdebug.html
-share/gtk-doc/html/ibus/ibus-ibusenumtypes.html
 share/gtk-doc/html/ibus/ibus-ibuserror.html
-share/gtk-doc/html/ibus/ibus-ibusinternal.html
-share/gtk-doc/html/ibus/ibus-ibuskeysyms.html
 share/gtk-doc/html/ibus/ibus-ibusmainloop.html
-share/gtk-doc/html/ibus/ibus-ibusmarshalers.html
-share/gtk-doc/html/ibus/ibus-ibusmessage.html
-share/gtk-doc/html/ibus/ibus-ibuspendingcall.html
+share/gtk-doc/html/ibus/ibus-ibusserializable.html
+share/gtk-doc/html/ibus/ibus-ibusserver.html
+share/gtk-doc/html/ibus/ibus-ibusservice.html
 share/gtk-doc/html/ibus/ibus-ibusshare.html
 share/gtk-doc/html/ibus/ibus-ibustypes.html
 share/gtk-doc/html/ibus/ibus-ibusversion.html
 share/gtk-doc/html/ibus/ibus-ibusxml.html
-share/gtk-doc/html/ibus/ibus-keyname-table.html
 share/gtk-doc/html/ibus/ibus.devhelp
 share/gtk-doc/html/ibus/ibus.devhelp2
 share/gtk-doc/html/ibus/index.html