Update mozc to 0.13.481.102

18 files changed, 48 insertions, 46 deletions

diff --git a/japanese/mozc-tool/Makefile b/japanese/mozc-tool/Makefile
index 8ce8a10d8a93..85b7130331c6 100644
--- a/japanese/mozc-tool/Makefile
+++ b/japanese/mozc-tool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozc-tool
-PORTVERSION=	0.13.464.102
+PORTVERSION=	0.13.481.102
 CATEGORIES=	japanese
 MASTER_SITES=	http://people.freebsd.org/~daichi/distfiles/
 DISTNAME=	mozc-${PORTVERSION}
diff --git a/japanese/mozc-tool/distinfo b/japanese/mozc-tool/distinfo
index 8b8c964afe8a..78f0b20e2249 100644
--- a/japanese/mozc-tool/distinfo
+++ b/japanese/mozc-tool/distinfo
@@ -1,3 +1,3 @@
-MD5 (mozc-0.13.464.102.tar.bz2) = cfca690cd9479140e362582ed2485efe
-SHA256 (mozc-0.13.464.102.tar.bz2) = bf4b7098dbedb2f76c5fb5ef2cd23901aef851cc169f3afd313346c67ae78435
-SIZE (mozc-0.13.464.102.tar.bz2) = 37926890
+MD5 (mozc-0.13.481.102.tar.bz2) = c56d2ac35c55f727b78c9b5383d932a2
+SHA256 (mozc-0.13.481.102.tar.bz2) = 5026735af697e363b6bf6c35c792f8ae3e9496aaedb308073d188e098eb1cb2e
+SIZE (mozc-0.13.481.102.tar.bz2) = 38662751
diff --git a/japanese/mozc-tool/files/patch-base_iconv.cc b/japanese/mozc-tool/files/patch-base_iconv.cc
index 8c1ba452294f..b1c846ee17a0 100644
--- a/japanese/mozc-tool/files/patch-base_iconv.cc
+++ b/japanese/mozc-tool/files/patch-base_iconv.cc
@@ -1,5 +1,5 @@
---- base/iconv.cc.org	2010-09-18 12:20:13.813642569 +0900
-+++ base/iconv.cc	2010-09-18 12:19:33.357557229 +0900
+--- base/iconv.cc.org	2010-09-25 10:26:07.239337059 +0900
++++ base/iconv.cc	2010-09-25 10:26:55.505337905 +0900
 @@ -52,7 +52,11 @@
    size_t olen_org = olen;
    iconv(ic, 0, &ilen, 0, &olen);  // reset iconv state
diff --git a/japanese/mozc-tool/files/patch-base_mutex.h b/japanese/mozc-tool/files/patch-base_mutex.h
index c75ef246511a..70d4febf5fb6 100644
--- a/japanese/mozc-tool/files/patch-base_mutex.h
+++ b/japanese/mozc-tool/files/patch-base_mutex.h
@@ -1,5 +1,5 @@
---- base/mutex.h.org	2010-09-18 12:23:25.325487231 +0900
-+++ base/mutex.h	2010-09-18 12:25:51.859100581 +0900
+--- base/mutex.h.org	2010-09-25 11:01:36.626334847 +0900
++++ base/mutex.h	2010-09-25 11:02:17.429334111 +0900
 @@ -82,11 +82,11 @@
      // PTHREAD_MUTEX_RECURSIVE_NP and PTHREAD_MUTEX_RECURSIVE seem to be
      // variants.  For example, Mac OS X 10.4 had
diff --git a/japanese/mozc-tool/files/patch-base_process.cc b/japanese/mozc-tool/files/patch-base_process.cc
index 908ba1effdb2..24b4bc7cdb2a 100644
--- a/japanese/mozc-tool/files/patch-base_process.cc
+++ b/japanese/mozc-tool/files/patch-base_process.cc
@@ -1,5 +1,5 @@
---- base/process.cc.org	2010-09-18 12:27:25.817558709 +0900
-+++ base/process.cc	2010-09-18 12:30:41.053121051 +0900
+--- base/process.cc.org	2010-09-25 11:02:43.698333384 +0900
++++ base/process.cc	2010-09-25 11:03:27.524341996 +0900
 @@ -194,13 +194,18 @@
    return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW);
  #endif
