update to 1.5.1053.102

18 files changed, 39 insertions, 67 deletions

diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 0cdaa4b55c8b..3b02aa1276b2 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozc
-PORTVERSION=	1.4.1033.102
+PORTVERSION=	1.5.1053.102
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX?=	ja-
@@ -18,7 +18,8 @@ COMMENT?=	Mozc server for IBus, SCIM and others
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		gtest.0:${PORTSDIR}/devel/googletest \
 		protobuf.7:${PORTSDIR}/devel/protobuf \
-		zinnia.0:${PORTSDIR}/japanese/zinnia
+		zinnia.0:${PORTSDIR}/japanese/zinnia \
+		ssl.8:${PORTSDIR}/security/openssl
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USE_BZIP2=	yes
diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo
index 957965ea7590..29cc5cbd2d31 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mozc-1.4.1033.102.tar.bz2) = dd3bf1d849a6861c4ec9aed2e62bc659975cba26c684e7ca2b91f986d717f42f
-SIZE (mozc-1.4.1033.102.tar.bz2) = 55807309
+SHA256 (mozc-1.5.1053.102.tar.bz2) = c0b8e2f8db312fb530387c0ac9c67dae8bc723bf02765e54816353b1e8dc11e3
+SIZE (mozc-1.5.1053.102.tar.bz2) = 52230135
diff --git a/japanese/mozc-server/files/patch-base_iconv.cc b/japanese/mozc-server/files/patch-base_iconv.cc
index d272af94178d..bab24384785c 100644
--- a/japanese/mozc-server/files/patch-base_iconv.cc
+++ b/japanese/mozc-server/files/patch-base_iconv.cc
@@ -1,4 +1,4 @@
---- base/iconv.cc.orig	2012-04-02 08:17:52.697727632 +0900
+--- base/iconv.cc.orig	2012-05-01 12:21:08.064690752 +0900
 +++ base/iconv.cc	2012-03-16 10:59:56.300711667 +0900
 @@ -52,7 +52,11 @@
    size_t olen_org = olen;
diff --git a/japanese/mozc-server/files/patch-base_mutex.h b/japanese/mozc-server/files/patch-base_mutex.h
index b4ad2d8316f3..b50512454a35 100644
--- a/japanese/mozc-server/files/patch-base_mutex.h
+++ b/japanese/mozc-server/files/patch-base_mutex.h
@@ -1,6 +1,6 @@
---- base/mutex.h.orig	2012-04-02 08:17:52.701727232 +0900
-+++ base/mutex.h	2012-01-29 13:49:20.902806916 +0900
-@@ -82,11 +82,11 @@
+--- base/mutex.h.orig	2012-05-01 12:21:08.064690752 +0900
++++ base/mutex.h	2012-05-01 12:46:18.966692632 +0900
+@@ -93,11 +93,11 @@
      // PTHREAD_MUTEX_RECURSIVE_NP and PTHREAD_MUTEX_RECURSIVE seem to be
      // variants.  For example, Mac OS X 10.4 had
      // PTHREAD_MUTEX_RECURSIVE_NP but Mac OS X 10.5 does not
diff --git a/japanese/mozc-server/files/patch-base_process.cc b/japanese/mozc-server/files/patch-base_process.cc
index ac3969dde839..b32537f0c8e5 100644
--- a/japanese/mozc-server/files/patch-base_process.cc
+++ b/japanese/mozc-server/files/patch-base_process.cc
@@ -1,4 +1,4 @@
---- base/process.cc.orig	2012-04-02 08:17:52.696726946 +0900
+--- base/process.cc.orig	2012-05-01 12:21:08.063691925 +0900
 +++ base/process.cc	2012-01-29 13:49:21.340806019 +0900
 @@ -120,13 +120,18 @@
    return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW);
diff --git a/japanese/mozc-server/files/patch-build_tools_mozc_version.py b/japanese/mozc-server/files/patch-build_tools_mozc_version.py
deleted file mode 100644
index 25bb3addeb8f..000000000000
--- a/japanese/mozc-server/files/patch-build_tools_mozc_version.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- build_tools/mozc_version.py.orig	2012-04-02 08:17:52.764727837 +0900
-+++ build_tools/mozc_version.py	2012-04-02 08:24:23.896726946 +0900
-@@ -56,7 +56,7 @@
- 
- def IsLinux():
-   """Returns true if the platform is Linux."""
--  return os.name == 'posix' and os.uname()[0] == 'Linux'
-+  return os.name == 'posix' and ( os.uname()[0] == 'Linux' or os.uname()[0] == 'FreeBSD' )
- 
- 
- def CalculateRevisionForPlatform(revision, target_platform):
diff --git a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc b/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc
index 8600a618bf24..010ef7138b21 100644
--- a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc
+++ b/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc
@@ -1,4 +1,4 @@
---- gui/about_dialog/about_dialog.cc.orig	2012-04-02 08:17:52.786726932 +0900
+--- gui/about_dialog/about_dialog.cc.orig	2012-05-01 12:21:08.168690849 +0900
 +++ gui/about_dialog/about_dialog.cc	2012-01-29 13:49:18.542805785 +0900
 @@ -119,7 +119,11 @@
    SetLabelText(label_terms);
