diff options
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/uim/Makefile | 7 | ||||
| -rw-r--r-- | inputmethod/uim/PLIST (renamed from inputmethod/uim/PLIST.common) | 34 | ||||
| -rw-r--r-- | inputmethod/uim/PLIST.anthy | 2 | ||||
| -rw-r--r-- | inputmethod/uim/PLIST.canna | 2 | ||||
| -rw-r--r-- | inputmethod/uim/PLIST.gtk | 9 | ||||
| -rw-r--r-- | inputmethod/uim/PLIST.qt | 9 | ||||
| -rw-r--r-- | inputmethod/uim/distinfo | 8 | ||||
| -rw-r--r-- | inputmethod/uim/options.mk | 41 |
8 files changed, 66 insertions, 46 deletions
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index a68c04bdeab..df3bbcbdc58 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2006/09/16 12:05:16 hira Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/20 16:56:43 wiz Exp $ # -DISTNAME= uim-1.2.1 -PKGREVISION= 1 +DISTNAME= uim-1.3.1 CATEGORIES= inputmethod MASTER_SITES= http://uim.freedesktop.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -13,7 +12,7 @@ COMMENT= Multilingual input method library 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 --git a/inputmethod/uim/PLIST.common b/inputmethod/uim/PLIST index 67fc5350988..d495cc5f415 100644 --- a/inputmethod/uim/PLIST.common +++ b/inputmethod/uim/PLIST @@ -1,8 +1,18 @@ -@comment $NetBSD: PLIST.common,v 1.8 2006/08/05 18:49:29 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/01/20 16:56:43 wiz Exp $ +${QT}bin/uim-chardict-qt +${UIM_DICT_GTK}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 @@ -12,11 +22,17 @@ 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 +${QT}lib/kde3/uim_panelapplet.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 @@ -32,6 +48,8 @@ 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 +${QT}share/kde/apps/kicker/applets/uimapplet.desktop share/locale/ko/LC_MESSAGES/uim.mo share/uim/action.scm share/uim/anthy-custom.scm @@ -55,6 +73,8 @@ share/uim/generic.scm share/uim/hangul.scm share/uim/hangul2.scm share/uim/hangul3.scm +${QT}share/uim/helperdata/bushu.t +${UIM_DICT_GTK}share/uim/helperdata/uim-dict-ui.xml share/uim/i18n.scm share/uim/im-custom.scm share/uim/im-switcher.scm @@ -88,6 +108,8 @@ 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 @@ -142,9 +164,10 @@ 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/trycode.png +share/uim/pixmaps/trycode.svg share/uim/pixmaps/tutcode.png share/uim/pixmaps/tutcode.svg share/uim/pixmaps/uim-dict.png @@ -175,6 +198,7 @@ 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 @@ -184,11 +208,15 @@ share/uim/ustr.scm share/uim/util.scm share/uim/viqr.scm share/uim/zaurus.scm +${HELPERDATA}@dirrm share/uim/helperdata @dirrm share/uim/pixmaps @dirrm share/uim -@comment in xdg-dirs: @dirrm share/applications +@comment in kde: @dirrm share/kde/apps/kicker/applets @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 kde: @dirrm lib/kde3 +@comment in gtk2: @dirrm lib/gtk-2.0/2.10.0/immodules @dirrm include/uim diff --git a/inputmethod/uim/PLIST.anthy b/inputmethod/uim/PLIST.anthy deleted file mode 100644 index cc4413f2387..00000000000 --- a/inputmethod/uim/PLIST.anthy +++ /dev/null @@ -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 --git a/inputmethod/uim/PLIST.canna b/inputmethod/uim/PLIST.canna deleted file mode 100644 index f27788f3193..00000000000 --- a/inputmethod/uim/PLIST.canna +++ /dev/null @@ -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 --git a/inputmethod/uim/PLIST.gtk b/inputmethod/uim/PLIST.gtk deleted file mode 100644 index eeed83a9ff9..00000000000 --- a/inputmethod/uim/PLIST.gtk +++ /dev/null @@ -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 --git a/inputmethod/uim/PLIST.qt b/inputmethod/uim/PLIST.qt deleted file mode 100644 index 8b3e64f6cb3..00000000000 --- a/inputmethod/uim/PLIST.qt +++ /dev/null @@ -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 --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo index 9742d7a7700..1b0abbbed3f 100644 --- a/inputmethod/uim/distinfo +++ b/inputmethod/uim/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.11 2006/08/14 23:01:17 wiz Exp $ +$NetBSD: distinfo,v 1.12 2007/01/20 16:56:43 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.1.tar.bz2) = a596b5f9a3f5d7b2470b430601fbfa0c10a1c6dc +RMD160 (uim-1.3.1.tar.bz2) = e2c34afd0193e91659cb72f047bc0d29ce7cbea8 +Size (uim-1.3.1.tar.bz2) = 1658713 bytes diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index fdbc6da2c33..3668f65427b 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2006/03/09 18:04:32 wiz Exp $ +# $NetBSD: options.mk,v 1.10 2007/01/20 16:56:43 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.uim PKG_SUPPORTED_OPTIONS= anthy canna eb gtk qt @@ -6,17 +6,29 @@ PKG_SUGGESTED_OPTIONS= anthy canna gtk .include "../../mk/bsd.options.mk" +PLIST_SUBST+= HELPERDATA="@comment " +PLIST_SUBST+= UIM_DICT_GTK="@comment " + .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= +. if !empty(PKG_OPTIONS:Mgtk) +PLIST_SUBST+= HELPERDATA= +PLIST_SUBST+= UIM_DICT_GTK= +. endif .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 +39,21 @@ CONFIGURE_ARGS+= --without-eb .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" -CONFIGURE_ARGS+= --with-qt +. include "../../x11/kdelibs3/buildlink3.mk" +. include "../../x11/qt3-libs/buildlink3.mk" +BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools +CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc # 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+= HELPERDATA= +PLIST_SUBST+= QT= +.else +PLIST_SUBST+= QT="@comment " .endif - -PLIST_SRC+= PLIST.common |