>Number:         35297
>Category:       pkg
>Synopsis:       update inputmethod/uim to uim-1.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 20 18:35:01 +0000 2006
>Originator:     Yamashiro, Jun
>Release:        NetBSD 4.99.6
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun.mydomain 4.99.6 NetBSD 4.99.6 (YAMAJUN) #19: Wed Dec 20 00:36:46 JST 2006  yamajun@yamajun.mydomain:/usr/src/sys/arch/i386/compile/YAMAJUN i386
>Description:
Update inputmethod/uim to uim-1.3.0

Package changelog:
* update to 1.3.0
* Change PLIST style.
* Disabled "qt" option.  uim-1.3.0 support only for Qt 4.

UIM Changelog:
* Text acquisition and focus-related APIs
* Dead keys support for the latin IM
* Experimental Kana keyboard support
* Flash Player 9 plugin workaround for uim-xim (Note: only for Linux?)
* New Try-Code Japanese IM
* Improve Japanese dictionary tool for inputmethod/anthy

>How-To-Repeat:

>Fix:
Apply this patch and remove old PLIST.* file from CVS.

List of old files:
PLIST.anthy
PLIST.canna
PLIST.common
PLIST.gtk
PLIST.qt

Patch here:
diff -Nru uim.orig/Makefile uim/Makefile
--- uim.orig/Makefile	2006-12-20 22:07:38.000000000 +0900
+++ uim/Makefile	2006-12-20 22:23:00.000000000 +0900
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.27 2006/09/16 12:05:16 hira Exp $
 #
 
-DISTNAME=		uim-1.2.1
-PKGREVISION=		1
+DISTNAME=		uim-1.3.0
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.freedesktop.org/releases/
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +12,7 @@
 
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
-USE_NCURSES=		# clear_screen, clr_eos
+USE_NCURSES=		yes	# clear_screen, clr_eos
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool pkg-config
 USE_LANGUAGES=		c c++
