Rename options for QT and KDE.

default qt and kde are cosidered as qt4 and kde4.

2 files changed, 36 insertions, 36 deletions

diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index 8ba907f9d4f..d9280574801 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.13 2010/01/20 11:06:07 obache Exp $
-${PLIST.qt}bin/uim-chardict-qt
-${PLIST.qt4}bin/uim-chardict-qt4
+@comment $NetBSD: PLIST,v 1.14 2010/05/15 07:05:57 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
 ${PLIST.gtk}bin/uim-im-switcher-gtk
-${PLIST.qt}bin/uim-im-switcher-qt
-${PLIST.qt4}bin/uim-im-switcher-qt4
+${PLIST.qt3}bin/uim-im-switcher-qt
+${PLIST.qt}bin/uim-im-switcher-qt4
 ${PLIST.gtk}bin/uim-input-pad-ja
 ${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
 bin/uim-module-manager
 ${PLIST.gtk}bin/uim-pref-gtk
-${PLIST.qt}bin/uim-pref-qt
-${PLIST.qt4}bin/uim-pref-qt4
+${PLIST.qt3}bin/uim-pref-qt
+${PLIST.qt}bin/uim-pref-qt4
 bin/uim-sh
 ${PLIST.gtk}bin/uim-toolbar-gtk
 ${PLIST.gtk}bin/uim-toolbar-gtk-systray
-${PLIST.qt}bin/uim-toolbar-qt
-${PLIST.qt4}bin/uim-toolbar-qt4
+${PLIST.qt3}bin/uim-toolbar-qt
+${PLIST.qt}bin/uim-toolbar-qt4
 ${PLIST.xim}bin/uim-xim
 include/uim/plugin.h
 include/uim/uim-custom.h
@@ -31,8 +31,8 @@ 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
-${PLIST.kde4}lib/kde4/uim_panelapplet.la
+${PLIST.kde3}lib/kde3/uim_panelapplet.la
+${PLIST.kde}lib/kde4/uim_panelapplet.la
 lib/libuim-custom.la
 lib/libuim-scm.la
 lib/libuim.la
@@ -49,12 +49,12 @@ ${PLIST.sj3}lib/uim/plugin/libuim-sj3.la
 lib/uim/plugin/libuim-skk.la
 ${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
 ${PLIST.gtk}libexec/uim-candwin-gtk
-${PLIST.qt}libexec/uim-candwin-qt
-${PLIST.qt4}libexec/uim-candwin-qt4
+${PLIST.qt3}libexec/uim-candwin-qt
+${PLIST.qt}libexec/uim-candwin-qt4
 libexec/uim-helper-server
 ${PLIST.gnome}libexec/uim-toolbar-applet
 ${PLIST.xim}man/man1/uim-xim.1
-${PLIST.qt4}qt4/plugins/inputmethods/libuiminputcontextplugin.la
+${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
@@ -68,12 +68,12 @@ share/doc/uim/UIM-SCM
 share/doc/uim/UIM-SH
 ${PLIST.fep}share/doc/uim/uim-fep/README
 ${PLIST.fep}share/doc/uim/uim-fep/README.ja
-${PLIST.kde}share/kde/apps/kicker/applets/uimapplet.desktop
-${PLIST.kde4}share/kde4/apps/kicker/applets/uimapplet.desktop
+${PLIST.kde3}share/kde/apps/kicker/applets/uimapplet.desktop
+${PLIST.kde}share/kde4/apps/kicker/applets/uimapplet.desktop
 share/locale/fr/LC_MESSAGES/uim.mo
 share/locale/ja/LC_MESSAGES/uim.mo
-${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
-${PLIST.qt4}share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
+${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/anthy-custom.scm
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 621b0313f22..c3be31b5766 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,28 +1,28 @@
-# $NetBSD: options.mk,v 1.19 2010/02/15 13:56:17 obache Exp $
+# $NetBSD: options.mk,v 1.20 2010/05/15 07:05:57 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_OPTIONS_OPTIONAL_GROUPS=	kde qt
-PKG_OPTIONS_GROUP.kde=	kde kde4
-PKG_OPTIONS_GROUP.qt=	qt qt4
+PKG_OPTIONS_GROUP.kde=	kde kde3
+PKG_OPTIONS_GROUP.qt=	qt qt3
 PKG_SUGGESTED_OPTIONS=	anthy canna gtk uim-fep xim
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mqt4)
-.  if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
-PKG_FAIL_REASON+=	"'qt4' conflict with 'qt' or 'kde' option"
+.if !empty(PKG_OPTIONS:Mqt)
+.  if !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)
+PKG_FAIL_REASON+=	"'qt' conflict with 'qt3' or 'kde3' option"
 .  endif
 .endif
-.if !empty(PKG_OPTIONS:Mqt)
-.  if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mkde4)
-PKG_FAIL_REASON+=	"'qt' conflict with 'qt4' or 'kde4' option"
+.if !empty(PKG_OPTIONS:Mqt3)
+.  if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
+PKG_FAIL_REASON+=	"'qt3' conflict with 'qt' or 'kde' option"
 .  endif
 .endif
 
 PLIST_VARS+=		helperdata uim-dict-gtk fep
-PLIST_VARS+=		anthy canna gnome gtk kde kde4 m17nlib prime qt qt4 sj3 wnn xim
+PLIST_VARS+=		anthy canna gnome gtk kde kde3 m17nlib prime qt qt3 sj3 wnn xim
 
 .if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libX11/buildlink3.mk"
@@ -95,18 +95,18 @@ PLIST.gtk=		yes
 CONFIGURE_ARGS+=	--without-gtk2
 .endif
 
-.if !empty(PKG_OPTIONS:Mkde)
+.if !empty(PKG_OPTIONS:Mkde3)
 .  include "../../x11/kdelibs3/buildlink3.mk"
 .  include "../../x11/qt3-libs/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-kde-applet
-PLIST.kde=		yes
+PLIST.kde3=		yes
 .endif
 
-.if !empty(PKG_OPTIONS:Mkde4)
+.if !empty(PKG_OPTIONS:Mkde)
 .  include "../../x11/kdelibs4/buildlink3.mk"
 .  include "../../x11/qt4-libs/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-kde4-applet
-PLIST.kde4=		yes
+PLIST.kde=		yes
 .else
 CONFIGURE_ARGS+=	--disable-kde4-applet
 .endif
@@ -122,20 +122,20 @@ CHECK_FILES_SKIP+=	${PREFIX}/share/uim/pixmaps/m17n-.*\.png
 CONFIGURE_ARGS+=	--without-m17nlib
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
+.if !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)
 .  include "../../x11/qt3-libs/buildlink3.mk"
 .  include "../../x11/qt3-tools/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-qt CXXFLAGS=-lc
 PLIST.helperdata=	yes
-PLIST.qt=		yes
+PLIST.qt3=		yes
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mkde4)
+.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
 .  include "../../x11/qt4-libs/buildlink3.mk"
 .  include "../../x11/qt4-tools/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-qt4 --with-qt4-immodule
 PLIST.helperdata=	yes
-PLIST.qt4=		yes
+PLIST.qt=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mprime)