Update uim to 1.6.0.

Based on PR#43872 by YAMASHIRO, Jun.
some fixes and improvements by me.

uim Changelog:
  - New IM uim-social-ime
  - New IM uim-ajax-ime
  - New IM uim-yahoo-jp
  - Support Wubi86 and ZhengMa tables with Generic IM
  - Improved uim-tutcode with many nice features with table style
    candidate window
  - Stable Qt4 bridge
  - Annotation system
  - Internal plugin system reorganization
  - uim-elatin enhancement
  - Japanese multiple-segment IM enhancement

7 files changed, 201 insertions, 40 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 7422fc0bcfd..92600ad64fd 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2010/09/14 11:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/09/18 03:08:30 obache Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=		2
-
 COMMENT=		Multilingual input method library
 
 CONFLICTS+=		uim-qt4-immodule-[0-9]*
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index c7e928091c2..3e46523393c 100644
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2010/05/15 06:50:03 obache Exp $
+# $NetBSD: Makefile.common,v 1.4 2010/09/18 03:08:31 obache Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=		1.5.7
+UIM_VERSION=		1.6.0
 DISTNAME=		uim-${UIM_VERSION}
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.googlecode.com/files/
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index d0dd31d2a9b..1f335e2ccc9 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.15 2010/08/05 13:23:20 obache Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/09/18 03:08:31 obache Exp $
 ${PLIST.qt3}bin/uim-chardict-qt
 ${PLIST.qt}bin/uim-chardict-qt4
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
 ${PLIST.fep}bin/uim-fep
 ${PLIST.fep}bin/uim-fep-tick
+bin/uim-help
 ${PLIST.gtk}bin/uim-im-switcher-gtk
 ${PLIST.qt3}bin/uim-im-switcher-qt
 ${PLIST.qt}bin/uim-im-switcher-qt4
@@ -19,7 +20,7 @@ ${PLIST.gtk}bin/uim-toolbar-gtk-systray
 ${PLIST.qt3}bin/uim-toolbar-qt
 ${PLIST.qt}bin/uim-toolbar-qt4
 ${PLIST.xim}bin/uim-xim
-include/uim/plugin.h
+include/uim/dynlib.h
 include/uim/uim-custom.h
 include/uim/uim-helper.h
 include/uim/uim-im-switcher.h