diff -Nru uim.orig/PLIST uim/PLIST
--- uim.orig/PLIST	1970-01-01 09:00:00.000000000 +0900
+++ uim/PLIST	2006-12-20 22:08:52.000000000 +0900
@@ -0,0 +1,217 @@
+@comment $NetBSD$
+${QT}bin/uim-chardict-qt
+${ANTHY}bin/uim-dict-gtk
+bin/uim-fep
+bin/uim-fep-tick
+${GTK}bin/uim-im-switcher-gtk
+${QT}bin/uim-im-switcher-qt
+${GTK}bin/uim-input-pad-ja
+bin/uim-module-manager
+${GTK}bin/uim-pref-gtk
+${QT}bin/uim-pref-qt
+bin/uim-sh
+${GTK}bin/uim-toolbar-gtk
+${QT}bin/uim-toolbar-qt
+${GTK}bin/uim-toolbar-gtk-systray
+bin/uim-xim
+include/uim/plugin.h
+include/uim/uim-compat-scm.h
+include/uim/uim-custom.h
+include/uim/uim-helper.h
+include/uim/uim-im-switcher.h
+include/uim/uim-scm.h
+include/uim/uim-util.h
+include/uim/uim.h
+${GTK}lib/gtk-2.0/2.10.0/immodules/im-uim.la
+lib/libuim-custom.la
+lib/libuim.la
+lib/pkgconfig/uim.pc
+${ANTHY}lib/uim/plugin/libuim-anthy.la
+${CANNA}lib/uim/plugin/libuim-canna.la
+lib/uim/plugin/libuim-custom-enabler.la
+lib/uim/plugin/libuim-skk.la
+${GTK}libexec/uim-candwin-gtk
+${QT}libexec/uim-candwin-qt
+libexec/uim-helper-server
+man/man1/uim-xim.1
+share/applications/uim.desktop
+share/doc/uim/DOT-UIM
+share/doc/uim/HELPER-CANDWIN
+share/doc/uim/HELPER-PROTOCOL
+share/doc/uim/KEY
+share/doc/uim/PLUGIN
+share/doc/uim/README
+share/doc/uim/UIM-SCM
+share/doc/uim/UIM-SH
+share/doc/uim/uim-fep/README
+share/doc/uim/uim-fep/README.ja
+share/locale/fr/LC_MESSAGES/uim.mo
+share/locale/ja/LC_MESSAGES/uim.mo
+${QT}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
+share/locale/ko/LC_MESSAGES/uim.mo
+share/uim/action.scm
+share/uim/anthy-custom.scm
+share/uim/anthy-key-custom.scm
+share/uim/anthy.scm
+share/uim/byeoru-custom.scm
+share/uim/byeoru-dic.scm
+share/uim/byeoru-key-custom.scm
+share/uim/byeoru-symbols.scm
+share/uim/byeoru.scm
+share/uim/canna-custom.scm
+share/uim/canna-key-custom.scm
+share/uim/canna.scm
+share/uim/custom-rt.scm
+share/uim/custom.scm
+share/uim/default.scm
+share/uim/direct.scm
+share/uim/generic-custom.scm
+share/uim/generic-key-custom.scm
+share/uim/generic.scm
+share/uim/hangul.scm
+share/uim/hangul2.scm
+share/uim/hangul3.scm
+${QT}share/uim/helperdata/bushu.t
+share/uim/i18n.scm
+share/uim/im-custom.scm
+share/uim/im-switcher.scm
+share/uim/im.scm
+share/uim/init.scm
+share/uim/installed-modules.scm
+share/uim/ipa-x-sampa.scm
+share/uim/japanese-azik.scm
+share/uim/japanese-kana.scm
+share/uim/japanese.scm
+share/uim/key.scm
+share/uim/latin.scm
+share/uim/lazy-load.scm
+share/uim/load-action.scm
+share/uim/loader.scm
+share/uim/m17nlib.scm
+share/uim/mana-custom.scm
+share/uim/mana-key-custom.scm
+share/uim/mana.scm
+share/uim/pinyin-big5.scm
+share/uim/pixmaps/anthy.png
+share/uim/pixmaps/byeoru.png
+share/uim/pixmaps/byeoru.svg
+share/uim/pixmaps/canna.png
+share/uim/pixmaps/direct.png
+share/uim/pixmaps/direct.svg
+share/uim/pixmaps/direct_input.png
+share/uim/pixmaps/direct_input.svg
+share/uim/pixmaps/hangul2.png
+share/uim/pixmaps/hangul2.svg
+share/uim/pixmaps/hangul3.png
+share/uim/pixmaps/hangul3.svg
+share/uim/pixmaps/im_subst.svg
+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_azik.png
+share/uim/pixmaps/ja_azik.svg
+share/uim/pixmaps/ja_direct.png
+share/uim/pixmaps/ja_direct.svg
+share/uim/pixmaps/ja_fullwidth_alnum.png
+share/uim/pixmaps/ja_fullwidth_alnum.svg
+share/uim/pixmaps/ja_halfkana.png
+share/uim/pixmaps/ja_halfkana.svg
+share/uim/pixmaps/ja_halfwidth_alnum.png
+share/uim/pixmaps/ja_halfwidth_alnum.svg
+share/uim/pixmaps/ja_hiragana.png
+share/uim/pixmaps/ja_hiragana.svg
+share/uim/pixmaps/ja_kana.png
+share/uim/pixmaps/ja_kana.svg
+share/uim/pixmaps/ja_katakana.png
+share/uim/pixmaps/ja_katakana.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/ko_direct.png
+share/uim/pixmaps/ko_direct.svg
+share/uim/pixmaps/ko_hangulchar.png
+share/uim/pixmaps/ko_hangulchar.svg
+share/uim/pixmaps/ko_hangulword.png
+share/uim/pixmaps/ko_hangulword.svg
+share/uim/pixmaps/latin.png
+share/uim/pixmaps/latin.svg
+share/uim/pixmaps/mana.png
+share/uim/pixmaps/mana.svg
+share/uim/pixmaps/null.png
+share/uim/pixmaps/off.png
+share/uim/pixmaps/off.svg
+share/uim/pixmaps/on.png
+share/uim/pixmaps/on.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/py.png
+share/uim/pixmaps/py.svg
+share/uim/pixmaps/pyunihan.png
+share/uim/pixmaps/pyunihan.svg
+share/uim/pixmaps/romaja.png
+share/uim/pixmaps/romaja.svg
+share/uim/pixmaps/scim.png
+share/uim/pixmaps/scim.svg
+share/uim/pixmaps/skk.png
+share/uim/pixmaps/skk.svg
+share/uim/pixmaps/tcode.png
+share/uim/pixmaps/tcode.svg
+share/uim/pixmaps/trycode.png
+share/uim/pixmaps/trycode.svg
+share/uim/pixmaps/tutcode.png
+share/uim/pixmaps/tutcode.svg
+share/uim/pixmaps/uim-dict.png
+share/uim/pixmaps/uim-dict.svg
+share/uim/pixmaps/uim-gray.png
+share/uim/pixmaps/uim-icon.png
+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/viqr.png
+share/uim/pixmaps/viqr.svg
+share/uim/plugin.scm
+share/uim/prime-custom.scm
+share/uim/prime-key-custom.scm
+share/uim/prime.scm
+share/uim/py.scm
+share/uim/pyload.scm
+share/uim/pyunihan.scm
+share/uim/rk.scm
+share/uim/romaja.scm
+share/uim/scim.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/spellcheck-custom.scm
+share/uim/spellcheck.scm
+share/uim/tcode.scm
+share/uim/trycode.scm
+share/uim/tutcode-key-custom.scm
+share/uim/tutcode.scm
+share/uim/uim-db.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/zaurus.scm
+${QT}@dirrm share/uim/helperdata
+@dirrm share/uim/pixmaps
+@dirrm share/uim
+@dirrm share/doc/uim/uim-fep
+@dirrm share/doc/uim
+@comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/uim/plugin
+@dirrm lib/uim
+@comment in gtk2: @dirrm lib/gtk-2.0/2.10.0/immodules
+@dirrm include/uim
diff -Nru uim.orig/PLIST.anthy uim/PLIST.anthy
--- uim.orig/PLIST.anthy	2006-12-20 22:07:38.000000000 +0900
+++ uim/PLIST.anthy	1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.anthy,v 1.1 2005/03/29 18:47:52 wiz Exp $
-lib/uim/plugin/libuim-anthy.la
diff -Nru uim.orig/PLIST.canna uim/PLIST.canna
--- uim.orig/PLIST.canna	2006-12-20 22:07:38.000000000 +0900
+++ uim/PLIST.canna	1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.canna,v 1.1 2005/03/29 18:47:52 wiz Exp $
-lib/uim/plugin/libuim-canna.la
diff -Nru uim.orig/PLIST.common uim/PLIST.common
--- uim.orig/PLIST.common	2006-12-20 22:07:38.000000000 +0900
+++ uim/PLIST.common	1970-01-01 09:00:00.000000000 +0900
@@ -1,194 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.8 2006/08/05 18:49:29 wiz Exp $
-bin/uim-fep
-bin/uim-fep-tick
-bin/uim-module-manager
-bin/uim-sh
-bin/uim-xim
-include/uim/plugin.h
-include/uim/uim-compat-scm.h
-include/uim/uim-custom.h
-include/uim/uim-helper.h
-include/uim/uim-im-switcher.h
-include/uim/uim-scm.h
-include/uim/uim-util.h
-include/uim/uim.h
-lib/libuim-custom.la
-lib/libuim.la
-lib/pkgconfig/uim.pc
-lib/uim/plugin/libuim-custom-enabler.la
-lib/uim/plugin/libuim-skk.la
-libexec/uim-helper-server
-man/man1/uim-xim.1
-share/applications/uim.desktop
-share/doc/uim/DOT-UIM
-share/doc/uim/HELPER-CANDWIN
-share/doc/uim/HELPER-PROTOCOL
-share/doc/uim/KEY
-share/doc/uim/PLUGIN
-share/doc/uim/README
-share/doc/uim/UIM-SCM
-share/doc/uim/UIM-SH
-share/doc/uim/uim-fep/README
-share/doc/uim/uim-fep/README.ja
-share/locale/fr/LC_MESSAGES/uim.mo
-share/locale/ja/LC_MESSAGES/uim.mo
-share/locale/ko/LC_MESSAGES/uim.mo
-share/uim/action.scm
-share/uim/anthy-custom.scm
-share/uim/anthy-key-custom.scm
-share/uim/anthy.scm
-share/uim/byeoru-custom.scm
-share/uim/byeoru-dic.scm
-share/uim/byeoru-key-custom.scm
-share/uim/byeoru-symbols.scm
-share/uim/byeoru.scm
-share/uim/canna-custom.scm
-share/uim/canna-key-custom.scm
-share/uim/canna.scm
-share/uim/custom-rt.scm
-share/uim/custom.scm
-share/uim/default.scm
-share/uim/direct.scm
-share/uim/generic-custom.scm
-share/uim/generic-key-custom.scm
-share/uim/generic.scm
-share/uim/hangul.scm
-share/uim/hangul2.scm
-share/uim/hangul3.scm
-share/uim/i18n.scm
-share/uim/im-custom.scm
-share/uim/im-switcher.scm
-share/uim/im.scm
-share/uim/init.scm
-share/uim/installed-modules.scm
-share/uim/ipa-x-sampa.scm
-share/uim/japanese-azik.scm
-share/uim/japanese-kana.scm
-share/uim/japanese.scm
-share/uim/key.scm
-share/uim/latin.scm
-share/uim/lazy-load.scm
-share/uim/load-action.scm
-share/uim/loader.scm
-share/uim/m17nlib.scm
-share/uim/mana-custom.scm
-share/uim/mana-key-custom.scm
-share/uim/mana.scm
-share/uim/pinyin-big5.scm
-share/uim/pixmaps/anthy.png
-share/uim/pixmaps/byeoru.png
-share/uim/pixmaps/byeoru.svg
-share/uim/pixmaps/canna.png
-share/uim/pixmaps/direct.png
-share/uim/pixmaps/direct.svg
-share/uim/pixmaps/direct_input.png
-share/uim/pixmaps/direct_input.svg
-share/uim/pixmaps/hangul2.png
-share/uim/pixmaps/hangul2.svg
-share/uim/pixmaps/hangul3.png
-share/uim/pixmaps/hangul3.svg
-share/uim/pixmaps/im_subst.svg
-share/uim/pixmaps/ipa-x-sampa.png
-share/uim/pixmaps/ipa-x-sampa.svg
-share/uim/pixmaps/ja_azik.png
-share/uim/pixmaps/ja_azik.svg
-share/uim/pixmaps/ja_direct.png
-share/uim/pixmaps/ja_direct.svg
-share/uim/pixmaps/ja_fullwidth_alnum.png
-share/uim/pixmaps/ja_fullwidth_alnum.svg
-share/uim/pixmaps/ja_halfkana.png
-share/uim/pixmaps/ja_halfkana.svg
-share/uim/pixmaps/ja_halfwidth_alnum.png
-share/uim/pixmaps/ja_halfwidth_alnum.svg
-share/uim/pixmaps/ja_hiragana.png
-share/uim/pixmaps/ja_hiragana.svg
-share/uim/pixmaps/ja_kana.png
-share/uim/pixmaps/ja_kana.svg
-share/uim/pixmaps/ja_katakana.png
-share/uim/pixmaps/ja_katakana.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/ko_direct.png
-share/uim/pixmaps/ko_direct.svg
-share/uim/pixmaps/ko_hangulchar.png
-share/uim/pixmaps/ko_hangulchar.svg
-share/uim/pixmaps/ko_hangulword.png
-share/uim/pixmaps/ko_hangulword.svg
-share/uim/pixmaps/latin.png
-share/uim/pixmaps/latin.svg
-share/uim/pixmaps/mana.png
-share/uim/pixmaps/mana.svg
-share/uim/pixmaps/null.png
-share/uim/pixmaps/off.png
-share/uim/pixmaps/off.svg
-share/uim/pixmaps/on.png
-share/uim/pixmaps/on.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/py.png
-share/uim/pixmaps/py.svg
-share/uim/pixmaps/pyunihan.png
-share/uim/pixmaps/pyunihan.svg
-share/uim/pixmaps/romaja.png
-share/uim/pixmaps/romaja.svg
-share/uim/pixmaps/scim.png
-share/uim/pixmaps/scim.svg
-share/uim/pixmaps/skk.png
-share/uim/pixmaps/skk.svg
-share/uim/pixmaps/switcher-icon.png
-share/uim/pixmaps/tcode.png
-share/uim/pixmaps/tcode.svg
-share/uim/pixmaps/tutcode.png
-share/uim/pixmaps/tutcode.svg
-share/uim/pixmaps/uim-dict.png
-share/uim/pixmaps/uim-dict.svg
-share/uim/pixmaps/uim-gray.png
-share/uim/pixmaps/uim-icon.png
-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/viqr.png
-share/uim/pixmaps/viqr.svg
-share/uim/plugin.scm
-share/uim/prime-custom.scm
-share/uim/prime-key-custom.scm
-share/uim/prime.scm
-share/uim/py.scm
-share/uim/pyload.scm
-share/uim/pyunihan.scm
-share/uim/rk.scm
-share/uim/romaja.scm
-share/uim/scim.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/spellcheck-custom.scm
-share/uim/spellcheck.scm
-share/uim/tcode.scm
-share/uim/tutcode-key-custom.scm
-share/uim/tutcode.scm
-share/uim/uim-db.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/zaurus.scm
-@dirrm share/uim/pixmaps
-@dirrm share/uim
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm share/doc/uim/uim-fep
-@dirrm share/doc/uim
-@dirrm lib/uim/plugin
-@dirrm lib/uim
-@dirrm include/uim
diff -Nru uim.orig/PLIST.gtk uim/PLIST.gtk
--- uim.orig/PLIST.gtk	2006-12-20 22:07:38.000000000 +0900
+++ uim/PLIST.gtk	1970-01-01 09:00:00.000000000 +0900
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST.gtk,v 1.5 2006/09/16 12:05:16 hira Exp $
-bin/uim-im-switcher-gtk
-bin/uim-input-pad-ja
-bin/uim-pref-gtk
-bin/uim-toolbar-gtk
-bin/uim-toolbar-gtk-systray
-lib/gtk-2.0/2.10.0/immodules/im-uim.la
-libexec/uim-candwin-gtk
-@comment in gtk2: @dirrm lib/gtk-2.0/2.10.0/immodules
diff -Nru uim.orig/PLIST.qt uim/PLIST.qt
--- uim.orig/PLIST.qt	2006-12-20 22:07:38.000000000 +0900
+++ uim/PLIST.qt	1970-01-01 09:00:00.000000000 +0900
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST.qt,v 1.3 2006/06/12 16:35:20 wiz Exp $
-bin/uim-chardict-qt
-bin/uim-im-switcher-qt
-bin/uim-pref-qt
-bin/uim-toolbar-qt
-libexec/uim-candwin-qt
-share/uim/helperdata/bushu.t
-share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
-@dirrm share/uim/helperdata
diff -Nru uim.orig/distinfo uim/distinfo
--- uim.orig/distinfo	2006-12-20 22:07:38.000000000 +0900
+++ uim/distinfo	2006-12-20 22:28:54.000000000 +0900
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.11 2006/08/14 23:01:17 wiz Exp $
 