diff --git a/japanese/mozc-tool/files/patch-base_util.cc b/japanese/mozc-tool/files/patch-base_util.cc
index bee40881543d..c6abf9555696 100644
--- a/japanese/mozc-tool/files/patch-base_util.cc
+++ b/japanese/mozc-tool/files/patch-base_util.cc
@@ -1,5 +1,5 @@
---- base/util.cc.org	2010-09-18 12:31:34.023397161 +0900
-+++ base/util.cc	2010-09-18 12:34:43.496234072 +0900
+--- base/util.cc.org	2010-09-25 11:03:37.453334648 +0900
++++ base/util.cc	2010-09-25 11:04:14.026334568 +0900
 @@ -1525,9 +1525,13 @@
    return MacUtil::GetServerDirectory();
  #endif  // OS_MACOSX
diff --git a/japanese/mozc-tool/files/patch-build_mozc.py b/japanese/mozc-tool/files/patch-build_mozc.py
index c174a39a2da0..95c9cb262604 100644
--- a/japanese/mozc-tool/files/patch-build_mozc.py
+++ b/japanese/mozc-tool/files/patch-build_mozc.py
@@ -1,5 +1,5 @@
---- build_mozc.py.org	2010-09-18 12:36:34.298723774 +0900
-+++ build_mozc.py	2010-09-18 12:43:00.635215143 +0900
+--- build_mozc.py.org	2010-09-25 11:04:25.422333501 +0900
++++ build_mozc.py	2010-09-25 11:05:53.458336959 +0900
 @@ -69,7 +69,7 @@
  
  def IsLinux():
@@ -9,7 +9,7 @@
  
  
  # TODO(yukawa): Move this function to util.py (b/2715400)
-@@ -576,6 +576,8 @@
+@@ -578,6 +578,8 @@
  
    # default Qt dir to support the current build procedure for Debian.
    default_qtdir = '/usr/local/Trolltech/Qt-4.6.3'