@@ -39,18 +40,26 @@ lib/libuim.la
 lib/pkgconfig/uim.pc
 ${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
 ${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la
-${PLIST.canna}lib/uim/plugin/libuim-canna.la
+${PLIST.curl}lib/uim/plugin/libuim-curl.la
 lib/uim/plugin/libuim-custom-enabler.la
+${PLIST.eb}lib/uim/plugin/libuim-eb.la
 ${PLIST.editline}lib/uim/plugin/libuim-editline.la
+${PLIST.expat}lib/uim/plugin/libuim-expat.la
+${PLIST.ffi}lib/uim/plugin/libuim-ffi.la
+lib/uim/plugin/libuim-fileio.la
 lib/uim/plugin/libuim-look.la
 ${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la
-${PLIST.prime}lib/uim/plugin/libuim-prime.la
-${PLIST.sj3}lib/uim/plugin/libuim-sj3.la
+${PLIST.openssl}lib/uim/plugin/libuim-openssl.la
+${PLIST.sqlite}lib/uim/plugin/libuim-sqlite3.la
+lib/uim/plugin/libuim-lolevel.la
+lib/uim/plugin/libuim-process.la
 lib/uim/plugin/libuim-skk.la
+lib/uim/plugin/libuim-socket.la
 ${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
 ${PLIST.gtk}libexec/uim-candwin-gtk
 ${PLIST.qt3}libexec/uim-candwin-qt
 ${PLIST.qt}libexec/uim-candwin-qt4
+${PLIST.gtk}libexec/uim-candwin-tbl-gtk
 libexec/uim-helper-server
 ${PLIST.gnome}libexec/uim-toolbar-applet
 ${PLIST.xim}man/man1/uim-xim.1
@@ -76,6 +85,13 @@ ${PLIST.qt3}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
 ${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
 share/locale/ko/LC_MESSAGES/uim.mo
 share/uim/action.scm
+share/uim/ajax-ime-custom.scm
+share/uim/ajax-ime-key-custom.scm
+share/uim/ajax-ime.scm
+share/uim/annotation-dict.scm
+share/uim/annotation-eb.scm
+share/uim/annotation-filter.scm
+share/uim/annotation.scm
 share/uim/anthy-custom.scm
 share/uim/anthy-key-custom.scm
 share/uim/anthy-utf8-custom.scm
@@ -89,34 +105,48 @@ share/uim/byeoru.scm
 share/uim/canna-custom.scm
 share/uim/canna-key-custom.scm
 share/uim/canna.scm
+share/uim/cannav3-socket.scm
+share/uim/composer.scm
+share/uim/ct.scm
 share/uim/custom-rt.scm
 share/uim/custom.scm
 share/uim/default.scm
 share/uim/deprecated-util.scm
+share/uim/dict-socket.scm
 share/uim/direct.scm
+share/uim/dynlib.scm
 share/uim/editline.scm
 share/uim/elatin-custom.scm
 share/uim/elatin-rules.scm
 share/uim/elatin.scm
+share/uim/event.scm
+share/uim/fileio.scm
 share/uim/generic-custom.scm
 share/uim/generic-key-custom.scm
+share/uim/generic-predict.scm
 share/uim/generic.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
 ${PLIST.helperdata}share/uim/helperdata/bushu.t
 ${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml
+share/uim/http-client.scm
+share/uim/http-server.scm
 share/uim/i18n.scm
 share/uim/ichar.scm
 share/uim/im-custom.scm
 share/uim/im-switcher.scm
 share/uim/im.scm
 share/uim/init.scm
+share/uim/input-parse.scm
 share/uim/installed-modules.scm
 share/uim/ipa-x-sampa.scm
 share/uim/iso-639-1.scm
+share/uim/japanese-act.scm
 share/uim/japanese-azik.scm
+share/uim/japanese-custom.scm
 share/uim/japanese-kana.scm
+share/uim/japanese-kzik.scm
 share/uim/japanese.scm
 share/uim/key.scm
 share/uim/latin.scm
@@ -130,15 +160,23 @@ share/uim/lib/srfi-69.scm
 share/uim/lib/srfi-9.scm
 share/uim/lib/srfi-95.scm
 share/uim/lib/unittest.scm
+share/uim/light-record.scm
 share/uim/load-action.scm
 share/uim/loader.scm
+share/uim/lolevel.scm
 share/uim/look-custom.scm
 share/uim/look.scm
 share/uim/m17nlib.scm
+share/uim/match.scm
 share/uim/mana-custom.scm
 share/uim/mana-key-custom.scm
 share/uim/mana.scm
+share/uim/ng-action.scm
+share/uim/ng-key.scm
+share/uim/openssl.scm
 share/uim/pinyin-big5.scm
+share/uim/pixmaps/ajax-ime.png
+share/uim/pixmaps/ajax-ime.svg
 share/uim/pixmaps/anthy.png
 ${PLIST.anthy}share/uim/pixmaps/anthy-utf8.png
 share/uim/pixmaps/byeoru.png
@@ -146,8 +184,12 @@ share/uim/pixmaps/byeoru.svg
 share/uim/pixmaps/canna.png
 share/uim/pixmaps/direct.png
 share/uim/pixmaps/direct.svg
+share/uim/pixmaps/direct_dark_background.png
+share/uim/pixmaps/direct_dark_background.svg
 share/uim/pixmaps/direct_input.png
 share/uim/pixmaps/direct_input.svg
+share/uim/pixmaps/direct_input_dark_background.png
+share/uim/pixmaps/direct_input_dark_background.svg
 share/uim/pixmaps/elatin.png
 share/uim/pixmaps/elatin.svg
 share/uim/pixmaps/hangul2.png
@@ -159,34 +201,66 @@ share/uim/pixmaps/im_switcher.png
 share/uim/pixmaps/im_switcher.svg
 share/uim/pixmaps/ipa-x-sampa.png
 share/uim/pixmaps/ipa-x-sampa.svg
+share/uim/pixmaps/ja_act.png
+share/uim/pixmaps/ja_act.svg
+share/uim/pixmaps/ja_act_dark_background.png
+share/uim/pixmaps/ja_act_dark_background.svg
 share/uim/pixmaps/ja_azik.png
 share/uim/pixmaps/ja_azik.svg
+share/uim/pixmaps/ja_azik_dark_background.png
+share/uim/pixmaps/ja_azik_dark_background.svg
 share/uim/pixmaps/ja_direct.png
 share/uim/pixmaps/ja_direct.svg
+share/uim/pixmaps/ja_direct_dark_background.png
+share/uim/pixmaps/ja_direct_dark_background.svg
 share/uim/pixmaps/ja_fullwidth_alnum.png
 share/uim/pixmaps/ja_fullwidth_alnum.svg
+share/uim/pixmaps/ja_fullwidth_alnum_dark_background.png
+share/uim/pixmaps/ja_fullwidth_alnum_dark_background.svg
 share/uim/pixmaps/ja_halfkana.png
 share/uim/pixmaps/ja_halfkana.svg
+share/uim/pixmaps/ja_halfkana_dark_background.png
+share/uim/pixmaps/ja_halfkana_dark_background.svg
 share/uim/pixmaps/ja_halfwidth_alnum.png
 share/uim/pixmaps/ja_halfwidth_alnum.svg
+share/uim/pixmaps/ja_halfwidth_alnum_dark_background.png
+share/uim/pixmaps/ja_halfwidth_alnum_dark_background.svg
 share/uim/pixmaps/ja_hiragana.png
 share/uim/pixmaps/ja_hiragana.svg
+share/uim/pixmaps/ja_hiragana_dark_background.png
+share/uim/pixmaps/ja_hiragana_dark_background.svg
 share/uim/pixmaps/ja_kana.png
 share/uim/pixmaps/ja_kana.svg
+share/uim/pixmaps/ja_kana_dark_background.png
+share/uim/pixmaps/ja_kana_dark_background.svg
 share/uim/pixmaps/ja_katakana.png
 share/uim/pixmaps/ja_katakana.svg
+share/uim/pixmaps/ja_katakana_dark_background.png
+share/uim/pixmaps/ja_katakana_dark_background.svg
+share/uim/pixmaps/ja_kzik.png
+share/uim/pixmaps/ja_kzik.svg
+share/uim/pixmaps/ja_kzik_dark_background.png
+share/uim/pixmaps/ja_kzik_dark_background.svg
 share/uim/pixmaps/ja_nicola.png
 share/uim/pixmaps/ja_nicola.svg
 share/uim/pixmaps/ja_pocketbell.png
 share/uim/pixmaps/ja_pocketbell.svg
 share/uim/pixmaps/ja_romaji.png
 share/uim/pixmaps/ja_romaji.svg
+share/uim/pixmaps/ja_romaji_dark_background.png
+share/uim/pixmaps/ja_romaji_dark_background.svg
 share/uim/pixmaps/ko_direct.png
 share/uim/pixmaps/ko_direct.svg
+share/uim/pixmaps/ko_direct_dark_background.png
+share/uim/pixmaps/ko_direct_dark_background.svg
 share/uim/pixmaps/ko_hangulchar.png
 share/uim/pixmaps/ko_hangulchar.svg
+share/uim/pixmaps/ko_hangulchar_dark_background.png
+share/uim/pixmaps/ko_hangulchar_dark_background.svg
 share/uim/pixmaps/ko_hangulword.png
 share/uim/pixmaps/ko_hangulword.svg
+share/uim/pixmaps/ko_hangulword_dark_background.png
+share/uim/pixmaps/ko_hangulword_dark_background.svg
 share/uim/pixmaps/latin.png
 share/uim/pixmaps/latin.svg
 share/uim/pixmaps/look.png
@@ -196,13 +270,19 @@ share/uim/pixmaps/mana.svg
 share/uim/pixmaps/null.png
 share/uim/pixmaps/off.png
 share/uim/pixmaps/off.svg
+share/uim/pixmaps/off_dark_background.png
+share/uim/pixmaps/off_dark_background.svg
 share/uim/pixmaps/on.png
 share/uim/pixmaps/on.svg
+share/uim/pixmaps/on_dark_background.png
+share/uim/pixmaps/on_dark_background.svg
 share/uim/pixmaps/pinyin-big5.png
 share/uim/pixmaps/pinyin-big5.svg
 share/uim/pixmaps/prime.png
 share/uim/pixmaps/prime_mode_application.png
 share/uim/pixmaps/prime_mode_application.svg
+share/uim/pixmaps/prime_mode_application_dark_background.png
+share/uim/pixmaps/prime_mode_application_dark_background.svg
 share/uim/pixmaps/py.png
 share/uim/pixmaps/py.svg
 share/uim/pixmaps/pyunihan.png
@@ -215,12 +295,22 @@ share/uim/pixmaps/sj3.png
 share/uim/pixmaps/sj3.svg
 share/uim/pixmaps/skk.png
 share/uim/pixmaps/skk.svg
+share/uim/pixmaps/skk_dark_background.png
+share/uim/pixmaps/skk_dark_background.svg
+share/uim/pixmaps/social-ime.png
+share/uim/pixmaps/social-ime.svg
 share/uim/pixmaps/tcode.png
 share/uim/pixmaps/tcode.svg
+share/uim/pixmaps/tcode_dark_background.png
+share/uim/pixmaps/tcode_dark_background.svg
 share/uim/pixmaps/trycode.png
 share/uim/pixmaps/trycode.svg
+share/uim/pixmaps/trycode_dark_background.png
+share/uim/pixmaps/trycode_dark_background.svg
 share/uim/pixmaps/tutcode.png
 share/uim/pixmaps/tutcode.svg
+share/uim/pixmaps/tutcode_dark_background.png
+share/uim/pixmaps/tutcode_dark_background.svg
 share/uim/pixmaps/uim-dict.png
 share/uim/pixmaps/uim-dict.svg
 share/uim/pixmaps/uim-gray.png
@@ -229,14 +319,32 @@ share/uim/pixmaps/uim-icon48.png
 share/uim/pixmaps/uim-icon64.png
 share/uim/pixmaps/unknown.png
 share/uim/pixmaps/unknown.svg
+share/uim/pixmaps/unknown_dark_background.png
+share/uim/pixmaps/unknown_dark_background.svg
 share/uim/pixmaps/viqr.png
 share/uim/pixmaps/viqr.svg
+share/uim/pixmaps/wb86.png
+share/uim/pixmaps/wb86.svg
+share/uim/pixmaps/wb86_dark_background.png
+share/uim/pixmaps/wb86_dark_background.svg
 share/uim/pixmaps/wnn.png
 share/uim/pixmaps/wnn.svg
+share/uim/pixmaps/yahoo-jp.png
+share/uim/pixmaps/yahoo-jp.svg
+share/uim/pixmaps/zm.png
+share/uim/pixmaps/zm.svg
+share/uim/pixmaps/zm_dark_background.png
+share/uim/pixmaps/zm_dark_background.svg
 share/uim/plugin.scm
+share/uim/predict-custom.scm
+share/uim/predict-look-skk.scm
+share/uim/predict-look.scm
+share/uim/predict-sqlite3.scm
+share/uim/pregexp.scm
 share/uim/prime-custom.scm
 share/uim/prime-key-custom.scm
 share/uim/prime.scm
+share/uim/process.scm
 share/uim/py.scm
 share/uim/pyload.scm
 share/uim/pyunihan.scm
@@ -246,26 +354,45 @@ share/uim/scim.scm
 share/uim/sj3-custom.scm
 share/uim/sj3-key-custom.scm
 share/uim/sj3.scm
+share/uim/sj3v2-socket.scm
 share/uim/skk-custom.scm
 share/uim/skk-dialog.scm
 share/uim/skk-editor.scm
 share/uim/skk-key-custom.scm
 share/uim/skk.scm
+share/uim/social-ime-custom.scm
+share/uim/social-ime-key-custom.scm
+share/uim/social-ime.scm
+share/uim/socket.scm
+share/uim/sqlite3.scm
+share/uim/sxml-tools.scm
+share/uim/sxpathlib.scm
+share/uim/tables/wb86.table
+share/uim/tables/zm.table
 share/uim/tcode.scm
+share/uim/trec.scm
 share/uim/trycode.scm
 share/uim/tutcode-bushudic.scm
 share/uim/tutcode-custom.scm
+share/uim/tutcode-dialog.scm
+share/uim/tutcode-editor.scm
 share/uim/tutcode-key-custom.scm
 share/uim/tutcode-kigoudic.scm
 share/uim/tutcode-rule.scm
 share/uim/tutcode.scm
+share/uim/uim-help.scm
 share/uim/uim-module-manager.scm
 share/uim/uim-sh.scm
 share/uim/ustr.scm
 share/uim/util.scm
 share/uim/viqr.scm
+share/uim/wlos.scm
 share/uim/wnn-custom.scm
 share/uim/wnn-key-custom.scm
 share/uim/wnn.scm
+share/uim/xmload.scm
+share/uim/yahoo-jp-custom.scm
+share/uim/yahoo-jp-key-custom.scm
+share/uim/yahoo-jp.scm
 share/uim/zaurus.scm
 @pkgdir lib/uim/notify
diff --git a/inputmethod/uim/buildlink3.mk b/inputmethod/uim/buildlink3.mk
index dbe535ff8b5..a0dccef305b 100644
--- a/inputmethod/uim/buildlink3.mk
+++ b/inputmethod/uim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/05 02:10:13 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/09/18 03:08:31 obache Exp $
 
 BUILDLINK_TREE+=	uim
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	uim
 UIM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.uim+=	uim>=1.5.1
-BUILDLINK_ABI_DEPENDS.uim?=	uim>=1.5.1
+BUILDLINK_ABI_DEPENDS.uim?=	uim>=1.6.0
 BUILDLINK_PKGSRCDIR.uim?=	../../inputmethod/uim
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 8299f32831f..dbc17a13594 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/01/20 11:06:07 obache Exp $
+$NetBSD: distinfo,v 1.17 2010/09/18 03:08:31 obache Exp $
 
-SHA1 (uim-1.5.7.tar.bz2) = fbea2590286ddc857a7824d8544cb08842f4299f
-RMD160 (uim-1.5.7.tar.bz2) = 037677cd583c2b69293fbbc1c0393756d7c7adac
-Size (uim-1.5.7.tar.bz2) = 3330555 bytes
-SHA1 (patch-ab) = 81693dd1b62bec4deb99b469a0b8e53ff11e86a8
+SHA1 (uim-1.6.0.tar.bz2) = d27f2ca8136da0702c82f0522911d06b2b8f8ea7
+RMD160 (uim-1.6.0.tar.bz2) = 14881fe9ff1af64cee1317d0b51af69294377e47
+Size (uim-1.6.0.tar.bz2) = 6154925 bytes
+SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5
 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index c3be31b5766..e0ce0456dd5 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.20 2010/05/15 07:05:57 obache Exp $
+# $NetBSD: options.mk,v 1.21 2010/09/18 03:08:31 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
-#PKG_SUPPORTED_OPTIONS=	anthy canna eb gnome gtk m17nlib prime sj3 uim-fep wnn xim
-PKG_SUPPORTED_OPTIONS=	anthy canna eb gnome gtk m17nlib prime sj3 uim-fep xim
+#PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep wnn xim
+PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep xim
 PKG_OPTIONS_OPTIONAL_GROUPS=	kde qt
 PKG_OPTIONS_GROUP.kde=	kde kde3
 PKG_OPTIONS_GROUP.qt=	qt qt3
@@ -22,7 +22,7 @@ PKG_FAIL_REASON+=	"'qt3' conflict with 'qt' or 'kde' option"
 .endif
 
 PLIST_VARS+=		helperdata uim-dict-gtk fep
-PLIST_VARS+=		anthy canna gnome gtk kde kde3 m17nlib prime qt qt3 sj3 wnn xim
+PLIST_VARS+=		anthy curl eb expat ffi gnome gtk kde kde3 m17nlib openssl qt qt3 sqlite wnn xim
 
 .if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libX11/buildlink3.mk"
@@ -56,32 +56,44 @@ CONFIGURE_ARGS+=	--disable-fep
 
 .if !empty(PKG_OPTIONS:Manthy)
 .  include "../../inputmethod/anthy/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-dict --with-anthy-utf8
+CONFIGURE_ARGS+=	--with-anthy-utf8
 PLIST.anthy=		yes
-.  if !empty(PKG_OPTIONS:Mgtk)
-PLIST.uim-dict-gtk=	yes
-.  endif
 .else
 CONFIGURE_ARGS+=	--without-anthy
 .endif
 
 .if !empty(PKG_OPTIONS:Mcanna)
-.  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-canna
-PLIST.canna=		yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mcurl)
+.  include "../../www/curl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curl
+PLIST.curl=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Meb)
 .include "../../textproc/eb/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-eb
 CONFIGURE_ARGS+=	--with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
+PLIST.eb=		yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mexpat)
+.  include "../../textproc/expat/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
+PLIST.expat=		yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mffi)
+.  include "../../devel/libffi/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ffi
+PLIST.ffi=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
 .  include "../../x11/gnome-panel/buildlink3.mk"
 .  include "../../devel/libgnomeui/buildlink3.mk"
-CFLAGS+=		-I$(BUILDLINK_PREFIX.libgnomeui)/include/libgnomeui-2.0
-BUILDLINK_TRANSFORM+=	l:panel-applet-2:panel-applet-2:gnomeui-2
 PLIST.gnome=		yes
 .else
 CONFIGURE_ARGS+=	--disable-gnome-applet
@@ -91,6 +103,13 @@ CONFIGURE_ARGS+=	--disable-gnome-applet
 GTK2_IMMODULES=		YES
 .include "../../x11/gtk2/modules.mk"
 PLIST.gtk=		yes
+.  if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna)
+.    if !empty(PKG_OPTIONS:Mcanna)
+.      include "../../inputmethod/canna-lib/buildlink3.mk"
+.    endif
+CONFIGURE_ARGS+=	--enable-dict
+PLIST.uim-dict-gtk=	yes
+.  endif
 .else
 CONFIGURE_ARGS+=	--without-gtk2
 .endif
@@ -138,18 +157,27 @@ PLIST.helperdata=	yes
 PLIST.qt=		yes
 .endif
 
+.if !empty(PKG_OPTIONS:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-openssl
+# XXX: https://bugs.freedesktop.org/show_bug.cgi?id=30249
+#CONFIGURE_ARGS+=	--with-openssl-dir=${SSLBASE:Q}
+PLIST.openssl=		yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mprime)
-.  include "../../inputmethod/prime/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-prime
-PLIST.prime=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Msj3)
-.  include "../../inputmethod/sj3-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sj3
-CONFIGURE_ARGS+=	SJ3_CFLAGS=-I${BUILDLINK_PREFIX.sj3-lib}/includes
-CONFIGURE_ARGS+=	SJ3_LIBS="-L${BUILDLINK_PREFIX.sj3-lib}/lib -lsj3lib"
-PLIST.sj3=		yes
+.endif
+
+# For input prediction
+.if !empty(PKG_OPTIONS:Msqlite)
+.  include "../../databases/sqlite3/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sqlite3
+PLIST.sqlite3=		yes
 .endif
 
 #.if !empty(PKG_OPTIONS:Mwnn)