diff --git a/japanese/mozc-server/files/patch-gyp_common.gypi b/japanese/mozc-server/files/patch-gyp_common.gypi
index 092dd9009323..0dea1f6c90b7 100644
--- a/japanese/mozc-server/files/patch-gyp_common.gypi
+++ b/japanese/mozc-server/files/patch-gyp_common.gypi
@@ -1,6 +1,6 @@
---- gyp/common.gypi.orig	2012-04-02 08:17:52.785727643 +0900
-+++ gyp/common.gypi	2012-04-02 08:32:43.630727845 +0900
-@@ -53,7 +53,7 @@
+--- gyp/common.gypi.orig	2012-05-01 12:21:08.159691563 +0900
++++ gyp/common.gypi	2012-05-01 12:46:18.406692000 +0900
+@@ -50,7 +50,7 @@
      # warning_cflags will be shared with Mac and Linux.
      'warning_cflags': [
        '-Wall',
@@ -9,7 +9,7 @@
        '-Wno-char-subscripts',
        '-Wno-sign-compare',
        '-Wno-deprecated-declarations',
-@@ -717,6 +717,12 @@
+@@ -720,6 +720,12 @@
            # <unordered_map> and <unordered_set>.
            '-Wno-deprecated',
          ],
@@ -20,5 +20,5 @@
 +          '-L@@LOCALBASE@@/lib'
 +        ],
          'conditions': [
-           ['target_platform!="Android"', {
-             'link_settings': {
+           ['chromeos==1', {
+             'defines': [
diff --git a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
index 6043e8bcc9bd..ac982fa9c448 100644
--- a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
+++ b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
@@ -1,4 +1,4 @@
---- handwriting/zinnia_handwriting.cc.orig	2012-04-02 08:17:52.785727643 +0900
+--- handwriting/zinnia_handwriting.cc.orig	2012-05-01 12:21:08.157692007 +0900
 +++ handwriting/zinnia_handwriting.cc	2012-04-02 08:38:43.657727715 +0900
 @@ -49,10 +49,16 @@
    const char kModelFile[] = "handwriting-light-ja.model";
diff --git a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc b/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc
index ec466af9b43c..b552a6cf0959 100644
--- a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc
+++ b/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_path_manager.cc.orig	2012-04-02 08:17:58.917725634 +0900
-+++ ipc/ipc_path_manager.cc	2012-04-02 08:38:43.523726676 +0900
-@@ -272,7 +272,7 @@
+--- ipc/ipc_path_manager.cc.orig	2012-05-01 12:21:13.686691614 +0900
++++ ipc/ipc_path_manager.cc	2012-05-01 12:46:21.263693646 +0900
+@@ -284,7 +284,7 @@
    *ipc_name = kIPCPrefix;
  #endif  // OS_WINDOWS
  
diff --git a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc
index 542c9a86d599..93b55d9e1fe2 100644
--- a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc
+++ b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc
@@ -1,5 +1,5 @@
---- ipc/unix_ipc.cc.orig	2012-04-02 08:17:58.917725634 +0900
-+++ ipc/unix_ipc.cc	2012-01-29 13:49:21.405805900 +0900
+--- ipc/unix_ipc.cc.orig	2012-05-01 12:21:13.686691614 +0900
++++ ipc/unix_ipc.cc	2012-05-01 12:46:21.249691952 +0900
 @@ -41,7 +41,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
@@ -36,7 +36,7 @@
      address.sun_len = SUN_LEN(&address);
      const size_t sun_len = sizeof(address);
  #else
-@@ -429,21 +429,21 @@
+@@ -434,21 +434,21 @@
                 SO_REUSEADDR,
                 reinterpret_cast<char *>(&on),
                 sizeof(on));
diff --git a/japanese/mozc-server/files/patch-server_mozc_server.cc b/japanese/mozc-server/files/patch-server_mozc_server.cc
index fdc18312268f..ed5952b7f449 100644
--- a/japanese/mozc-server/files/patch-server_mozc_server.cc
+++ b/japanese/mozc-server/files/patch-server_mozc_server.cc
@@ -1,4 +1,4 @@
---- server/mozc_server.cc.orig	2012-04-02 08:17:52.743727333 +0900
+--- server/mozc_server.cc.orig	2012-05-01 12:21:08.112691771 +0900
 +++ server/mozc_server.cc	2012-04-02 08:24:24.633727039 +0900
 @@ -32,6 +32,9 @@
  #ifdef OS_WINDOWS
diff --git a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py
index 0a94465d713e..02a302c29b35 100644
--- a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py
+++ b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py
@@ -1,7 +1,7 @@
---- third_party/gyp/pylib/gyp/common.py.orig	2012-04-02 08:17:52.712725348 +0900
-+++ third_party/gyp/pylib/gyp/common.py	2012-01-30 15:35:06.300889252 +0900
-@@ -351,8 +351,10 @@
-   flavors = {
+--- third_party/gyp/pylib/gyp/common.py.orig	2012-05-01 12:21:08.076690903 +0900
++++ third_party/gyp/pylib/gyp/common.py	2012-05-01 12:46:18.154691389 +0900
+@@ -353,8 +353,10 @@
+     'win32': 'win',
      'darwin': 'mac',
      'sunos5': 'solaris',
 -    'freebsd7': 'freebsd',
diff --git a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py
index 80baf92a6fee..c7c5f52570a1 100644
--- a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py
+++ b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py
@@ -1,6 +1,6 @@
---- third_party/gyp/pylib/gyp/generator/make.py.orig	2012-04-02 08:17:52.711727455 +0900
-+++ third_party/gyp/pylib/gyp/generator/make.py	2012-01-30 15:37:51.791889791 +0900
-@@ -1998,6 +1998,9 @@
+--- third_party/gyp/pylib/gyp/generator/make.py.orig	2012-05-01 12:21:08.073691445 +0900
++++ third_party/gyp/pylib/gyp/generator/make.py	2012-05-01 12:46:18.211693101 +0900
+@@ -1963,6 +1963,9 @@
      srcdir_prefix = '$(srcdir)/'
  
    flock_command= 'flock'
diff --git a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py
index c89a8829d06b..c12d90291a2c 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py
+++ b/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py
@@ -1,4 +1,4 @@
---- unix/ibus/gen_mozc_xml.py.orig	2012-04-02 08:17:52.706728426 +0900
+--- unix/ibus/gen_mozc_xml.py.orig	2012-05-01 12:21:08.068691602 +0900
 +++ unix/ibus/gen_mozc_xml.py	2012-01-29 13:49:15.972806246 +0900
 @@ -39,6 +39,7 @@
  
diff --git a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
index 041472c181e2..6265b2a48454 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
+++ b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
@@ -1,24 +1,6 @@
---- unix/ibus/mozc_engine.cc.orig	2012-04-02 08:17:52.706728426 +0900
-+++ unix/ibus/mozc_engine.cc	2012-04-02 08:24:23.981727483 +0900
-@@ -226,14 +226,14 @@
- 
-   COMPILE_ASSERT(sizeof(int64) > sizeof(guint), int64_guint_check);
-   const int64 kInt32AbsMax =
--      abs(static_cast<int64>(numeric_limits<int32>::max()));
-+      ::abs(static_cast<int64>(numeric_limits<int32>::max()));
-   const int64 kInt32AbsMin =
--      abs(static_cast<int64>(numeric_limits<int32>::min()));
-+      ::abs(static_cast<int64>(numeric_limits<int32>::min()));
-   const int64 kInt32SafeAbsMax =
-       min(kInt32AbsMax, kInt32AbsMin);
- 
-   const int64 diff = static_cast<int64>(from) - static_cast<int64>(to);
--  if (abs(diff) > kInt32SafeAbsMax) {
-+  if (::abs(diff) > kInt32SafeAbsMax) {
-     return false;
-   }
- 
-@@ -1598,7 +1598,7 @@
+--- unix/ibus/mozc_engine.cc.orig	2012-05-01 12:21:08.068691602 +0900
++++ unix/ibus/mozc_engine.cc	2012-05-01 12:45:44.250693013 +0900
+@@ -893,7 +893,7 @@
        //     on size_t, not uint32.
        string selection_text;
        const uint32 selection_start = min(cursor_pos, anchor_pos);
diff --git a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc b/japanese/mozc-server/files/patch-unix_ibus_path_util.cc
index 1a513f289cbe..31e5df2bf67c 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc
+++ b/japanese/mozc-server/files/patch-unix_ibus_path_util.cc
@@ -1,4 +1,4 @@
---- unix/ibus/path_util.cc.orig	2012-04-02 08:17:52.705727810 +0900
+--- unix/ibus/path_util.cc.orig	2012-05-01 12:21:08.068691602 +0900
 +++ unix/ibus/path_util.cc	2012-01-29 13:49:15.994806248 +0900
 @@ -30,14 +30,22 @@
  #include "unix/ibus/path_util.h"
diff --git a/japanese/mozc-server/files/patch-unix_scim_scim.gyp b/japanese/mozc-server/files/patch-unix_scim_scim.gyp
index 114ea5784f69..45962bc03f49 100644
--- a/japanese/mozc-server/files/patch-unix_scim_scim.gyp
+++ b/japanese/mozc-server/files/patch-unix_scim_scim.gyp
@@ -1,5 +1,5 @@
---- unix/scim/scim.gyp.orig	2012-04-02 08:17:52.708727144 +0900
-+++ unix/scim/scim.gyp	2012-04-02 08:24:24.095725631 +0900
+--- unix/scim/scim.gyp.orig	2012-05-01 12:21:08.071692137 +0900
++++ unix/scim/scim.gyp	2012-05-01 12:45:44.903691176 +0900
 @@ -39,7 +39,7 @@
        'gtk+-2.0',
      ],