diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2015-02-20 05:15:17 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2015-02-20 05:15:17 +0000 |
| commit | 00b407013b8400c492267901653fa659d6a5fe18 (patch) | |
| tree | 9a3a1f1414f52dd873c813de73951900a23d0cb0 /japanese/mozc-server | |
| parent | f4a3bd056de40bafcc77a49d2f506805eedd209d (diff) | |
| download | ports-00b407013b8400c492267901653fa659d6a5fe18.tar.gz ports-00b407013b8400c492267901653fa659d6a5fe18.zip | |
- Fix installation path of mozc_emacs_helper.
- Fix mozc_tool path in the fcitx patch set.
Notes
Notes:
svn path=/head/; revision=379411
Diffstat (limited to 'japanese/mozc-server')
| -rw-r--r-- | japanese/mozc-server/Makefile | 13 | ||||
| -rw-r--r-- | japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc | 21 |
2 files changed, 31 insertions, 3 deletions
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 5a2cc5a5b743..c612837375f1 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= mozc PORTVERSION= 2.16.2051.102 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese MASTER_SITES= LOCAL/hrs DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -142,7 +142,7 @@ EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha PLIST_FILES+= bin/mozc \ bin/mozc_server \ - bin/mozc_emacs_helper + libexec/mozc_emacs_helper SUB_FILES+= mozc post-extract-mozc_server: @@ -163,8 +163,10 @@ do-build-mozc_server: do-install-mozc_server: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \ - ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} \ + ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ + ${STAGEDIR}${PREFIX}/libexec ${INSTALL_SCRIPT} \ ${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin .endif @@ -295,6 +297,11 @@ post-extract-fcitx_mozc: 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 diff --git a/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc b/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc new file mode 100644 index 000000000000..ef75da43baba --- /dev/null +++ b/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc @@ -0,0 +1,21 @@ +--- unix/fcitx/fcitx_mozc.cc.orig 2015-02-19 10:48:37.000000000 +0900 ++++ unix/fcitx/fcitx_mozc.cc 2015-02-19 10:54:04.000000000 +0900 +@@ -439,6 +439,8 @@ + boolean ToolMenuAction(struct _FcitxUIMenu *menu, int index) + { + string args; ++ size_t pid = 0; ++ + switch(index) { + case 0: + args = "--mode=config_dialog"; +@@ -459,7 +461,8 @@ + args = "--mode=about_dialog"; + break; + } +- mozc::Process::SpawnMozcProcess("mozc_tool", args); ++ ++ mozc::Process::SpawnProcess(mozc::FileUtil::JoinPath(mozc::SystemUtil::GetToolPath(), "mozc_tool"), args, &pid); + return true; + } + |