@@ -18,7 +18,7 @@
    if IsWindows():
      default_qtdir = None
    parser.add_option('--qtdir', dest='qtdir',
-@@ -627,6 +629,8 @@
+@@ -629,6 +631,8 @@
      target_names.append(target_name)
  
    make_command = os.getenv('BUILD_COMMAND', 'make')
diff --git a/japanese/mozc-tool/files/patch-build_tools_mozc_version.py b/japanese/mozc-tool/files/patch-build_tools_mozc_version.py
index d4974e32f682..17ec991fe896 100644
--- a/japanese/mozc-tool/files/patch-build_tools_mozc_version.py
+++ b/japanese/mozc-tool/files/patch-build_tools_mozc_version.py
@@ -1,5 +1,5 @@
---- build_tools/mozc_version.py.org	2010-09-18 12:43:48.727968273 +0900
-+++ build_tools/mozc_version.py	2010-09-18 12:44:16.755115578 +0900
+--- build_tools/mozc_version.py.org	2010-09-25 11:06:06.607334667 +0900
++++ build_tools/mozc_version.py	2010-09-25 11:06:24.382334562 +0900
 @@ -55,7 +55,7 @@
  
  def IsLinux():
diff --git a/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc b/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc
index 416af258cca9..a3be9022277f 100644
--- a/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc
+++ b/japanese/mozc-tool/files/patch-gui_about_dialog_about_dialog.cc
@@ -1,9 +1,10 @@
---- gui/about_dialog/about_dialog.cc.org	2010-09-18 12:44:49.983959188 +0900
-+++ gui/about_dialog/about_dialog.cc	2010-09-18 12:46:24.679654311 +0900
-@@ -114,7 +114,11 @@
+--- gui/about_dialog/about_dialog.cc.org	2010-09-25 11:06:33.059334293 +0900
++++ gui/about_dialog/about_dialog.cc	2010-09-25 11:07:21.090335160 +0900
+@@ -113,8 +113,11 @@
+ 
    SetLabelText(label_terms);
    SetLabelText(label_credits);
- 
+-
 +#ifdef __FreeBSD__
 +  product_image_.reset(new QImage("@@LOCALBASE@@/share/mozc-tool/icons/product_logo.png"));
 +#else
diff --git a/japanese/mozc-tool/files/patch-gui_about_dialog_version_image_widget.cc b/japanese/mozc-tool/files/patch-gui_about_dialog_version_image_widget.cc
index 05908d134771..c85b950afe19 100644
--- a/japanese/mozc-tool/files/patch-gui_about_dialog_version_image_widget.cc
+++ b/japanese/mozc-tool/files/patch-gui_about_dialog_version_image_widget.cc
@@ -1,5 +1,5 @@
---- gui/about_dialog/version_image_widget.cc.org	2010-09-18 12:47:08.097447075 +0900
-+++ gui/about_dialog/version_image_widget.cc	2010-09-18 12:47:49.718581046 +0900
+--- gui/about_dialog/version_image_widget.cc.org	2010-09-25 11:07:28.324337247 +0900
++++ gui/about_dialog/version_image_widget.cc	2010-09-25 11:07:59.689335312 +0900
 @@ -41,7 +41,11 @@
  void VersionImageWidget::loadImage() {
    // Currently the version is always latest.
diff --git a/japanese/mozc-tool/files/patch-gyp_common.gypi b/japanese/mozc-tool/files/patch-gyp_common.gypi
index df9dd03305ef..4582d24138dc 100644
--- a/japanese/mozc-tool/files/patch-gyp_common.gypi
+++ b/japanese/mozc-tool/files/patch-gyp_common.gypi
@@ -1,6 +1,6 @@
---- gyp/common.gypi.org	2010-09-18 12:48:37.180713244 +0900
-+++ gyp/common.gypi	2010-09-18 12:49:57.723919434 +0900
-@@ -437,6 +437,12 @@
+--- gyp/common.gypi.org	2010-09-25 11:08:08.270335412 +0900
++++ gyp/common.gypi	2010-09-25 11:08:34.704344483 +0900
+@@ -436,6 +436,12 @@
            '-lz',
            '<@(extra_linux_libs)',
          ],
diff --git a/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc b/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc
index 845d61690f3a..88c616e7db46 100644
--- a/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc
+++ b/japanese/mozc-tool/files/patch-ipc_ipc_path_manager.cc
@@ -1,5 +1,5 @@
---- ipc/ipc_path_manager.cc.org	2010-09-18 12:50:30.684194274 +0900
-+++ ipc/ipc_path_manager.cc	2010-09-18 12:51:46.640904973 +0900
+--- ipc/ipc_path_manager.cc.org	2010-09-25 11:09:39.543334634 +0900
++++ ipc/ipc_path_manager.cc	2010-09-25 11:10:01.975326409 +0900
 @@ -265,7 +265,7 @@
    *ipc_name = kIPCPrefix;
  #endif  // OS_WINDOWS
diff --git a/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc b/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc
index b547617972be..3fddccdc9d3c 100644
--- a/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc
+++ b/japanese/mozc-tool/files/patch-ipc_unix_ipc.cc
@@ -1,5 +1,5 @@
---- ipc/unix_ipc.cc.org	2010-09-18 12:52:17.569066513 +0900
-+++ ipc/unix_ipc.cc	2010-09-18 12:56:22.118871027 +0900
+--- ipc/unix_ipc.cc.org	2010-09-25 11:11:08.117335240 +0900
++++ ipc/unix_ipc.cc	2010-09-25 11:14:56.074335641 +0900
 @@ -41,7 +41,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
@@ -27,7 +27,7 @@
    // On ARM Linux, we do nothing and just return true since the platform (at
    // least the qemu emulator) doesn't support the getsockopt(sock, SOL_SOCKET,
    // SO_PEERCRED) system call.
-@@ -306,7 +306,7 @@
+@@ -311,7 +311,7 @@
      address.sun_family = AF_UNIX;
      ::memcpy(address.sun_path, server_address.data(), server_address_length);
      address.sun_path[server_address_length] = '\0';
@@ -36,7 +36,7 @@
      address.sun_len = SUN_LEN(&address);
      const size_t sun_len = sizeof(address);
  #else
-@@ -412,21 +412,21 @@
+@@ -431,21 +431,21 @@
                 SO_REUSEADDR,
                 reinterpret_cast<char *>(&on),
                 sizeof(on));
diff --git a/japanese/mozc-tool/files/patch-server_mozc_server.cc b/japanese/mozc-tool/files/patch-server_mozc_server.cc
index bd58a84c4a7d..af77f5dc27b0 100644
--- a/japanese/mozc-tool/files/patch-server_mozc_server.cc
+++ b/japanese/mozc-tool/files/patch-server_mozc_server.cc
@@ -1,5 +1,5 @@
---- server/mozc_server.cc.org	2010-09-18 12:57:52.229553251 +0900
-+++ server/mozc_server.cc	2010-09-18 13:00:29.172975389 +0900
+--- server/mozc_server.cc.org	2010-09-25 12:45:06.069338637 +0900
++++ server/mozc_server.cc	2010-09-25 12:46:24.810331975 +0900
 @@ -30,6 +30,9 @@
  #ifdef OS_WINDOWS
  #include <windows.h>
