diff options
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/uim/Makefile | 12 | ||||
| -rw-r--r-- | inputmethod/uim/Makefile.common | 4 | ||||
| -rw-r--r-- | inputmethod/uim/PLIST | 19 | ||||
| -rw-r--r-- | inputmethod/uim/distinfo | 8 | ||||
| -rw-r--r-- | inputmethod/uim/options.mk | 51 |
5 files changed, 72 insertions, 22 deletions
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index 3240acfca29..3e9af745016 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.38 2009/08/26 19:58:45 sno Exp $ +# $NetBSD: Makefile,v 1.39 2010/01/20 11:06:07 obache Exp $ # .include "../../inputmethod/uim/Makefile.common" -PKGREVISION= 1 COMMENT= Multilingual input method library +CONFLICTS+= uim-immodule-qt4-[0-9]* + PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= YES @@ -32,8 +33,9 @@ PLIST.editline= yes CONFIGURE_ARGS+= --with-libedit=no .endif +INSTALLATION_DIRS+= share/doc/uim + post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/uim ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim ${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim ${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim @@ -44,11 +46,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep - ${INSTALL_DATA} ${WRKSRC}/fep/README ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep - ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgcroots/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common index d12fa57aed6..2ec9a0f3e4b 100644 --- a/inputmethod/uim/Makefile.common +++ b/inputmethod/uim/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.1 2009/01/23 13:40:32 obache Exp $ +# $NetBSD: Makefile.common,v 1.2 2010/01/20 11:06:07 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 +UIM_VERSION= 1.5.7 DISTNAME= uim-${UIM_VERSION} CATEGORIES= inputmethod MASTER_SITES= http://uim.googlecode.com/files/ diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST index f036d4eed2c..8ba907f9d4f 100644 --- a/inputmethod/uim/PLIST +++ b/inputmethod/uim/PLIST @@ -1,19 +1,23 @@ -@comment $NetBSD: PLIST,v 1.12 2009/10/01 12:30:32 obache Exp $ +@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 ${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.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 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.xim}bin/uim-xim include/uim/plugin.h include/uim/uim-custom.h @@ -28,11 +32,13 @@ 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 lib/libuim-custom.la lib/libuim-scm.la lib/libuim.la lib/pkgconfig/uim.pc ${PLIST.anthy}lib/uim/plugin/libuim-anthy.la +${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la ${PLIST.canna}lib/uim/plugin/libuim-canna.la lib/uim/plugin/libuim-custom-enabler.la ${PLIST.editline}lib/uim/plugin/libuim-editline.la @@ -44,9 +50,11 @@ 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 libexec/uim-helper-server ${PLIST.gnome}libexec/uim-toolbar-applet ${PLIST.xim}man/man1/uim-xim.1 +${PLIST.qt4}qt4/plugins/inputmethods/libuiminputcontextplugin.la share/applications/uim.desktop share/doc/uim/COMPATIBILITY share/doc/uim/CUSTOM @@ -58,12 +66,14 @@ 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 +${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 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 share/locale/ko/LC_MESSAGES/uim.mo share/uim/action.scm share/uim/anthy-custom.scm @@ -94,7 +104,7 @@ share/uim/generic.scm share/uim/hangul.scm share/uim/hangul2.scm share/uim/hangul3.scm -${PLIST.qt}share/uim/helperdata/bushu.t +${PLIST.helperdata}share/uim/helperdata/bushu.t ${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml share/uim/i18n.scm share/uim/ichar.scm @@ -130,6 +140,7 @@ share/uim/mana-key-custom.scm share/uim/mana.scm share/uim/pinyin-big5.scm share/uim/pixmaps/anthy.png +share/uim/pixmaps/anthy-utf8.png share/uim/pixmaps/byeoru.png share/uim/pixmaps/byeoru.svg share/uim/pixmaps/canna.png diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo index b63554371f9..8299f32831f 100644 --- a/inputmethod/uim/distinfo +++ b/inputmethod/uim/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.15 2009/01/23 13:40:32 obache Exp $ +$NetBSD: distinfo,v 1.16 2010/01/20 11:06:07 obache Exp $ -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 (uim-1.5.7.tar.bz2) = fbea2590286ddc857a7824d8544cb08842f4299f +RMD160 (uim-1.5.7.tar.bz2) = 037677cd583c2b69293fbbc1c0393756d7c7adac +Size (uim-1.5.7.tar.bz2) = 3330555 bytes SHA1 (patch-ab) = 81693dd1b62bec4deb99b469a0b8e53ff11e86a8 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791 diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index 32ec64252ab..f84aeab6985 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,14 +1,28 @@ -# $NetBSD: options.mk,v 1.17 2009/10/01 12:30:32 obache Exp $ +# $NetBSD: options.mk,v 1.18 2010/01/20 11:06:07 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.uim -#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_SUPPORTED_OPTIONS= anthy canna eb gnome gtk m17nlib prime sj3 uim-fep wnn xim +PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk m17nlib prime uim-fep xim +PKG_OPTIONS_OPTIONAL_GROUPS= kde qt +PKG_OPTIONS_GROUP.kde= kde kde4 +PKG_OPTIONS_GROUP.qt= qt qt4 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" +. 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" +. endif +.endif + PLIST_VARS+= helperdata uim-dict-gtk fep -PLIST_VARS+= anthy canna gnome gtk kde m17nlib prime qt sj3 wnn xim +PLIST_VARS+= anthy canna gnome gtk kde kde4 m17nlib prime qt qt4 sj3 wnn xim .if !empty(PKG_OPTIONS:Mxim) .include "../../x11/libX11/buildlink3.mk" @@ -28,16 +42,23 @@ USE_NCURSES= YES # setupterm, clear_screen, clr_eos .include "../../devel/ncurses/buildlink3.mk" CONFIGURE_ARGS+= --enable-fep PLIST.fep= yes +INSTALLATION_DIRS+= share/doc/uim/uim-fep + +post-install: install-fep-doc + +.PHONY: install-fep-doc +install-fep-doc: + ${INSTALL_DATA} ${WRKSRC}/fep/README ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep + ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep .else CONFIGURE_ARGS+= --disable-fep .endif .if !empty(PKG_OPTIONS:Manthy) . include "../../inputmethod/anthy/buildlink3.mk" -CONFIGURE_ARGS+= --enable-dict +CONFIGURE_ARGS+= --enable-dict --with-anthy-utf8 PLIST.anthy= yes . if !empty(PKG_OPTIONS:Mgtk) -PLIST.helperdata= yes PLIST.uim-dict-gtk= yes . endif .else @@ -53,6 +74,7 @@ PLIST.canna= yes .if !empty(PKG_OPTIONS:Meb) .include "../../textproc/eb/buildlink3.mk" CONFIGURE_ARGS+= --with-eb +CONFIGURE_ARGS+= --with-eb-conf=${PKG_SYSCONFDIR}/eb.conf .endif .if !empty(PKG_OPTIONS:Mgnome) @@ -80,6 +102,15 @@ CONFIGURE_ARGS+= --enable-kde-applet PLIST.kde= yes .endif +.if !empty(PKG_OPTIONS:Mkde4) +. include "../../x11/kdelibs4/buildlink3.mk" +. include "../../x11/qt4-libs/buildlink3.mk" +CONFIGURE_ARGS+= --enable-kde4-applet +PLIST.kde4= yes +.else +CONFIGURE_ARGS+= --disable-kde4-applet +.endif + .if !empty(PKG_OPTIONS:Mm17nlib) . include "../../devel/m17n-lib/buildlink3.mk" DEPENDS+= m17n-contrib-[0-9]*:../../misc/m17n-contrib @@ -99,6 +130,14 @@ PLIST.helperdata= yes PLIST.qt= yes .endif +.if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mkde4) +. 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 +.endif + .if !empty(PKG_OPTIONS:Mprime) . include "../../inputmethod/prime/buildlink3.mk" CONFIGURE_ARGS+= --with-prime |