Update uim to 1.5.5.

Based on patch from Yamashiro, Jun in tech-pkg-ja@.

While here, deprecate curses and x11 option then introduce uim-fep and xim
option to exactly enable/disable those features.

Overview of changes from 1.5.4 to 1.5.5
=======================================
* Enhancements
  - uim-anthy
  - uim-anthy-utf8
    * Learn transposing Katakana/Hiragana string (bug #18630)

  - misc Japanese IM
    * AZIK roma-kana table update
    * Don't use "nwa", "nwi", "nwu", "nwe", "nwo" roma-kana sequences
      by default

  - uim-pref-gtk
  - uim-pref-qt
    * Reduced startup time

* Fixes
  - GTK+ bridge
  - uim.el
  - uim-skk
  - uim-look
    * Plug memory leaks

  - uim-dict-gtk
    * Fix warning with GTK+-2.14.x


Overview of changes from 1.5.3 to 1.5.4
=======================================
* Enhancements
  - Generic IM
    * Cache candidates to improve the performance
    * Add an option to show candidate window automatically when
      multiple candidates are found

  - uim-tutcode
    * New symbol (kigou) input mode

  - GTK+ bridge
  - Qt{3,4} bridge
  - XIM bridge
    * Improve the performance upon activating the window with large
      number of candidates

* Fixes
  - uim.el
    * Plug memory leak.
    * Ignore 'd' command if valid uim-default-im-engine is defined

  - uim-fep
    * Fix compilation with Solaris' cc

  - uim-skk
    * Fix handling in non-matching upper case character in
      skk-proc-state-direct.

  - uim-pref-gtk
    * Fix warning with GTK+-2.14.x


Overview of changes from 1.5.2 to 1.5.3
=======================================
* Fixes
  - Qt4 bridge (experimental)
    * [CRITICAL] Fix bug with Qt4 >= 4.4.1, which makes applications
      infinite loop at the startup
    * [CRITICAL] Fix uim-helper handling which could cause unexpected crashes
    * Fix key press with shift, control, alt, and meta keys

  - uim-xim
    * Fix some minor protocol errors

  - uim.el
    * Improve minibuffer editing

  - uim-tutcode
    * Fix out-of-range error when candidates are longer than
      tutcode-heading-label-char-list

* Others
  - uim-toolbar-gtk-systray
    * Adjust ythickness of the buttons

  - uim-pref-gtk
    * Add vertical scrollbar for the setting pane


Overview of changes from 1.5.1 to 1.5.2
=======================================
* Enhancements
  - Enable input method rotation by hotkeys

  - uim-trycode
    * Updated the composition table to 2008-04-18 version

* Fixes
  - uim.el
    * [CRITICAL] Fix breaking minor-mode-map-alist in some cases.
    * [CRITICAL] Fix uim-el-helper-agent
    * Fix displaying candidates when a right-hand neighbor
       character of the cursor is a horizontal-tab

  - uim-xim
    * Fix Japanese kana-keyboard input hack to distinguish 'kana_RO'
      key and backslash key

  - uim-canna
    * Don't disable libuim functionality even when canna server is
      stopped.

  - uim-elatin
    * Fix problem when only elatin IM is loaded.

  - uim-prime
    * Fix crash when input mode is forced to set as app-mode by
      toolbar menu while "Enable vi-cooperative mode" is off.

7 files changed, 108 insertions, 71 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index c97a5510f54..b6129fd361a 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,26 +1,19 @@
-# $NetBSD: Makefile,v 1.35 2009/01/09 03:32:08 uebayasi Exp $
+# $NetBSD: Makefile,v 1.36 2009/01/23 13:40:32 obache Exp $
 #
 
-DISTNAME=		uim-1.5.1
-CATEGORIES=		inputmethod
-MASTER_SITES=		http://uim.googlecode.com/files/
-EXTRACT_SUFX=		.tar.bz2
+.include "../../inputmethod/uim/Makefile.common"
 
-MAINTAINER=		VEG03617@nifty.com
-HOMEPAGE=		http://code.google.com/p/uim/
 COMMENT=		Multilingual input method library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
-USE_NCURSES=		YES	# clear_screen, clr_eos
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool pkg-config msgfmt
 USE_LANGUAGES=		c c++
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
 GNU_CONFIGURE=		YES
-GTK2_IMMODULES=		YES
 CONFIGURE_ARGS+=	--disable-emacs
 CONFIGURE_ARGS+=	--with-libgcroots=installed
 
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
new file mode 100644
index 00000000000..d12fa57aed6
--- /dev/null
+++ b/inputmethod/uim/Makefile.common
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.common,v 1.1 2009/01/23 13:40:32 obache Exp $
+#
+# used by inputmethod/uim/Makefile
+# used by inputmethod/uim-elisp/Makefile
+# used by inputmethod/uim-qt4-immodule/Makefile
+
+UIM_VERSION=		1.5.5
+DISTNAME=		uim-${UIM_VERSION}
+CATEGORIES=		inputmethod
+MASTER_SITES=		http://uim.googlecode.com/files/
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		VEG03617@nifty.com
+HOMEPAGE=		http://code.google.com/p/uim/
+
+DISTINFO_FILE=		${.CURDIR}/../../inputmethod/uim/distinfo
+PATCHDIR=		${.CURDIR}/../../inputmethod/uim/patches
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index 68f79bc8ecc..e43fff91bcd 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2009/01/09 03:32:08 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/01/23 13:40:32 obache Exp $
 ${PLIST.qt}bin/uim-chardict-qt
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
-bin/uim-fep
-bin/uim-fep-tick
+${PLIST.fep}bin/uim-fep
+${PLIST.fep}bin/uim-fep-tick
 ${PLIST.gtk}bin/uim-im-switcher-gtk
 ${PLIST.qt}bin/uim-im-switcher-qt
 ${PLIST.gtk}bin/uim-input-pad-ja
@@ -12,9 +12,9 @@ ${PLIST.gtk}bin/uim-pref-gtk
 ${PLIST.qt}bin/uim-pref-qt
 bin/uim-sh
 ${PLIST.gtk}bin/uim-toolbar-gtk
-${PLIST.qt}bin/uim-toolbar-qt
 ${PLIST.gtk}bin/uim-toolbar-gtk-systray
-${PLIST.x11}bin/uim-xim
+${PLIST.qt}bin/uim-toolbar-qt
+${PLIST.xim}bin/uim-xim
 include/uim/plugin.h
 include/uim/uim-custom.h
 include/uim/uim-helper.h
@@ -26,11 +26,11 @@ include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
 ${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
+${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
+${PLIST.kde}lib/kde3/uim_panelapplet.la
 lib/libuim-custom.la
 lib/libuim-scm.la
 lib/libuim.la
-${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
-${PLIST.kde}lib/kde3/uim_panelapplet.la
 lib/pkgconfig/uim.pc
 ${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
 ${PLIST.canna}lib/uim/plugin/libuim-canna.la
@@ -46,7 +46,7 @@ ${PLIST.gtk}libexec/uim-candwin-gtk
 ${PLIST.qt}libexec/uim-candwin-qt
 libexec/uim-helper-server
 ${PLIST.gnome}libexec/uim-toolbar-applet
-${PLIST.x11}man/man1/uim-xim.1
+${PLIST.xim}man/man1/uim-xim.1
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
@@ -60,11 +60,11 @@ share/doc/uim/UIM-SCM
 share/doc/uim/UIM-SH
 share/doc/uim/uim-fep/README
 share/doc/uim/uim-fep/README.ja
+${PLIST.kde}share/kde/apps/kicker/applets/uimapplet.desktop
 share/locale/fr/LC_MESSAGES/uim.mo
 share/locale/ja/LC_MESSAGES/uim.mo
-share/locale/ko/LC_MESSAGES/uim.mo
 ${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
-${PLIST.kde}share/kde/apps/kicker/applets/uimapplet.desktop
+share/locale/ko/LC_MESSAGES/uim.mo
 share/uim/action.scm
 share/uim/anthy-custom.scm
 share/uim/anthy-key-custom.scm
@@ -182,8 +182,12 @@ share/uim/pixmaps/look.png
 share/uim/pixmaps/look.svg
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-am-sera.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-ar-kbd.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-as-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-as-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-as-phonetic.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-probhat.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-unijoy.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-bo-wylie.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-bopo-kbd.png
@@ -191,10 +195,20 @@ ${PLIST.m17nlib}share/uim/pixmaps/m17n-cmc-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-dv-phonetic.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-el-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-en-ispell.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-h-fundamente.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-h-sistemo.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-plena.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-q-sistemo.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-x-sistemo.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-fa-isiri.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-phonetic.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-he-kbd.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-phonetic.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-remington.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-typewriter.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-hr-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-hy-kbd.png
@@ -204,50 +218,46 @@ ${PLIST.m17nlib}share/uim/pixmaps/m17n-ka-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-kk-arabic.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-kk-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-km-yannis.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-kgp.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-han2.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-romaja.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-post.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-pre.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-lrt.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-mozhi.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-mr-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-my-kbd.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ne-rom.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ne-trad.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-or-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-or-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-jhelum.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-phonetic.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-rfc1345.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-yawerty.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-sd-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-si-samanala.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-si-wijesekera.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-sk-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-sr-kbd.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-sv-post.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-syrc-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-kk-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-km-yannis.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-han2.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-romaja.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-post.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-pre.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-lrt.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-my-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-or-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-rfc1345.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-yawerty.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-si-samanala.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-si-wijesekera.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-sk-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-sr-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-sv-post.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-syrc-phonetic.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-phonetic.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-tamil99.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-typewriter.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-te-inscript.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-te-itrans.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-te-pothana.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-th-kesmanee-2.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-th-kesmanee.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-th-pattachote-2.png
@@ -255,6 +265,9 @@ ${PLIST.m17nlib}share/uim/pixmaps/m17n-th-pattachote.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-th-tis820-2.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-th-tis820.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-unicode.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-ur-phonetic.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-nom-vni.png
+${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-nom.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-tcvn.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-telex.png
 ${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-viqr.png
@@ -333,6 +346,7 @@ share/uim/trycode.scm
 share/uim/tutcode-bushudic.scm
 share/uim/tutcode-custom.scm
 share/uim/tutcode-key-custom.scm
+share/uim/tutcode-kigoudic.scm
 share/uim/tutcode-rule.scm
 share/uim/tutcode.scm
 share/uim/uim-module-manager.scm
@@ -344,9 +358,9 @@ share/uim/wnn-custom.scm
 share/uim/wnn-key-custom.scm
 share/uim/wnn.scm
 share/uim/zaurus.scm
-${PLIST.helperdata}@dirrm share/uim/helperdata
-@dirrm share/uim/lib
 @dirrm share/uim/pixmaps
+@dirrm share/uim/lib
+${PLIST.helperdata}@dirrm share/uim/helperdata
 @dirrm share/uim
 @comment in kde: @dirrm share/kde/apps/kicker/applets
 @dirrm share/doc/uim/uim-fep
@@ -358,4 +372,5 @@ ${PLIST.helperdata}@dirrm share/uim/helperdata
 @dirrm lib/uim
 @comment in kde: @dirrm lib/kde3
 @comment in gtk2: @dirrm lib/gtk-2.0/2.10.0/immodules
+@comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/uim
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 4b516796fb1..b63554371f9 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2008/06/08 13:01:48 obache Exp $
+$NetBSD: distinfo,v 1.15 2009/01/23 13:40:32 obache Exp $
 
-SHA1 (uim-1.5.1.tar.bz2) = d171e9a933fc9e2fefb948d94bc27171bf32dee7
-RMD160 (uim-1.5.1.tar.bz2) = bb286bafc36a0d2c2f4ca45be3247615aa7470ef
-Size (uim-1.5.1.tar.bz2) = 3345651 bytes
-SHA1 (patch-ab) = 2f08ae44a02dc1be38c4e25ca0d2739bcb55157a
-SHA1 (patch-ac) = 7c487900faf0dee22b4d8258b8e8c24fb2dffc12
+SHA1 (uim-1.5.5.tar.bz2) = d688f962073f0f95391fa38cb82ee5703c2ff3b8
+RMD160 (uim-1.5.5.tar.bz2) = ac3815658d02abde9d2bf68b90f3e3777734d7e9
+Size (uim-1.5.5.tar.bz2) = 3259238 bytes
+SHA1 (patch-ab) = 81693dd1b62bec4deb99b469a0b8e53ff11e86a8
+SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 32117219964..ce48be8d215 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,26 +1,35 @@
-# $NetBSD: options.mk,v 1.14 2009/01/09 03:32:08 uebayasi Exp $
+# $NetBSD: options.mk,v 1.15 2009/01/23 13:40:32 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
-#PKG_SUPPORTED_OPTIONS=	anthy canna curses eb gnome gtk kde m17nlib qt prime sj3 wnn x11
-PKG_SUPPORTED_OPTIONS=	anthy canna curses eb gnome gtk kde m17nlib qt prime x11
-PKG_SUGGESTED_OPTIONS=	anthy canna curses gtk x11
+#PKG_SUPPORTED_OPTIONS=	anthy canna eb gnome gtk kde m17nlib qt prime sj3 uim-fep wnn xim
+PKG_SUPPORTED_OPTIONS=	anthy canna eb gnome gtk kde m17nlib qt prime uim-fep xim
+PKG_SUGGESTED_OPTIONS=	anthy canna gtk uim-fep xim
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		helperdata uim-dict-gtk
-PLIST_VARS+=		anthy canna gnome gtk kde m17nlib prime qt sj3 wnn x11
+PLIST_VARS+=		helperdata uim-dict-gtk fep
+PLIST_VARS+=		anthy canna gnome gtk kde m17nlib prime qt sj3 wnn xim
 
-.if !empty(PKG_OPTIONS:Mx11)
+.if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libX11/buildlink3.mk"
-PLIST.x11=		yes
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x
+PLIST.xim=		yes
 .else
-CONFIGURE_ARGS+=	--with-x=no
+SUBST_CLASSES+=		xim
+SUBST_STAGE.xim=	pre-configure
+SUBST_FILES.xim=	configure
+SUBST_SED.xim=		-e 's;use_xim="yes";use_xim="no";g'
 .endif
 
-.if !empty(PKG_OPTIONS:Mcurses)
-.include "../../devel/ncurses/buildlink3.mk"	# XXXUEBAYASI setupterm in ncurses is needed
-#.include "../../mk/curses.buildlink3.mk"	# XXXUEBAYASI for FEP
+.if !empty(PKG_OPTIONS:Muim-fep)
+USE_NCURSES=		YES	# setupterm, clear_screen, clr_eos
+.include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-fep
+PLIST.fep=		yes
 .else
+CONFIGURE_ARGS+=	--disable-fep
 .endif
 
 .if !empty(PKG_OPTIONS:Manthy)
@@ -54,6 +63,7 @@ CONFIGURE_ARGS+=	--disable-gnome-applet
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
+GTK2_IMMODULES=		YES
 .include "../../x11/gtk2/modules.mk"
 PLIST.gtk=		yes
 .else
@@ -76,10 +86,8 @@ CONFIGURE_ARGS+=	--without-m17nlib
 
 .if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
 .  include "../../x11/qt3-libs/buildlink3.mk"
-BUILD_DEPENDS+=		qt3-tools-3.*:../../x11/qt3-tools
+.  include "../../x11/qt3-tools/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-qt CXXFLAGS=-lc
-# This option don't work.  Need immodule patch for Qt3(uim-1.4.x not support Qt4)
-#CONFIGURE_ARGS+=	--with-qt-immodule
 PLIST.helperdata=	yes
 PLIST.qt=		yes
 .endif
diff --git a/inputmethod/uim/patches/patch-ab b/inputmethod/uim/patches/patch-ab
index 0f5e475b28a..9874f783849 100644
--- a/inputmethod/uim/patches/patch-ab
+++ b/inputmethod/uim/patches/patch-ab
@@ -1,7 +1,9 @@
-$NetBSD: patch-ab,v 1.1 2008/06/08 13:01:48 obache Exp $
+$NetBSD: patch-ab,v 1.2 2009/01/23 13:40:32 obache Exp $
 
---- sigscheme/src/Makefile.in.orig	2008-05-17 10:10:09.000000000 +0900
-+++ sigscheme/src/Makefile.in	2008-05-17 10:27:12.000000000 +0900
+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
 @@ -22,7 +22,7 @@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/inputmethod/uim/patches/patch-ac b/inputmethod/uim/patches/patch-ac
index 3ab646ffe99..3237452c9bf 100644
--- a/inputmethod/uim/patches/patch-ac
+++ b/inputmethod/uim/patches/patch-ac
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2008/06/08 13:01:48 obache Exp $
+$NetBSD: patch-ac,v 1.2 2009/01/23 13:40:32 obache Exp $
 
---- sigscheme/doc/Makefile.in.orig	2008-05-17 09:51:31.000000000 +0900
-+++ sigscheme/doc/Makefile.in	2008-05-17 09:51:54.000000000 +0900
-@@ -158,7 +158,7 @@
+Avoid to install of document files of sigscheme, conflict with lang/sigscheme.
+
+--- sigscheme/doc/Makefile.in.orig	2009-01-21 11:48:57.000000000 +0000
++++ sigscheme/doc/Makefile.in
+@@ -160,7 +160,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@