diff --git a/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py
index 0acab8a486de..af6c217e6826 100644
--- a/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py
+++ b/japanese/mozc-tool/files/patch-unix_ibus_gen_mozc_xml.py
@@ -1,5 +1,5 @@
---- unix/ibus/gen_mozc_xml.py.org	2010-09-18 13:01:05.001373133 +0900
-+++ unix/ibus/gen_mozc_xml.py	2010-09-18 14:29:43.314467115 +0900
+--- unix/ibus/gen_mozc_xml.py.org	2010-09-25 11:17:57.221333653 +0900
++++ unix/ibus/gen_mozc_xml.py	2010-09-25 11:22:33.363336338 +0900
 @@ -39,6 +39,7 @@
  
  import optparse
@@ -8,10 +8,10 @@
  
  # Information to generate <component> part of mozc.xml. %s will be replaced with
  # a product name, 'Mozc' or 'Google Japanese Input'.
-@@ -63,6 +64,23 @@
-     'icon': '/usr/share/ibus-mozc/product_icon.png',
+@@ -64,6 +65,24 @@
      'rank': '0',
  }
+ 
 +if os.uname()[0] == 'FreeBSD':
 +  IBUS_COMPONENT_PROPS = {
 +    'name': 'com.google.IBus.Mozc',
@@ -29,6 +29,7 @@
 +    'icon': '@@LOCALBASE@@/share/ibus-mozc/icons/product_logo.png',
 +    'rank': '0',
 +  }
- 
++
  # A dictionary from --platform to engines that are used in the platform. The
  # information is used to generate <engines> part of mozc.xml.
+ IBUS_ENGINES_PROPS = {
diff --git a/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml b/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml
index d830d6933935..777fa44859b3 100644
--- a/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml
+++ b/japanese/mozc-tool/files/patch-unix_ibus_mozc.xml
@@ -1,5 +1,5 @@
---- unix/ibus/mozc.xml.org	2010-09-03 11:42:47.253977329 +0900
-+++ unix/ibus/mozc.xml	2010-09-03 20:56:17.057164534 +0900
+--- unix/ibus/mozc.xml.org	2010-09-25 11:23:23.585335502 +0900
++++ unix/ibus/mozc.xml	2010-09-25 11:23:48.280337800 +0900
 @@ -0,0 +1,21 @@
 +<component>
 +  <name>com.google.IBus.Mozc</name>
diff --git a/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc b/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc
index 7cf1593994b2..057ebce9b680 100644
--- a/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc
+++ b/japanese/mozc-tool/files/patch-unix_ibus_path_util.cc
@@ -1,5 +1,5 @@
---- unix/ibus/path_util.cc.org	2010-09-18 13:05:52.470217916 +0900
-+++ unix/ibus/path_util.cc	2010-09-18 13:07:06.436608058 +0900
+--- unix/ibus/path_util.cc.org	2010-09-25 11:25:36.706333562 +0900
++++ unix/ibus/path_util.cc	2010-09-25 11:26:16.410339239 +0900
 @@ -30,14 +30,22 @@
  #include "unix/ibus/path_util.h"
  
diff --git a/japanese/mozc-tool/files/patch-unix_scim_scim.gyp b/japanese/mozc-tool/files/patch-unix_scim_scim.gyp
index d3189a6f0a31..bc138153697a 100644
--- a/japanese/mozc-tool/files/patch-unix_scim_scim.gyp
+++ b/japanese/mozc-tool/files/patch-unix_scim_scim.gyp
@@ -1,5 +1,5 @@
---- unix/scim/scim.gyp.org	2010-09-18 13:07:44.032136540 +0900
-+++ unix/scim/scim.gyp	2010-09-18 13:08:24.780919695 +0900
+--- unix/scim/scim.gyp.org	2010-09-25 11:26:23.393336519 +0900
++++ unix/scim/scim.gyp	2010-09-25 11:26:45.064334370 +0900
 @@ -44,7 +44,7 @@
        '../../session/session.gyp:session',
      ],