Index: head/japanese/Makefile =================================================================== --- head/japanese/Makefile (revision 391681) +++ head/japanese/Makefile (revision 391682) @@ -1,303 +1,304 @@ # $FreeBSD$ # COMMENT = Japanese support SUBDIR += ASCIIdates98-fpw SUBDIR += CGdic-fpw SUBDIR += FreeWnn-lib SUBDIR += FreeWnn-server SUBDIR += VTPSfont SUBDIR += Wnn6-lib SUBDIR += Wnn7-lib SUBDIR += a2ps SUBDIR += ack SUBDIR += ajaxzip2-core SUBDIR += ajaxzip2-data SUBDIR += alias-fonts SUBDIR += another-htmllint SUBDIR += anthy SUBDIR += asterisk-sounds SUBDIR += awffull SUBDIR += bible_names-fpw SUBDIR += bookview SUBDIR += bugzilla44 SUBDIR += calligra-l10n SUBDIR += canna-lib SUBDIR += canna-server SUBDIR += cannadic SUBDIR += cdrom2 SUBDIR += celrw SUBDIR += chasen-base SUBDIR += cmigemo SUBDIR += cmigemo-dict SUBDIR += csrd SUBDIR += ctags SUBDIR += dbskkd-cdb SUBDIR += ddskk SUBDIR += devil-fpw SUBDIR += dvi2tty SUBDIR += e2ps SUBDIR += eb SUBDIR += ebd-fpw SUBDIR += eblook SUBDIR += ebnetd SUBDIR += ebview-gtk2 SUBDIR += edict SUBDIR += edict-fpw SUBDIR += edict-utf-8 SUBDIR += edyvalue SUBDIR += egg-canna SUBDIR += eijiro-fpw SUBDIR += elisa8x8 SUBDIR += epwutil SUBDIR += esecanna SUBDIR += esecanna-module-vje25 SUBDIR += esecanna-module-vje30 SUBDIR += esecanna-module-wnn6 SUBDIR += eterm SUBDIR += fcitx-anthy SUBDIR += fcitx-mozc SUBDIR += fcitx-skk SUBDIR += flower-fpw SUBDIR += foldoc-fpw SUBDIR += font-ipa SUBDIR += font-ipa-uigothic SUBDIR += font-ipaex SUBDIR += font-ipamjm SUBDIR += font-jisx0213 SUBDIR += font-kochi SUBDIR += font-koruri SUBDIR += font-migmix SUBDIR += font-migu SUBDIR += font-mona-ipa SUBDIR += font-motoya-al SUBDIR += font-mplus SUBDIR += font-mplus-ipa SUBDIR += font-ricty SUBDIR += font-ricty-discord SUBDIR += font-sazanami SUBDIR += font-shinonome SUBDIR += font-std SUBDIR += font-takao SUBDIR += font-ume SUBDIR += font-vlgothic SUBDIR += freepwing SUBDIR += fumeikai-fpw SUBDIR += gawk SUBDIR += gd SUBDIR += gedy SUBDIR += gimp-help SUBDIR += gjiten SUBDIR += groff SUBDIR += gskk SUBDIR += gsuica SUBDIR += guesswork-classic SUBDIR += hns SUBDIR += ibus-anthy SUBDIR += ibus-mozc SUBDIR += ibus-skk SUBDIR += icanna SUBDIR += im-ja SUBDIR += ipadic SUBDIR += jacode.pl SUBDIR += japana SUBDIR += japaneseAFM SUBDIR += jargon-fpw SUBDIR += jcode.pl SUBDIR += jd SUBDIR += jed SUBDIR += jishyo SUBDIR += jls SUBDIR += jmode SUBDIR += jmode-skk SUBDIR += jpilot SUBDIR += jstrings SUBDIR += jvim3 SUBDIR += jyuroku SUBDIR += k10 SUBDIR += k12 SUBDIR += kakasi SUBDIR += kana-no-quiz SUBDIR += kanji18 SUBDIR += kanji26 SUBDIR += kanjipad SUBDIR += kappa20 SUBDIR += kasumi SUBDIR += kbanner SUBDIR += kcc SUBDIR += kcode SUBDIR += kde4-l10n SUBDIR += kdrill SUBDIR += kinput2 SUBDIR += kiten SUBDIR += kon2-14dot SUBDIR += kon2-16dot SUBDIR += kpcal SUBDIR += kterm SUBDIR += latex-jlisting SUBDIR += leafrogue SUBDIR += less SUBDIR += libreoffice SUBDIR += libskk SUBDIR += libslang SUBDIR += libtomoe-gtk SUBDIR += lipsf SUBDIR += lookup SUBDIR += lsd-fpw SUBDIR += lynx SUBDIR += lynx-current SUBDIR += mailman SUBDIR += man SUBDIR += man-doc SUBDIR += marumoji-fonts SUBDIR += mecab SUBDIR += mecab-ipadic SUBDIR += mg SUBDIR += mh SUBDIR += migemo SUBDIR += migemo-emacs23 SUBDIR += migemo.el SUBDIR += mikachan-ttfonts SUBDIR += mime_pls SUBDIR += ming SUBDIR += monafonts SUBDIR += monafonts-ttf SUBDIR += mozc-el SUBDIR += mozc-server SUBDIR += mozc-tool SUBDIR += mtools SUBDIR += multiskkserv SUBDIR += mutt-devel SUBDIR += mypaedia-fpw-package SUBDIR += namazu SUBDIR += namazu2 SUBDIR += navi2ch SUBDIR += ne SUBDIR += nethack34 SUBDIR += netype SUBDIR += newosaka SUBDIR += ng SUBDIR += ng-canna SUBDIR += ng-devel SUBDIR += ngraph-fonts SUBDIR += nhocr SUBDIR += nkf SUBDIR += ochusha SUBDIR += onew SUBDIR += p5-Acme-Lou SUBDIR += p5-Date-Japanese-Era SUBDIR += p5-Date-Japanese-Holiday SUBDIR += p5-DateTime-Calendar-Japanese-Era SUBDIR += p5-DateTime-Format-Japanese SUBDIR += p5-Encode-EUCJPMS SUBDIR += p5-Encode-ISO2022 SUBDIR += p5-Encode-JP-Emoji SUBDIR += p5-Encode-JP-Mobile SUBDIR += p5-HTML-MobileJp SUBDIR += p5-Jcode SUBDIR += p5-Lingua-JA-Kana SUBDIR += p5-Lingua-JA-Numbers SUBDIR += p5-Lingua-JA-Regular-Unicode SUBDIR += p5-Lingua-JA-Summarize-Extract SUBDIR += p5-MeCab SUBDIR += p5-Number-Phone-JP SUBDIR += p5-PDFJ SUBDIR += p5-Text-ChaSen SUBDIR += p5-Text-Kakasi SUBDIR += p5-Text-MeCab SUBDIR += p5-Unicode-Japanese SUBDIR += p5-WWW-2ch SUBDIR += p5-WWW-MobileCarrierJP SUBDIR += p5-nkf SUBDIR += pejv-fpw SUBDIR += php5-mecab SUBDIR += php_doc SUBDIR += plain2 SUBDIR += plan SUBDIR += prn SUBDIR += py-mecab SUBDIR += py-tegaki SUBDIR += py-tegaki-gtk SUBDIR += py-zinnia SUBDIR += qkc SUBDIR += qt4-codecs-jp SUBDIR += quit SUBDIR += roget-fpw SUBDIR += rogue_s SUBDIR += ruby-eb SUBDIR += ruby-mecab SUBDIR += ruby-romkan SUBDIR += ruby-uconv SUBDIR += ruby-usersguide SUBDIR += rubygem-jpmobile SUBDIR += rubygem-jpmobile-ipaddresses SUBDIR += rubygem-jpmobile-terminfo SUBDIR += rubygem-jpmobile4 SUBDIR += rubygem-mail-iso-2022-jp SUBDIR += rubygem-myrurema SUBDIR += ryaku-fpw SUBDIR += scim-anthy SUBDIR += scim-canna SUBDIR += scim-honoka SUBDIR += scim-honoka-plugin-romkan SUBDIR += scim-honoka-plugin-wnn SUBDIR += scim-skk SUBDIR += scim-tables SUBDIR += scim-tomoe SUBDIR += scim-uim SUBDIR += seaside SUBDIR += sj3-lib SUBDIR += sj3-server SUBDIR += skk SUBDIR += skk-jisyo SUBDIR += skk-jisyo-cdb SUBDIR += skk-tools SUBDIR += skkfep SUBDIR += skkinput SUBDIR += skkinput3 SUBDIR += skkserv SUBDIR += slimeforest SUBDIR += slrn SUBDIR += spamassassin SUBDIR += srd-fpw-package SUBDIR += suicavalue SUBDIR += t2ps SUBDIR += tdiary SUBDIR += tegaki-recognize SUBDIR += tegaki-zinnia-japanese SUBDIR += tex-ptex SUBDIR += texinfo SUBDIR += tgif SUBDIR += tiarra SUBDIR += timidity++-slang SUBDIR += today SUBDIR += tomoe SUBDIR += uim-anthy + SUBDIR += uim-mozc SUBDIR += uim-tomoe-gtk SUBDIR += vera-fpw SUBDIR += vftool SUBDIR += w3m SUBDIR += w3m-img SUBDIR += waeijiro-fpw SUBDIR += wdic-fpw SUBDIR += web1913-fpw SUBDIR += webalizer SUBDIR += wnn7egg SUBDIR += wordnet-fpw SUBDIR += wordpress SUBDIR += wwasw-fpw SUBDIR += xdtp SUBDIR += xgate SUBDIR += xpdf SUBDIR += xshodou SUBDIR += xtr SUBDIR += xv SUBDIR += xyaku SUBDIR += yasou-fpw SUBDIR += yc.el SUBDIR += zinnia SUBDIR += zinnia-tomoe SUBDIR += zipcodes .include Index: head/japanese/ibus-mozc/files/pkg-message.in =================================================================== --- head/japanese/ibus-mozc/files/pkg-message.in (revision 391681) +++ head/japanese/ibus-mozc/files/pkg-message.in (revision 391682) @@ -1,8 +1,11 @@ To activate ibus-mozc, please add the following into ~/.xinitrc, ~/.xsession, or ~/.kde4/env (for KDE4): export GTK_IM_MODULE=ibus export QT_IM_MODULE=xim export XMODIFIERS=@im=ibus %%PREFIX%%/bin/mozc start ibus-daemon -r --daemonize --xim + +Note that textproc/ibus-qt with IBUS option is required to +make QT_IM_MODULE=ibus work. Index: head/japanese/mozc-server/Makefile =================================================================== --- head/japanese/mozc-server/Makefile (revision 391681) +++ head/japanese/mozc-server/Makefile (revision 391682) @@ -1,366 +1,417 @@ # Created by: Daichi GOTO # $FreeBSD$ PORTNAME= mozc PORTVERSION= 2.16.2051.102 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese MASTER_SITES= LOCAL/hrs DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= hrs@FreeBSD.org COMMENT?= Mozc Japanese Input Method, Server LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/third_party/gyp/LICENSE BUILD_DEPENDS= ninja:${PORTSDIR}/devel/ninja \ python:${PORTSDIR}/lang/python EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR} LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf \ libzinnia.so:${PORTSDIR}/japanese/zinnia RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USES= compiler:c++11-lang pkgconfig iconv:wchar_t gmake \ tar:bzip2 python:build BUILD_MOZC_LIST?= mozc_server -.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" +.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" PKGNAMEPREFIX= ja- PKGNAMESUFFIX= -server LICENSE= BSD3CLAUSE NAISTL LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third_party/gyp/LICENSE LICENSE_DISTFILES_BSD3CLAUSE= ${DISTNAME}${EXTRACT_SUFX} LICENSE_NAME_NAISTL= Nara Institute of Science and Technology License LICENSE_PERMS_NAISTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE_NAISTL= ${WRKSRC}/data/dictionary_oss/README.txt LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX} .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" USE_GNOME= glib20 gtk20 USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" USE_XORG= xcb USE_GNOME= glib20 gtk20 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" USE_EMACS= yes .elif ${BUILD_MOZC_LIST:Mfcitx_mozc} USES+= gettext-tools .endif # Use GCC only when the stock clang does not have libc++.so. .if exists(/usr/bin/clang) && exists(/usr/lib/libc++.so) _CCTYPE= clang .else USE_GCC= yes _CCTYPE= gcc .endif .include .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile: segfault .endif GYP_DEFINES= use_libprotobuf=1 \ channel_dev=0 \ enable_unittest=0 \ compiler_host="${_CCTYPE}" \ compiler_target="${_CCTYPE}" \ zinnia_model_file="${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model" \ ibus_mozc_icon_path="${LOCALBASE}/share/ibus-mozc/icons/product_icon.png" \ ibus_mozc_path="${PREFIX}/libexec/ibus-engine-mozc" BUILD_MODE= Release BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD} BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \ ${SETENV} BUILD_COMMAND="${WRKSRC}/mozcmake" \ PYTHONPATH=${WRKSRC}/third_party/gyp/pylib/gyp \ GYP_DEFINES="${GYP_DEFINES}" \ CC_host="${CC}" \ CC_target="${CC}" \ CXX_host="${CXX}" \ CXX_target="${CXX}" \ LD_host="${CXX}" \ AR_host="${AR}" \ ${PYTHON_CMD} build_mozc.py BUILD_MOZC_CMD_BUILD= ${BUILD_MOZC_CMD} build -c ${BUILD_MODE} ${_MAKE_JOBS} BUILD_GYP_CMD= cd ${WRKSRC}/third_party/gyp && \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} post-patch: ${MKDIR} ${WRKSRC}/mozc_build_tools/linux ${LN} -sf ${LOCALBASE}/bin/protoc ${WRKSRC}/mozc_build_tools/linux/ ${REINPLACE_CMD} 's,-liconv,${ICONV_LIB},g' \ ${WRKSRC}/gui/qt_libraries.gypi .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" ${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \ ${WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh ${REINPLACE_CMD} "s,/usr,${LOCALBASE:Q}," \ ${WRKSRC}/unix/fcitx/mozc.conf .endif .if !${BUILD_MOZC_LIST:Mmozc_el} ${WRKSRC}/mozcmake: ${PRINTF} "%s\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} $$@' \ > ${WRKSRC}/mozcmake ${CHMOD} +x ${WRKSRC}/mozcmake post-configure: ${WRKSRC}/mozcmake ${BUILD_MOZC_CMD} gyp \ --gypdir=${WRKSRC}/third_party/gyp \ --server_dir="${PREFIX}/bin" \ --tool_dir="${PREFIX}/libexec" \ --renderer_dir="${PREFIX}/libexec" \ --localbase="${LOCALBASE}" \ --ldflags="${LDFLAGS} -fstack-protector -L${LOCALBASE}/lib" \ --cflags="${CFLAGS:Q}" \ --cflags_cc="${CXXFLAGS:Q}" \ --include_dirs="${LOCALBASE}/include" \ ${GYP_OPTIONS} .endif # mozc_server -.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" || defined(makesum) +.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" || make(makesum) GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=0 MASTER_SITES+= LOCAL/kuriyama:zipcode DISTFILES+= \ ken_all-20130628.lzh:zipcode \ jigyosyo-20130628.lzh:zipcode EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha PLIST_FILES+= bin/mozc \ bin/mozc_server \ libexec/mozc_emacs_helper SUB_FILES+= mozc post-extract-mozc_server: @for F in jigyosyo-20130628.lzh ken_all-20130628.lzh; do \ ${LHA_CMD} xfq2w=${WRKSRC}/data/dictionary_oss ${DISTDIR}/$$F; \ done @cd ${WRKSRC}/data/dictionary_oss && \ ${PYTHON_CMD} ${WRKSRC}/dictionary/gen_zip_code_seed.py \ --zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \ >> dictionary09.txt post-extract: post-extract-mozc_server do-build-mozc_server: ${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server ${BUILD_MOZC_CMD_BUILD} unix/emacs/emacs.gyp:mozc_emacs_helper do-install-mozc_server: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ ${STAGEDIR}${PREFIX}/libexec ${INSTALL_SCRIPT} \ ${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin .endif # mozc_tool .if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=1 RUN_DEPENDS+= ${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:${PORTSDIR}/japanese/tegaki-zinnia-japanese PLIST_FILES+= libexec/mozc_tool \ bin/mozc_tool \ %%DATADIR%%/icons/product_logo.png \ %%DATADIR%%/icons/update_uptodate.png SUB_FILES+= mozc_tool do-build-mozc_tool: ${BUILD_MOZC_CMD_BUILD} gui/gui.gyp:mozc_tool do-install-mozc_tool: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \ ${STAGEDIR}${PREFIX}/libexec ${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/icons ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/product_logo.png ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/update_uptodate.png .endif # ibus_mozc .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=1 \ enable_gtk_renderer=1 LIB_DEPENDS+= libibus-1.0.so:${PORTSDIR}/textproc/ibus RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \ mozc_tool:${PORTSDIR}/japanese/mozc-tool \ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify PLIST_FILES+= libexec/mozc_renderer \ libexec/ibus-engine-mozc \ %%DATADIR%%/icons/alpha_full.png \ %%DATADIR%%/icons/alpha_half.png \ %%DATADIR%%/icons/dictionary.png \ %%DATADIR%%/icons/direct.png \ %%DATADIR%%/icons/hiragana.png \ %%DATADIR%%/icons/katakana_full.png \ %%DATADIR%%/icons/katakana_half.png \ %%DATADIR%%/icons/product_icon.png \ %%DATADIR%%/icons/properties.png \ %%DATADIR%%/icons/tool.png \ share/ibus/component/mozc.xml PLIST_DIRS+= %%DATADIR%%/icons ${DATADIR_REL} do-build-ibus_mozc: ${BUILD_MOZC_CMD_BUILD} \ unix/ibus/ibus.gyp:ibus_mozc \ renderer/renderer.gyp:mozc_renderer do-install-ibus_mozc: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \ ${STAGEDIR}${PREFIX}/libexec/mozc_renderer ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \ ${STAGEDIR}${PREFIX}/libexec/ibus-engine-mozc ${MKDIR} ${STAGEDIR}${PREFIX}/share/ibus/component ${INSTALL_DATA} \ ${WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/ibus/mozc.xml \ ${STAGEDIR}${PREFIX}/share/ibus/component/mozc.xml @${MKDIR} ${STAGEDIR}${DATADIR}/icons .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/${F}.png \ ${STAGEDIR}${DATADIR}/icons/${F:S/^ui-//}.png .endfor ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/product_icon.png .endif +# uim_mozc +.if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum) +#USE_GITHUB= yes # XXX +GH_ACCOUNT= e-kato +GH_PROJECT= macuim +GH_TAGNAME= v0.6.16.2 +DISTFILES+= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}:gh +EXTRACT_ONLY+= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX} +MASTER_SITES+= https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/:gh +WRKSRC_MU= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//} + +LIB_DEPENDS+= libuim.so:${PORTSDIR}/textproc/uim +RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \ + mozc_tool:${PORTSDIR}/japanese/mozc-tool +GYP_OPTIONS+= --noqt +GYP_DEFINES+= use_libibus=0 \ + enable_gtk_renderer=0 + +PLIST_FILES+= lib/uim/plugin/libuim-mozc.so \ + %%DATADIR%%/mozc.scm \ + %%DATADIR%%/mozc-custom.scm \ + %%DATADIR%%/mozc-key-custom.scm \ + %%DATADIR%%/pixmaps/mozc.png \ + "@exec ${LOCALBASE}/bin/uim-module-manager --register mozc" \ + "@unexec ${LOCALBASE}/bin/uim-module-manager --unregister mozc" + +post-extract-uim_mozc: + ${LN} -s ${WRKSRC_MU}/Mozc/uim ${WRKSRC}/unix + ${REINPLACE_CMD} -e "s,/usr/lib/mozc,${LOCALBASE}/libexec," \ + ${WRKSRC_MU}/Mozc/scm/mozc-custom.scm + +post-extract: post-extract-uim_mozc + +do-build-uim_mozc: + ${BUILD_MOZC_CMD_BUILD} \ + unix/uim/uim.gyp:uim-mozc + +do-install-uim_mozc: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/uim/plugin + ${INSTALL_PROGRAM} \ + ${WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \ + ${STAGEDIR}${PREFIX}/lib/uim/plugin + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC_MU}/Mozc/scm && \ + ${INSTALL_DATA} mozc.scm mozc-custom.scm mozc-key-custom.scm \ + ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps + ${INSTALL_DATA} \ + ${WRKSRC}/data/images/product_icon_32bpp-128.png \ + ${STAGEDIR}${DATADIR}/pixmaps/mozc.png +.endif + # fcitx_mozc .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" || make(makesum) PATCH_SITES= http://download.fcitx-im.org/fcitx-mozc/ PATCHFILES= fcitx-mozc-2.16.2037.102.2.patch .endif .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" PATCH_DIST_STRIP=-p2 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-unix-fcitx-eim.cc \ ${PATCHDIR}/extra-patch-unix-fcitx-mozc_response_parser.cc \ ${PATCHDIR}/extra-patch-unix-fcitx-surrounding_text_util.cc - GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=0 LIB_DEPENDS+= libfcitx-core.so:${PORTSDIR}/chinese/fcitx RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \ mozc_tool:${PORTSDIR}/japanese/mozc-tool PLIST_FILES+= lib/fcitx/fcitx-mozc.so \ share/fcitx/addon/fcitx-mozc.conf \ share/fcitx/inputmethod/mozc.conf \ %%DATADIR%%/icon/mozc.png \ %%DATADIR%%/icon/mozc-alpha_full.png \ %%DATADIR%%/icon/mozc-alpha_half.png \ %%DATADIR%%/icon/mozc-direct.png \ %%DATADIR%%/icon/mozc-hiragana.png \ %%DATADIR%%/icon/mozc-katakana_full.png \ %%DATADIR%%/icon/mozc-katakana_half.png \ %%DATADIR%%/icon/mozc-dictionary.png \ %%DATADIR%%/icon/mozc-properties.png \ %%DATADIR%%/icon/mozc-tool.png \ share/locale/ja/LC_MESSAGES/fcitx-mozc.mo \ share/locale/zh_CN/LC_MESSAGES/fcitx-mozc.mo \ share/locale/zh_TW/LC_MESSAGES/fcitx-mozc.mo PLIST_DIRS+= %%DATADIR%%/icon ${DATADIR_REL} post-extract-fcitx_mozc: ${RM} ${WRKSRC}/unix/fcitx/fcitx.gyp post-extract: post-extract-fcitx_mozc post-patch-fcitx_mozc: cd ${PATCH_WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-unix_fcitx_fcitx_mozc.cc post-patch: post-patch-fcitx_mozc do-build-fcitx_mozc: ${BUILD_MOZC_CMD_BUILD} unix/fcitx/fcitx.gyp:fcitx-mozc do-install-fcitx_mozc: @${MKDIR} \ ${STAGEDIR}${PREFIX}/lib/fcitx \ ${STAGEDIR}${PREFIX}/share/fcitx/addon \ ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod ${INSTALL_LIB} \ ${WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \ ${STAGEDIR}${PREFIX}/lib/fcitx/fcitx-mozc.so ${INSTALL_DATA} \ ${WRKSRC}/unix/fcitx/fcitx-mozc.conf \ ${STAGEDIR}${PREFIX}/share/fcitx/addon/fcitx-mozc.conf ${INSTALL_DATA} \ ${WRKSRC}/unix/fcitx/mozc.conf \ ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod/mozc.conf @${MKDIR} ${STAGEDIR}${DATADIR}/icon .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/${F}.png \ ${STAGEDIR}${DATADIR}/icon/${F:S,^ui-,mozc-,}.png .endfor ${INSTALL_DATA} \ ${WRKSRC}/data/images/product_icon_32bpp-128.png \ ${STAGEDIR}${DATADIR}/icon/mozc.png .for L in ja zh_CN zh_TW ${INSTALL_DATA} \ ${WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/fcitx/po/${L}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo .endfor .endif # mozc_el .if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" CATEGORIES+= elisp RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server PLIST_FILES+= ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el PLIST_DIRS+= ${EMACS_VERSION_SITE_LISPDIR}/mozc post-patch-mozc_el: ${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," \ ${WRKSRC}/unix/emacs/mozc.el post-patch: post-patch-mozc_el do-build-mozc_el: cd ${WRKSRC}/unix/emacs && \ ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ -f batch-byte-compile mozc.el do-install-mozc_el: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc ${INSTALL_DATA} \ ${WRKSRC}/unix/emacs/mozc.elc \ ${FILESDIR}/leim-list.el \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ .endif do-build: ${BUILD_MOZC_LIST:S/^/do-build-/} do-install: ${BUILD_MOZC_LIST:S/^/do-install-/} .include Index: head/japanese/mozc-server/distinfo =================================================================== --- head/japanese/mozc-server/distinfo (revision 391681) +++ head/japanese/mozc-server/distinfo (revision 391682) @@ -1,8 +1,10 @@ SHA256 (mozc-2.16.2051.102.tar.bz2) = 11877306031afee3bbe39e2208340d27df21c90605c1cf48fe788ffa5cf249aa SIZE (mozc-2.16.2051.102.tar.bz2) = 36135991 SHA256 (ken_all-20130628.lzh) = 78630e7f8b396603cde066c4a6d598c9af94bb97f415a68148dd3144dea18871 SIZE (ken_all-20130628.lzh) = 1735995 SHA256 (jigyosyo-20130628.lzh) = d7b796d8643457d883de4a33cb3edf7455f11d778ea74d07b450ea10f3339cf7 SIZE (jigyosyo-20130628.lzh) = 823590 SHA256 (fcitx-mozc-2.16.2037.102.2.patch) = ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e SIZE (fcitx-mozc-2.16.2037.102.2.patch) = 140421 +SHA256 (e-kato-macuim-v0.6.16.2_GH0.tar.bz2) = 25fca78d1d76cc5c6a49f3b2f6981791ad8275abb2726334d8d40bd49498194d +SIZE (e-kato-macuim-v0.6.16.2_GH0.tar.bz2) = 324551 Index: head/japanese/mozc-server/files/mozc.in =================================================================== --- head/japanese/mozc-server/files/mozc.in (revision 391681) +++ head/japanese/mozc-server/files/mozc.in (revision 391682) @@ -1,71 +1,72 @@ #!/bin/sh # $FreeBSD$ : ${MOZCDIR:="${HOME}/.mozc"} # Mozc does not run by priviledged user. Ignore silently. case $(id -u) in 0) exit 0 ;; esac mkdir -m 0700 -p "${MOZCDIR}" chmod 0700 "${MOZCDIR}" cleanup_lock() { rm -f "${MOZCDIR}/.session.ipc" \ "${MOZCDIR}/.server.lock" \ "${MOZCDIR}/mozc_server.pid" } check_lock() { if [ -r "${MOZCDIR}/.server.lock" ]; then if [ -r "${MOZCDIR}/mozc_server.pid" ]; then pid=$(cat "${MOZCDIR}/mozc_server.pid") pid=" (PID=$pid)" fi printf "mozc_server is running%s.\n" "$pid" \ > /dev/stderr false fi } start_cmd() { daemon -c -f -p "${MOZCDIR}/mozc_server.pid" \ "%%PREFIX%%/bin/mozc_server" } stop_server() { if [ -r "${MOZCDIR}/mozc_server.pid" ]; then pkill -F "${MOZCDIR}/mozc_server.pid" + else + for p in $(pgrep -U $(id -u) mozc_server); do + kill $p + done fi - for p in $(pgrep -U $(id -u) mozc_server); do - kill $p - done } case $1 in start) check_lock || exit 1 start_cmd ;; forcestart|restart) stop_server cleanup_lock start_cmd ;; stop|forcestop) stop_server cleanup_lock ;; status) pid=$(pgrep -U $(id -u) mozc_server) case $pid in [0-9]*) echo $pid && exit 0 ;; *) exit 1 ;; esac ;; *) echo "$0 [start|stop|restart|forcestart|forcestop|status]" exit 1 ;; esac Index: head/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py =================================================================== --- head/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py (revision 391681) +++ head/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py (revision 391682) @@ -1,23 +1,49 @@ ---- unix/ibus/gen_mozc_xml.py.orig 2015-02-17 18:05:39.000000000 +0900 -+++ unix/ibus/gen_mozc_xml.py 2015-02-17 18:06:30.000000000 +0900 -@@ -203,13 +203,19 @@ +--- unix/ibus/gen_mozc_xml.py.orig 2015-02-15 04:18:31.000000000 +0900 ++++ unix/ibus/gen_mozc_xml.py 2015-02-22 02:00:23.000000000 +0900 +@@ -67,7 +67,7 @@ + # Information to generate part of mozc.xml for IBus 1.5 or later. + IBUS_1_5_ENGINE_COMMON_PROPS = { + 'description': '%(product_name)s (Japanese Input Method)', +- 'language': 'ja', ++ 'language': 'jpn', + 'icon': '%(ibus_mozc_icon_path)s', + 'rank': '80', + 'symbol': 'あ', +@@ -91,7 +91,7 @@ + # unix/ibus/mozc_engine.cc. + 'name': ['mozc-jp'], + 'longname': ['%(product_name)s'], +- 'layout': ['default'], ++ 'layout': ['jp'], + }, + } + +@@ -129,6 +129,7 @@ + engines: A dictionary from a property name to a list of property values of + engines. For example, {'name': ['mozc-jp', 'mozc', 'mozc-dv']}. + """ ++ print '' + print '' + for key in component: + OutputXmlElement(param_dict, key, component[key]) +@@ -203,13 +204,19 @@ parser.add_option('--server_dir', dest='server_dir', default='', help='The absolute directory path to be installed the ' 'server executable.') + parser.add_option('--renderer_dir', dest='renderer_dir', default='', + help='The absolute directory path to be installed the ' + 'renderer executable.') + parser.add_option('--tool_dir', dest='tool_dir', default='', + help='The absolute directory path to be installed the ' + 'tool executable.') parser.add_option('--pkg_config_command', dest='pkg_config_command', default='pkg-config', help='The path to pkg-config command.') (options, unused_args) = parser.parse_args() setup_arg = [] - setup_arg.append(os.path.join(options.server_dir, 'mozc_tool')) + setup_arg.append(os.path.join(options.tool_dir, 'mozc_tool')) setup_arg.append('--mode=config_dialog') if IsIBus15OrGreater(options): # A tentative workaround against IBus 1.5 Index: head/japanese/uim-mozc/Makefile =================================================================== --- head/japanese/uim-mozc/Makefile (nonexistent) +++ head/japanese/uim-mozc/Makefile (revision 391682) @@ -0,0 +1,16 @@ +# Created by: Koichiro IWAO +# $FreeBSD$ + +PKGNAMEPREFIX= ja-uim- + +COMMENT= Mozc engine for uim + +MASTERDIR= ${.CURDIR}/../../japanese/mozc-server +FILESDIR= ${.CURDIR}/files +DATADIR= ${PREFIX}/share/uim +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message + +BUILD_MOZC_LIST=uim_mozc + +.include "${MASTERDIR}/Makefile" Property changes on: head/japanese/uim-mozc/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/japanese/uim-mozc/files/pkg-message.in =================================================================== --- head/japanese/uim-mozc/files/pkg-message.in (nonexistent) +++ head/japanese/uim-mozc/files/pkg-message.in (revision 391682) @@ -0,0 +1,9 @@ +To activate uim-mozc, please add the following into ~/.xinitrc, +~/.xsession, or ~/.kde4/env (for KDE4): + +export GTK_IM_MODULE=uim +export QT_IM_MODULE=uim +export XMODIFIERS=@im=uim +export XIM=uim +%%PREFIX%%/bin/mozc start +uim-xim & Property changes on: head/japanese/uim-mozc/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property