@@ -159,3 +187,11 @@ PLIST.sj3=		yes
 #CONFIGURE_ARGS+=	--with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
 #PLIST.wnn=		yes
 #.endif
+
+.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+=	--enable-default-toolkit=gtk
+.elif !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
+CONFIGURE_ARGS+=	--enable-default-toolkit=qt4
+.elif !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)
+CONFIGURE_ARGS+=	--enable-default-toolkit=qt
+.endif
diff --git a/inputmethod/uim/patches/patch-ab b/inputmethod/uim/patches/patch-ab
index 9874f783849..59ce4b3306a 100644
--- a/inputmethod/uim/patches/patch-ab
+++ b/inputmethod/uim/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2009/01/23 13:40:32 obache Exp $
+$NetBSD: patch-ab,v 1.3 2010/09/18 03:08:31 obache Exp $
 
 Avoid to install of header files of sigscheme, conflict with lang/sigscheme.
 
---- sigscheme/src/Makefile.in.orig	2009-01-21 11:48:58.000000000 +0000
+--- sigscheme/src/Makefile.in.orig	2010-08-11 07:29:39.000000000 +0000
 +++ sigscheme/src/Makefile.in
 @@ -22,7 +22,7 @@
+ 
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
 -pkgincludedir = $(includedir)/@PACKAGE@
 +pkgincludedir = 
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c