Update to 1.4.0. Tested with ibus-anthy on amd64. OK? f.-
Index: inputmethods/ibus/Makefile =================================================================== RCS file: /cvs/ports/inputmethods/ibus/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- inputmethods/ibus/Makefile 3 Nov 2011 17:46:21 -0000 1.22 +++ inputmethods/ibus/Makefile 26 Nov 2011 01:23:15 -0000 @@ -4,10 +4,9 @@ SHARED_ONLY = Yes COMMENT = intelligent input bus framework -DISTNAME = ibus-1.3.9 -REVISION = 8 +DISTNAME = ibus-1.4.0 -SHARED_LIBS = ibus 1.0 # 2.0 +SHARED_LIBS = ibus-1.0 0.0 CATEGORIES = inputmethods chinese japanese korean @@ -19,13 +18,13 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ - Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 \ - c cairo dbus-1 drm expat fontconfig freetype gdk-x11-2.0 \ - gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \ - gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \ - pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs \ - xcb xcb-render xcb-shm z dbus-glib-1 ffi stdc++ +WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo \ + cairo-gobject dbus-1 dbus-glib-1 drm expat ffi fontconfig \ + freetype gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ + gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 gtk-x11-2.0 \ + m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ + png pthread pthread-stubs stdc++ xcb xcb-render xcb-shm z MASTER_SITES = http://ibus.googlecode.com/files/ @@ -46,7 +45,8 @@ RUN_DEPENDS = devel/iso-codes \ x11/dbus-python \ x11/gnome/librsvg -LIB_DEPENDS = x11/gtk+2 +LIB_DEPENDS = x11/gtk+2 \ + x11/gtk+3 MODGCONF2_SCHEMAS_DIR = ibus @@ -60,7 +60,5 @@ CONFIGURE_ARGS = --enable-vala \ --enable-gtk-doc-html=no CONFIGURE_ENV = CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" - -FAKE_FLAGS= xdgautostartdir=${PREFIX}/share/examples/ibus/xdg/autostart .include <bsd.port.mk> Index: inputmethods/ibus/distinfo =================================================================== RCS file: /cvs/ports/inputmethods/ibus/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- inputmethods/ibus/distinfo 14 Jan 2011 06:00:33 -0000 1.3 +++ inputmethods/ibus/distinfo 26 Nov 2011 01:23:15 -0000 @@ -1,5 +1,5 @@ -MD5 (ibus-1.3.9.tar.gz) = VzRaPBz+N844JfYiFnbc/g== -RMD160 (ibus-1.3.9.tar.gz) = jPhxLSk2m7GTTA2dZs5fFZU6YNA= -SHA1 (ibus-1.3.9.tar.gz) = PqqVvSqGyfriP9yA3XDSfw77cTg= -SHA256 (ibus-1.3.9.tar.gz) = snhKZoZm76iuBObxz/V0mRfNGK3Qo5odAg7Mnz31KF0= -SIZE (ibus-1.3.9.tar.gz) = 1380081 +MD5 (ibus-1.4.0.tar.gz) = tPBjeU6Jxx6x+MtUMhDaMA== +RMD160 (ibus-1.4.0.tar.gz) = BYOpaQ7lp7tEzhzrwYnDpkRQHKM= +SHA1 (ibus-1.4.0.tar.gz) = xG6gvnKP/U5DHUoYxr0eUc6vBF4= +SHA256 (ibus-1.4.0.tar.gz) = nloX2RDq6TLdDNGF0KECtWrUor951UseU/cBdM0sKj8= +SIZE (ibus-1.4.0.tar.gz) = 1452055 Index: inputmethods/ibus/patches/patch-ibus_common_py =================================================================== RCS file: inputmethods/ibus/patches/patch-ibus_common_py diff -N inputmethods/ibus/patches/patch-ibus_common_py --- inputmethods/ibus/patches/patch-ibus_common_py 19 Aug 2010 18:56:14 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-ibus_common_py,v 1.1.1.1 2010/08/19 18:56:14 fgsch Exp $ ---- ibus/common.py.orig Mon Aug 16 17:51:15 2010 -+++ ibus/common.py Mon Aug 16 17:51:18 2010 -@@ -98,7 +98,7 @@ import ctypes - # return None - # return address - --libibus = ctypes.CDLL("libibus.so.2") -+libibus = ctypes.CDLL("libibus.so") - get_address = libibus.ibus_get_address - get_address.restype=ctypes.c_char_p - Index: inputmethods/ibus/patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-src_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_Makefile_in --- inputmethods/ibus/patches/patch-src_Makefile_in 8 Apr 2011 07:37:24 -0000 1.2 +++ inputmethods/ibus/patches/patch-src_Makefile_in 26 Nov 2011 01:23:15 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2011/04/08 07:37:24 ajacoutot Exp $ ---- src/Makefile.in.orig Thu Nov 25 03:25:46 2010 -+++ src/Makefile.in Fri Apr 8 07:42:52 2011 -@@ -577,7 +577,7 @@ libibus_la_LIBADD = \ +--- src/Makefile.in.orig Sun Nov 13 19:48:06 2011 ++++ src/Makefile.in Sun Nov 13 19:48:42 2011 +@@ -454,7 +454,7 @@ libibus_1_0_la_LIBADD = \ + libibus_1_0_la_LDFLAGS = \ + -no-undefined \ + -export-symbols-regex "ibus_.*" \ +- -version-info @LT_VERSION_INFO@ \ ++ $(libibus_la_LDFLAGS} \ + $(NULL) - libibus_la_LDFLAGS = \ - -export-symbols-regex "ibus_.*" \ -- -version-info @LT_VERSION_INFO@ \ -+ $(libibus_la_LDFLAGS} \ - $(NULL) - - BUILT_SOURCES = \ + ibus_sources = \ Index: inputmethods/ibus/patches/patch-src_ibusshare_c =================================================================== RCS file: inputmethods/ibus/patches/patch-src_ibusshare_c diff -N inputmethods/ibus/patches/patch-src_ibusshare_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ inputmethods/ibus/patches/patch-src_ibusshare_c 26 Nov 2011 01:23:15 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- src/ibusshare.c.orig Sun Nov 13 22:48:27 2011 ++++ src/ibusshare.c Sun Nov 13 22:48:33 2011 +@@ -41,11 +41,11 @@ ibus_get_local_machine_id (void) + + if (machine_id == NULL) { + GError *error = NULL; +- if (!g_file_get_contents ("/var/lib/dbus/machine-id", ++ if (!g_file_get_contents ("/var/db/dbus/machine-id", + &machine_id, + NULL, + &error)) { +- g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message); ++ g_warning ("Unable to load /var/db/dbus/machine-id: %s", error->message); + g_error_free (error); + machine_id = "machine-id"; + } Index: inputmethods/ibus/pkg/PLIST =================================================================== RCS file: /cvs/ports/inputmethods/ibus/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- inputmethods/ibus/pkg/PLIST 8 Apr 2011 07:37:24 -0000 1.8 +++ inputmethods/ibus/pkg/PLIST 26 Nov 2011 01:23:15 -0000 @@ -9,8 +9,6 @@ include/ibus-1.0/ibusbus.h include/ibus-1.0/ibuscomponent.h include/ibus-1.0/ibusconfig.h include/ibus-1.0/ibusconfigservice.h -include/ibus-1.0/ibusconnection.h -include/ibus-1.0/ibusdbus.h include/ibus-1.0/ibusdebug.h include/ibus-1.0/ibusengine.h include/ibus-1.0/ibusenginedesc.h @@ -20,31 +18,30 @@ include/ibus-1.0/ibusfactory.h include/ibus-1.0/ibushotkey.h include/ibus-1.0/ibusinputcontext.h include/ibus-1.0/ibuskeymap.h +include/ibus-1.0/ibuskeys.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 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 include/ibus-1.0/ibusservice.h include/ibus-1.0/ibusshare.h include/ibus-1.0/ibustext.h include/ibus-1.0/ibustypes.h +include/ibus-1.0/ibusutil.h include/ibus-1.0/ibusversion.h include/ibus-1.0/ibusxml.h lib/girepository-1.0/IBus-1.0.typelib @comment lib/gtk-2.0/2.10.0/immodules/im-ibus.la lib/gtk-2.0/2.10.0/immodules/im-ibus.so -@comment lib/libibus.la -@lib lib/libibus.so.${LIBibus_VERSION} +@comment lib/gtk-3.0/3.0.0/immodules/im-ibus.la +lib/gtk-3.0/3.0.0/immodules/im-ibus.so +@comment lib/libibus-1.0.la +@lib lib/libibus-1.0.so.${LIBibus-1.0_VERSION} lib/pkgconfig/ibus-1.0.pc lib/python${MODPY_VERSION}/site-packages/ibus/ lib/python${MODPY_VERSION}/site-packages/ibus/__init__.py @@ -158,14 +155,10 @@ libexec/ibus-ui-gtk @bin libexec/ibus-x11 share/applications/ibus-setup.desktop share/applications/ibus.desktop -share/doc/pkg-readmes/${FULLPKGNAME} -share/examples/ibus/ -share/examples/ibus/xdg/ @sample ${SYSCONFDIR}/xdg/ -share/examples/ibus/xdg/autostart/ @sample ${SYSCONFDIR}/xdg/autostart/ -share/examples/ibus/xdg/autostart/ibus.desktop @sample ${SYSCONFDIR}/xdg/autostart/ibus.desktop +share/doc/pkg-readmes/${FULLPKGNAME} share/gir-1.0/IBus-1.0.gir share/gtk-doc/html/ibus/ share/gtk-doc/html/ibus/IBusAttrList.html @@ -174,7 +167,6 @@ 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/IBusFactory.html @@ -189,7 +181,6 @@ share/gtk-doc/html/ibus/IBusPropList.htm 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 @@ -200,11 +191,8 @@ 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-IBusKeysyms.html -share/gtk-doc/html/ibus/ibus-IBusMessage.html -share/gtk-doc/html/ibus/ibus-IBusPendingCall.html share/gtk-doc/html/ibus/ibus-ibusdebug.html share/gtk-doc/html/ibus/ibus-ibuserror.html -share/gtk-doc/html/ibus/ibus-ibusmainloop.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 @@ -225,6 +213,7 @@ share/ibus/engine/ share/ibus/icons/ share/ibus/keymaps/ share/ibus/keymaps/common +share/ibus/keymaps/in share/ibus/keymaps/jp share/ibus/keymaps/kr share/ibus/keymaps/modifiers @@ -239,6 +228,9 @@ share/ibus/setup/enginecombobox.pyo share/ibus/setup/enginetreeview.py share/ibus/setup/enginetreeview.pyc share/ibus/setup/enginetreeview.pyo +share/ibus/setup/i18n.py +share/ibus/setup/i18n.pyc +share/ibus/setup/i18n.pyo share/ibus/setup/icon.py share/ibus/setup/icon.pyc share/ibus/setup/icon.pyo @@ -260,6 +252,9 @@ share/ibus/ui/gtk/engineabout.pyo share/ibus/ui/gtk/handle.py share/ibus/ui/gtk/handle.pyc share/ibus/ui/gtk/handle.pyo +share/ibus/ui/gtk/i18n.py +share/ibus/ui/gtk/i18n.pyc +share/ibus/ui/gtk/i18n.pyo share/ibus/ui/gtk/icon.py share/ibus/ui/gtk/icon.pyc share/ibus/ui/gtk/icon.pyo @@ -293,46 +288,50 @@ share/icons/hicolor/scalable/apps/ibus-e share/icons/hicolor/scalable/apps/ibus-keyboard.svg share/icons/hicolor/scalable/apps/ibus-setup.svg share/icons/hicolor/scalable/apps/ibus.svg -share/locale/ar/LC_MESSAGES/ibus.mo -share/locale/as/LC_MESSAGES/ibus.mo -share/locale/bn_IN/LC_MESSAGES/ibus.mo -share/locale/ca/LC_MESSAGES/ibus.mo -share/locale/da/LC_MESSAGES/ibus.mo -share/locale/de/LC_MESSAGES/ibus.mo -share/locale/es/LC_MESSAGES/ibus.mo -share/locale/fr/LC_MESSAGES/ibus.mo -share/locale/gu/LC_MESSAGES/ibus.mo -share/locale/hi/LC_MESSAGES/ibus.mo -share/locale/hu/LC_MESSAGES/ibus.mo -share/locale/it/LC_MESSAGES/ibus.mo -share/locale/ja/LC_MESSAGES/ibus.mo -share/locale/kn/LC_MESSAGES/ibus.mo -share/locale/ko/LC_MESSAGES/ibus.mo -share/locale/ml/LC_MESSAGES/ibus.mo -share/locale/mr/LC_MESSAGES/ibus.mo -share/locale/or/LC_MESSAGES/ibus.mo -share/locale/pa/LC_MESSAGES/ibus.mo -share/locale/pl/LC_MESSAGES/ibus.mo -share/locale/pt_BR/LC_MESSAGES/ibus.mo -share/locale/ru/LC_MESSAGES/ibus.mo -share/locale/sr/LC_MESSAGES/ibus.mo -share/locale/sr@latin/LC_MESSAGES/ibus.mo -share/locale/ta/LC_MESSAGES/ibus.mo -share/locale/te/LC_MESSAGES/ibus.mo -share/locale/vi/LC_MESSAGES/ibus.mo -share/locale/zh_CN/LC_MESSAGES/ibus.mo -share/locale/zh_HK/LC_MESSAGES/ibus.mo -share/locale/zh_TW/LC_MESSAGES/ibus.mo -share/vala/ -share/vala/vapi/ -share/vala/vapi/ibus-1.0.vapi +share/locale/ar/LC_MESSAGES/ibus10.mo +share/locale/as/LC_MESSAGES/ibus10.mo +share/locale/bn_IN/LC_MESSAGES/ibus10.mo +share/locale/ca/LC_MESSAGES/ibus10.mo +share/locale/da/LC_MESSAGES/ibus10.mo +share/locale/de/LC_MESSAGES/ibus10.mo +share/locale/en_GB/LC_MESSAGES/ibus10.mo +share/locale/es/LC_MESSAGES/ibus10.mo +share/locale/fr/LC_MESSAGES/ibus10.mo +share/locale/gu/LC_MESSAGES/ibus10.mo +share/locale/hi/LC_MESSAGES/ibus10.mo +share/locale/hu/LC_MESSAGES/ibus10.mo +share/locale/it/LC_MESSAGES/ibus10.mo +share/locale/ja/LC_MESSAGES/ibus10.mo +share/locale/kn/LC_MESSAGES/ibus10.mo +share/locale/ko/LC_MESSAGES/ibus10.mo +share/locale/ml/LC_MESSAGES/ibus10.mo +share/locale/mr/LC_MESSAGES/ibus10.mo +share/locale/nl/LC_MESSAGES/ibus10.mo +share/locale/or/LC_MESSAGES/ibus10.mo +share/locale/pa/LC_MESSAGES/ibus10.mo +share/locale/pl/LC_MESSAGES/ibus10.mo +share/locale/pt_BR/LC_MESSAGES/ibus10.mo +share/locale/ru/LC_MESSAGES/ibus10.mo +share/locale/sr/LC_MESSAGES/ibus10.mo +share/locale/sr@latin/LC_MESSAGES/ibus10.mo +share/locale/ta/LC_MESSAGES/ibus10.mo +share/locale/te/LC_MESSAGES/ibus10.mo +share/locale/uk/LC_MESSAGES/ibus10.mo +share/locale/vi/LC_MESSAGES/ibus10.mo +share/locale/zh_CN/LC_MESSAGES/ibus10.mo +share/locale/zh_HK/LC_MESSAGES/ibus10.mo +share/locale/zh_TW/LC_MESSAGES/ibus10.mo @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null ${SCHEMAS_INSTDIR}/ ${SCHEMAS_INSTDIR}/ibus.schemas @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null @exec %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules @unexec-delete %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules +@exec %D/bin/gtk-query-immodules-3.0 > ${SYSCONFDIR}/gtk-3.0/gtk.immodules +@unexec-delete %D/bin/gtk-query-immodules-3.0 > ${SYSCONFDIR}/gtk-3.0/gtk.immodules @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true @unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database +share/vala/vapi/ibus-1.0.deps +share/vala/vapi/ibus-1.0.vapi