-SHA1 (uim-1.2.1.tar.bz2) = 4a3ac6f328e9978fef3fca4e2e5776cf1db5f5ae
-RMD160 (uim-1.2.1.tar.bz2) = 8e915babac8dc1bc5c2f84acf5fa63a68ac0d66f
-Size (uim-1.2.1.tar.bz2) = 1669647 bytes
+SHA1 (uim-1.3.0.tar.bz2) = a0ea1f210576a5e6048d822376f6278bac3d2e09
+RMD160 (uim-1.3.0.tar.bz2) = 3beadf3906e34a3f4b4e7d24e7e804d98035a105
+Size (uim-1.3.0.tar.bz2) = 1658353 bytes
diff -Nru uim.orig/options.mk uim/options.mk
--- uim.orig/options.mk	2006-12-20 22:07:38.000000000 +0900
+++ uim/options.mk	2006-12-21 02:58:41.000000000 +0900
@@ -1,22 +1,29 @@
 # $NetBSD: options.mk,v 1.9 2006/03/09 18:04:32 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
-PKG_SUPPORTED_OPTIONS=	anthy canna eb gtk qt
+# qt option is disabled.  uim-1.3.x is support only Qt 4.x
+#PKG_SUPPORTED_OPTIONS=	anthy canna eb gtk qt
+PKG_SUPPORTED_OPTIONS=	anthy canna eb gtk
 PKG_SUGGESTED_OPTIONS=	anthy canna gtk
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Manthy)
-.include "../../inputmethod/anthy/buildlink3.mk"
-PLIST_SRC+=		PLIST.anthy
+.  include "../../inputmethod/anthy/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-anthy --enable-dict
+PLIST_SUBST+=		ANTHY=
 .else
 CONFIGURE_ARGS+=	--without-anthy
