svn commit: r379411 - in head/japanese/mozc-server: . files

[Hiroki Sato]

Author: hrs
Date: Fri Feb 20 05:15:17 2015
New Revision: 379411
URL: https://svnweb.freebsd.org/changeset/ports/379411
QAT: https://qat.redports.org/buildarchive/r379411/

Log:
  - Fix installation path of mozc_emacs_helper.
  - Fix mozc_tool path in the fcitx patch set.

Added:
  head/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc   (contents, props changed)
Modified:
  head/japanese/mozc-server/Makefile

Modified: head/japanese/mozc-server/Makefile
==============================================================================
--- head/japanese/mozc-server/Makefile	Fri Feb 20 04:09:42 2015	(r379410)
+++ head/japanese/mozc-server/Makefile	Fri Feb 20 05:15:17 2015	(r379411)
@@ -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}/archiv
 
 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
 

Added: head/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc	Fri Feb 20 05:15:17 2015	(r379411)
@@ -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;
+ }
+