diff options
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/uim/PLIST | 9 | ||||
| -rw-r--r-- | inputmethod/uim/options.mk | 36 |
2 files changed, 4 insertions, 41 deletions
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST index b0492bcaa2d..b6341a7b042 100644 --- a/inputmethod/uim/PLIST +++ b/inputmethod/uim/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2014/05/31 14:22:38 obache Exp $ -${PLIST.qt3}bin/uim-chardict-qt +@comment $NetBSD: PLIST,v 1.24 2017/09/26 09:42:26 wiz Exp $ ${PLIST.qt}bin/uim-chardict-qt4 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk ${PLIST.uim-dict-gtk3}bin/uim-dict-gtk3 @@ -8,7 +7,6 @@ ${PLIST.fep}bin/uim-fep-tick bin/uim-help ${PLIST.gtk}bin/uim-im-switcher-gtk ${PLIST.gtk3}bin/uim-im-switcher-gtk3 -${PLIST.qt3}bin/uim-im-switcher-qt ${PLIST.qt}bin/uim-im-switcher-qt4 ${PLIST.gtk}bin/uim-input-pad-ja ${PLIST.gtk3}bin/uim-input-pad-ja-gtk3 @@ -16,14 +14,12 @@ ${PLIST.m17nlib}bin/uim-m17nlib-relink-icons bin/uim-module-manager ${PLIST.gtk}bin/uim-pref-gtk ${PLIST.gtk3}bin/uim-pref-gtk3 -${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.gtk3}bin/uim-toolbar-gtk3 ${PLIST.gtk3}bin/uim-toolbar-gtk3-systray -${PLIST.qt3}bin/uim-toolbar-qt ${PLIST.qt}bin/uim-toolbar-qt4 ${PLIST.xim}bin/uim-xim include/uim/dynlib.h @@ -40,7 +36,6 @@ include/uim/version.h ${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server ${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la ${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-uim.la -${PLIST.kde3}lib/kde3/uim_panelapplet.la ${PLIST.kde}lib/kde4/plasma_applet_uim.so lib/libuim-custom.la lib/libuim-scm.la @@ -68,7 +63,6 @@ ${PLIST.gtk}libexec/uim-candwin-gtk ${PLIST.gtk3}libexec/uim-candwin-gtk3 ${PLIST.gtk}libexec/uim-candwin-horizontal-gtk ${PLIST.gtk3}libexec/uim-candwin-horizontal-gtk3 -${PLIST.qt3}libexec/uim-candwin-qt ${PLIST.qt}libexec/uim-candwin-qt4 ${PLIST.gtk}libexec/uim-candwin-tbl-gtk ${PLIST.gtk3}libexec/uim-candwin-tbl-gtk3 @@ -90,7 +84,6 @@ 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.kde3}share/kde/apps/kicker/applets/uimapplet.desktop ${PLIST.kde}share/kde4/services/plasma-applet-uim.desktop share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim.mo diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index 94466c5751d..5aeaa0c4890 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,11 +1,8 @@ -# $NetBSD: options.mk,v 1.33 2017/05/21 09:12:34 ryoon Exp $ +# $NetBSD: options.mk,v 1.34 2017/09/26 09:42:26 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.uim PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim -PKG_SUPPORTED_OPTIONS+= editline -PKG_OPTIONS_OPTIONAL_GROUPS= kde qt -PKG_OPTIONS_GROUP.kde= kde kde3 -PKG_OPTIONS_GROUP.qt= qt qt3 +PKG_SUPPORTED_OPTIONS+= editline kde qt PKG_SUGGESTED_OPTIONS= anthy expat gtk gtk3 prime uim-fep xim # Store installed modules @@ -22,19 +19,8 @@ PKG_SUGGESTED_OPTIONS+= editline .include "../../mk/bsd.options.mk" -.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: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 uim-dict-gtk3 uim-dict-helperdata fep -PLIST_VARS+= anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 m17nlib openssl qt qt3 sqlite wnn xim +PLIST_VARS+= anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde m17nlib openssl qt sqlite wnn xim PLIST_VARS+= canna prime sj3 PLIST_VARS+= editline @@ -164,12 +150,6 @@ PLIST.uim-dict-helperdata= yes . endif .endif -.if !empty(PKG_OPTIONS:Mkde3) -. include "../../x11/kdelibs3/buildlink3.mk" -. include "../../x11/qt3-libs/buildlink3.mk" -CONFIGURE_ARGS+= --enable-kde-applet -PLIST.kde3= yes -.endif .if !empty(PKG_OPTIONS:Mkde) . include "../../x11/kdelibs4/buildlink3.mk" @@ -192,14 +172,6 @@ UIM_MODULES+= m17nlib CONFIGURE_ARGS+= --without-m17nlib .endif -.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.qt3= yes -.endif - .if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) . include "../../x11/qt4-libs/buildlink3.mk" . include "../../x11/qt4-tools/buildlink3.mk" @@ -251,6 +223,4 @@ CONFIGURE_ARGS+= --enable-default-toolkit=gtk CONFIGURE_ARGS+= --enable-default-toolkit=gtk3 .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 |