+PLIST_SUBST+=		ANTHY="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mcanna)
-.include "../../inputmethod/canna-lib/buildlink3.mk"
+.  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-canna
-PLIST_SRC+=		PLIST.canna
+PLIST_SUBST+=		CANNA=
+.else
+CONFIGURE_ARGS+=	--without-canna
+PLIST_SUBST+=		CANNA="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Meb)
@@ -27,18 +34,22 @@
 
 .if !empty(PKG_OPTIONS:Mgtk)
 .include "../../x11/gtk2/modules.mk"
-PLIST_SRC+=		PLIST.gtk
+PLIST_SUBST+=		GTK=
 .else
 CONFIGURE_ARGS+=	--without-gtk2
+PLIST_SUBST+=		GTK="@comment "
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt)
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+# qt option is disabled.  uim-1.3.x is support only Qt 4.x
+#.if !empty(PKG_OPTIONS:Mqt)
+.if `${false}`
+.  include "../../x11/qt3-libs/buildlink3.mk"
+.  include "../../x11/kdelibs3/buildlink3.mk"
+BUILD_DEPENDS+=		qt3-tools-3.*:../../x11/qt3-tools
 CONFIGURE_ARGS+=	--with-qt
 # Not worked this option.  need immodule patch for Qt3
-CONFIGURE_ARGS+=	--with-qt-immodule
-PLIST_SRC+=		PLIST.qt
+#CONFIGURE_ARGS+=	--with-qt-immodule
+PLIST_SUBST+=		QT=
+.else
+PLIST_SUBST+=		QT="@comment "
 .endif
-
-PLIST_SRC+=		PLIST.common