Update to 1.13.1651.102

* This version requires -std=c++11, then set GCC_REQD=4.7

Changelog:
r185 2014-01-06 1.13.1651.102

    FIX: Refactor placeholder management ( Issue 147 )
    FIX: Specify _NET_WM_WINDOW_TYPE to mozc_renderer ( Issue 195 )
    FIX: header-line-format breaks candidate window on Emacs 24 ( Issue 196 )
    Support Android NDK r9b.

12 files changed, 138 insertions, 165 deletions

diff --git a/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc b/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc
index 8d36aead7b3..b21bd59b436 100644
--- a/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc
+++ b/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc
@@ -1,19 +1,19 @@
-$NetBSD: patch-base_crash__report__handler.cc,v 1.2 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-base_crash__report__handler.cc,v 1.3 2014/01/19 01:18:50 ryoon Exp $
 
---- base/crash_report_handler.cc.orig	2013-08-28 05:26:13.000000000 +0000
+--- base/crash_report_handler.cc.orig	2014-01-06 07:10:31.000000000 +0000
 +++ base/crash_report_handler.cc
-@@ -321,7 +321,7 @@ void CrashReportHandler::SetCriticalSect
- }
+@@ -346,7 +346,7 @@ void CrashReportHandler::SetCriticalSect
+ 
  }  // namespace mozc
  
--#elif defined(OS_LINUX)  // OS_WIN
+-#else
 +#elif defined(OS_LINUX) || defined(OS_NETBSD)  // OS_WIN
  
  namespace mozc {
  
-@@ -341,4 +341,4 @@ bool CrashReportHandler::Uninitialize() 
+@@ -372,4 +372,4 @@ void CrashReportHandler::SetCriticalSect
  
  }  // namespace mozc
  
--#endif  // OS_WIN OS_LINUX
+-#endif
 +#endif  // OS_WIN OS_LINUX OS_NETBSD
diff --git a/inputmethod/mozc-server/patches/patch-base_password__manager.cc b/inputmethod/mozc-server/patches/patch-base_password__manager.cc
index 66575cd082d..d5704d1b6a2 100644
--- a/inputmethod/mozc-server/patches/patch-base_password__manager.cc
+++ b/inputmethod/mozc-server/patches/patch-base_password__manager.cc
@@ -1,11 +1,11 @@
-$NetBSD: patch-base_password__manager.cc,v 1.1 2013/04/29 09:52:17 ryoon Exp $
+$NetBSD: patch-base_password__manager.cc,v 1.2 2014/01/19 01:18:50 ryoon Exp $
 
---- base/password_manager.cc.orig	2012-08-31 05:37:06.000000000 +0000
+--- base/password_manager.cc.orig	2014-01-06 07:10:31.000000000 +0000
 +++ base/password_manager.cc
-@@ -366,7 +366,7 @@ class DeprecatedMacPasswordManager : pub
- // this module to other Linux distro, you might want to implement
- // a new password manager which adopts some secure mechanism such
- // like gnome-keyring.
+@@ -264,7 +264,7 @@ bool WinMacPasswordManager::RemovePasswo
+ // We use plain text file for password storage on Linux. If you port this module
+ // to other Linux distro, you might want to implement a new password manager
+ // which adopts some secure mechanism such like gnome-keyring.
 -#if defined OS_LINUX
 +#if defined(OS_LINUX) || defined(OS_NETBSD)
  typedef PlainPasswordManager DefaultPasswordManager;
diff --git a/inputmethod/mozc-server/patches/patch-build__mozc.py b/inputmethod/mozc-server/patches/patch-build__mozc.py
index 21ccb3b5f2a..ce10f9507f3 100644
--- a/inputmethod/mozc-server/patches/patch-build__mozc.py
+++ b/inputmethod/mozc-server/patches/patch-build__mozc.py
@@ -1,6 +1,6 @@
-$NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
 
---- build_mozc.py.orig	2013-08-28 05:25:59.000000000 +0000
+--- build_mozc.py.orig	2014-01-06 07:10:26.000000000 +0000
 +++ build_mozc.py
 @@ -60,6 +60,7 @@ from build_tools.util import FindFileFro
  from build_tools.util import GetNumberOfProcessors
@@ -10,16 +10,16 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
  from build_tools.util import IsMac
  from build_tools.util import IsWindows
  from build_tools.util import PrintErrorAndExit
-@@ -116,6 +117,8 @@ def GetBuildBaseName(options, target_pla
+@@ -120,6 +121,8 @@ def GetBuildBaseName(options, target_pla
      build_base = 'out_mac'
-   elif target_platform == 'Linux' or target_platform == 'ChromeOS':
+   elif target_platform == 'Linux':
      build_base = 'out_linux'
 +  elif target_platform == 'NetBSD':
 +    build_base = 'out_bsd'
    elif target_platform == 'Android':
      build_base = 'out_android'
    elif target_platform == 'NaCl':
-@@ -224,6 +227,12 @@ def GetGypFileNames(options):
+@@ -214,6 +217,14 @@ def GetGypFileNames(options):
      if not PkgExists('ibus-1.0 >= 1.4.1'):
        logging.info('removing ibus.gyp.')
        gyp_file_names.remove('%s/unix/ibus/ibus.gyp' % SRC_DIR)
@@ -29,18 +29,12 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
 +    if not PkgExists('ibus-1.0 >= 1.4.1'):
 +      logging.info('removing ibus.gyp.')
 +      gyp_file_names.remove('%s/unix/ibus/ibus.gyp' % SRC_DIR)
-   elif options.target_platform == 'ChromeOS':
-     gyp_file_names.extend(glob.glob('%s/unix/ibus/*.gyp' % SRC_DIR))
++  elif options.target_platform == 'ChromeOS':
++    gyp_file_names.extend(glob.glob('%s/unix/ibus/*.gyp' % SRC_DIR))
    elif options.target_platform == 'NaCl':
-@@ -260,6 +269,7 @@ def AddCommonOptions(parser):
-                     help='Specifies the base directory of the built binaries.')
-   parser.add_option('--language', dest='language', default='japanese',
-                     help='Specify the target language to build.')
-+  parser.add_option('--os', dest='os', default='linux')
-   return parser
- 
- 
-@@ -280,6 +290,8 @@ def AddTargetPlatformOption(parser):
+     # Add chrome NaCl Mozc gyp scripts.
+     gyp_file_names.append('%s/chrome/nacl/nacl_extension.gyp' % SRC_DIR)
+@@ -309,6 +320,8 @@ def AddTargetPlatformOption(parser):
    # If you want Android build, specify "Android".
    if IsLinux():
      default_target = 'Linux'
@@ -49,7 +43,7 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
    elif IsWindows():
      default_target = 'Windows'
    elif IsMac():
-@@ -478,6 +490,12 @@ def ExpandMetaTarget(options, meta_targe
+@@ -506,6 +519,14 @@ def ExpandMetaTarget(options, meta_targe
                 SRC_DIR + '/gui/gui.gyp:mozc_tool']
      if PkgExists('ibus-1.0 >= 1.4.1'):
        targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
@@ -59,10 +53,12 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
 +               SRC_DIR + '/gui/gui.gyp:mozc_tool']
 +    if PkgExists('ibus-1.0 >= 1.4.1'):
 +      targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
-   elif target_platform == 'ChromeOS':
-     targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
++  elif target_platform == 'ChromeOS':
++    targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
    elif target_platform == 'Mac':
-@@ -505,7 +523,7 @@ def ParseBuildOptions(args=None, values=
+     targets = [SRC_DIR + '/mac/mac.gyp:DiskImage']
+   elif target_platform == 'Windows':
+@@ -531,7 +552,7 @@ def ParseBuildOptions(args=None, values=
    """Parses command line options for the build command."""
    parser = optparse.OptionParser(usage='Usage: %prog build [options]')
    AddCommonOptions(parser)
@@ -71,7 +67,7 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
      default_build_concurrency = GetNumberOfProcessors() * 2
      parser.add_option('--jobs', '-j', dest='jobs',
                        default=('%d' % default_build_concurrency),
-@@ -525,7 +543,7 @@ def ParseRunTestsOptions(args=None, valu
+@@ -551,7 +572,7 @@ def ParseRunTestsOptions(args=None, valu
    parser = optparse.OptionParser(
        usage='Usage: %prog runtests [options] [test_targets] [-- build options]')
    AddCommonOptions(parser)
@@ -80,25 +76,17 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
      default_build_concurrency = GetNumberOfProcessors() * 2
      parser.add_option('--jobs', '-j', dest='jobs',
                        default=('%d' % default_build_concurrency),
-@@ -693,6 +711,8 @@ def GypMain(options, unused_args):
-     command_line.extend(['-D', 'wix_dir=%s' % options.wix_dir])
-   else:
-     command_line.extend(['-D', 'use_wix=NO'])
-+  if options.os:
-+    command_line.extend(['-D', 'OS=%s' % options.os])
- 
-   android_sdk_home = options.android_sdk_home
-   if version.GetTargetPlatform() == 'Android':
-@@ -755,7 +775,7 @@ def GypMain(options, unused_args):
+@@ -777,7 +798,8 @@ def GypMain(options, unused_args, _):
+     gyp_options.extend(['-D', 'channel_dev=1'])
  
    def SetCommandLineForFeature(option_name, windows=False, mac=False,
-                                linux=False, chromeos=False, android=False,
--                               nacl=False):
-+                               nacl=False, netbsd=False):
+-                               linux=False, android=False, nacl=False):
++                               linux=False, android=False, nacl=False,
++                               netbsd=False):
      """Updates an option like '--enable_foober' and add a -D argument for gyp.
  
      This function ensures an option like '--enable_foober' exists and it has a
-@@ -779,6 +799,8 @@ def GypMain(options, unused_args):
+@@ -799,6 +821,8 @@ def GypMain(options, unused_args, _):
            option on Android platform.
        nacl: A boolean which replesents the default value of the target
            option on NaCl.
@@ -107,51 +95,47 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
  
      Raises:
        ValueError: An error occurred when 'option_name' is empty.
-@@ -792,6 +814,7 @@ def GypMain(options, unused_args):
+@@ -811,6 +835,7 @@ def GypMain(options, unused_args, _):
+                        'Mac': mac,
                         'Linux': linux,
-                        'ChromeOS': chromeos,
                         'Android': android,
 +		       'NetBSD' : netbsd,
                         'NaCl': nacl}[options.target_platform]
      enable_option_name = 'enable_%s' % option_name
      enabled = options.ensure_value(enable_option_name, default_enabled)
-@@ -808,15 +831,18 @@ def GypMain(options, unused_args):
-   SetCommandLineForFeature(option_name='webservice_infolist')
-   SetCommandLineForFeature(option_name='cloud_sync',
-                            linux=is_official_dev,
-+			   netbsd=is_official_dev,
-                            windows=is_official_dev,
-                            mac=is_official_dev,
-                            nacl=is_official_dev)
+@@ -822,10 +847,12 @@ def GypMain(options, unused_args, _):
+ 
    SetCommandLineForFeature(option_name='cloud_handwriting',
                             linux=is_official_dev,
 +			   netbsd=is_official_dev,
                             windows=is_official_dev,
                             mac=is_official_dev)
    SetCommandLineForFeature(option_name='http_client',
-                            linux=False,
-+			   netbsd=is_official_dev,
+                            linux=is_official,
++			   netbsd=is_official,
                             windows=is_official,
                             mac=is_official,
-                            chromeos=False,  # not supported.
-@@ -856,6 +882,7 @@ def GypMain(options, unused_args):
-     command_line.extend(['-D', 'use_zinnia=NO'])
+                            android=is_official,
+@@ -863,7 +890,8 @@ def GypMain(options, unused_args, _):
+   else:
+     gyp_options.extend(['-D', 'use_zinnia=NO'])
  
-   if ((options.target_platform == 'Linux' or
-+       options.target_platform == 'NetBSD' or
-        options.target_platform == 'ChromeOS') and
+-  if (options.target_platform == 'Linux' and
++  if ((options.target_platform == 'Linux' or
++       options.target_platform == 'NetBSD') and
        '%s/unix/ibus/ibus.gyp' % SRC_DIR in gyp_file_names):
-     command_line.extend(['-D', 'use_libibus=1'])
-@@ -901,7 +928,7 @@ def GypMain(options, unused_args):
+     gyp_options.extend(['-D', 'use_libibus=1'])
+ 
+@@ -896,7 +924,7 @@ def GypMain(options, unused_args, _):
    # command for pkg-config.  Here we catch the environment variable
    # and use the specified command instead of actual pkg-config
    # command.
 -  if IsLinux():
 +  if IsLinux() or IsNetBSD():
-     command_line.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()])
+     gyp_options.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()])
    else:
-     command_line.extend(['-D', 'pkg_config_command='])
-@@ -1066,6 +1093,41 @@ def BuildOnMac(options, targets, origina
+     gyp_options.extend(['-D', 'pkg_config_command='])
+@@ -1049,6 +1077,41 @@ def BuildOnMac(options, targets, origina
                '-parallelizeTargets',
                'BUILD_WITH_GYP=1'])
  
@@ -193,7 +177,7 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
  
  def BuildOnWindows(targets):
    """Build the target on Windows."""
-@@ -1096,6 +1158,8 @@ def BuildMain(options, targets, original
+@@ -1076,6 +1139,8 @@ def BuildMain(options, targets, original
      BuildOnMac(options, targets, original_directory_name)
    elif IsLinux():
      BuildOnLinux(options, targets, original_directory_name)
@@ -202,7 +186,7 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
    elif IsWindows():
      BuildOnWindows(targets)
    else:
-@@ -1367,7 +1431,7 @@ def CleanBuildFilesAndDirectories(option
+@@ -1341,7 +1406,7 @@ def CleanBuildFilesAndDirectories(option
      elif IsMac():
        directory_names.extend(glob.glob(os.path.join(gyp_directory_name,
                                                      '*.xcodeproj')))
@@ -211,13 +195,3 @@ $NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
        file_names.extend(glob.glob(os.path.join(gyp_directory_name,
                                                 '*.target.mk')))
        file_names.extend(glob.glob(os.path.join(gyp_directory_name,
-@@ -1415,6 +1479,9 @@ def CleanBuildFilesAndDirectories(option
- 
-   elif IsWindows():
-     file_names.append('third_party/breakpad/breakpad.gyp')
-+  elif IsNetBSD():
-+    file_names.append('Makefile')
-+    directory_names.append('out_bsd')
-   # Remove files.
-   for file_name in file_names:
-     RemoveFile(file_name)
diff --git a/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py b/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py
index a732dc26abf..2b3ec750559 100644
--- a/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py
+++ b/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py
@@ -1,9 +1,9 @@
-$NetBSD: patch-build__tools_mozc__version.py,v 1.1 2013/04/29 09:52:17 ryoon Exp $
+$NetBSD: patch-build__tools_mozc__version.py,v 1.2 2014/01/19 01:18:50 ryoon Exp $
 
---- build_tools/mozc_version.py.orig	2012-08-31 05:37:06.000000000 +0000
+--- build_tools/mozc_version.py.orig	2014-01-06 07:10:26.000000000 +0000
 +++ build_tools/mozc_version.py
-@@ -65,6 +65,7 @@ TARGET_PLATFORM_TO_DIGIT = {
-     'ChromeOS': '2',
+@@ -64,6 +64,7 @@ TARGET_PLATFORM_TO_DIGIT = {
+     'Linux': '2',
      'Android': '3',
      'NaCl': '4',
 +    'NetBSD': '5',
diff --git a/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc b/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc
index 6c578a6cc32..b872e5e217f 100644
--- a/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc
+++ b/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.3 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.4 2014/01/19 01:18:50 ryoon Exp $
 
---- gui/config_dialog/config_dialog.cc.orig	2013-08-28 05:26:26.000000000 +0000
+--- gui/config_dialog/config_dialog.cc.orig	2014-01-06 07:10:44.000000000 +0000
 +++ gui/config_dialog/config_dialog.cc
-@@ -97,21 +97,21 @@ ConfigDialog::ConfigDialog()
+@@ -94,21 +94,21 @@ ConfigDialog::ConfigDialog()
    setWindowTitle(tr("Mozc Preferences"));
  #endif  // OS_MACOSX
  
@@ -27,8 +27,8 @@ $NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.3 2013/09/07 18:42:14 ry
 +#endif  // OS_LINUX || OS_NETBSD
  #endif  // NO_LOGGING
  
- #ifndef ENABLE_CLOUD_SYNC
-@@ -347,7 +347,7 @@ ConfigDialog::ConfigDialog()
+ #ifndef ENABLE_CLOUD_HANDWRITING
+@@ -323,7 +323,7 @@ ConfigDialog::ConfigDialog()
    dictionaryPreloadingAndUACLabel->setVisible(false);
  #endif  // OS_WIN
  
@@ -37,29 +37,29 @@ $NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.3 2013/09/07 18:42:14 ry
    // On Linux, disable all fields for UsageStats
    usageStatsLabel->setEnabled(false);
    usageStatsLabel->setVisible(false);
-@@ -357,7 +357,7 @@ ConfigDialog::ConfigDialog()
+@@ -333,7 +333,7 @@ ConfigDialog::ConfigDialog()
    usageStatsMessage->setVisible(false);
    usageStatsCheckBox->setEnabled(false);
    usageStatsCheckBox->setVisible(false);
 -#endif  // OS_LINUX
 +#endif  // OS_LINUX || OS_NETBSD
  
-   webUsageDictionaryCheckBox->setVisible(false);
-   editWebServiceEntryButton->setVisible(false);
-@@ -460,7 +460,7 @@ bool ConfigDialog::Update() {
+   Reload();
+ 
+@@ -409,7 +409,7 @@ bool ConfigDialog::Update() {
    }
  
  
--#if defined(OS_WIN) || defined(OS_LINUX)
+-#if defined(OS_WIN)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_NETBSD)
    if ((initial_preedit_method_ !=
         static_cast<int>(config.preedit_method())) ||
        (initial_use_keyboard_to_change_preedit_method_ !=
-@@ -472,7 +472,7 @@ bool ConfigDialog::Update() {
+@@ -421,7 +421,7 @@ bool ConfigDialog::Update() {
      initial_use_keyboard_to_change_preedit_method_ =
          config.use_keyboard_to_change_preedit_method();
    }
--#endif  // OS_WIN or OS_LINUX
+-#endif  // OS_WIN
 +#endif  // OS_WIN, OS_LINUX or OS_NETBSD
  
  #ifdef OS_WIN
diff --git a/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc b/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc
index 589fdb6fa73..b6b75368250 100644
--- a/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc
+++ b/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.3 2013/09/15 12:30:23 joerg Exp $
+$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.4 2014/01/19 01:18:50 ryoon Exp $
 
---- gui/dictionary_tool/dictionary_tool.cc.orig	2013-08-28 05:26:30.000000000 +0000
+--- gui/dictionary_tool/dictionary_tool.cc.orig	2014-01-06 07:10:48.000000000 +0000
 +++ gui/dictionary_tool/dictionary_tool.cc
-@@ -219,11 +219,11 @@ class MultiByteTextLineIterator
+@@ -194,11 +194,11 @@ class MultiByteTextLineIterator
    }
  
    bool IsAvailable() const {
@@ -16,8 +16,8 @@ $NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.3 2013/09/15 12:30:2
        return false;
      }
  
-@@ -358,7 +358,7 @@ DictionaryTool::DictionaryTool(QWidget *
-   }
+@@ -341,7 +341,7 @@ DictionaryTool::DictionaryTool(QWidget *
+ #endif  // !ENABLE_CLOUD_SYNC
  
    // main window
 -#ifndef OS_LINUX
diff --git a/inputmethod/mozc-server/patches/patch-gyp_common.gypi b/inputmethod/mozc-server/patches/patch-gyp_common.gypi
index 830f9bae4a9..3bdf6a80e34 100644
--- a/inputmethod/mozc-server/patches/patch-gyp_common.gypi
+++ b/inputmethod/mozc-server/patches/patch-gyp_common.gypi
@@ -1,8 +1,8 @@
-$NetBSD: patch-gyp_common.gypi,v 1.3 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $
 
---- gyp/common.gypi.orig	2013-08-28 05:26:13.000000000 +0000
+--- gyp/common.gypi.orig	2014-01-06 07:10:31.000000000 +0000
 +++ gyp/common.gypi
-@@ -101,6 +101,7 @@
+@@ -92,6 +92,7 @@
        '-include base/namespace.h',
        '-pipe',
        '-pthread',
@@ -10,49 +10,34 @@ $NetBSD: patch-gyp_common.gypi,v 1.3 2013/09/07 18:42:14 ryoon Exp $
      ],
      # linux_cflags will be used in Linux except for NaCl.
      'linux_cflags': [
-@@ -150,7 +151,7 @@
+@@ -137,7 +138,7 @@
+         'clang_bin_dir': '/Applications/Xcode.app/Contents/Developer/Toolchains'
+                          '/XcodeDefault.xctoolchain/usr/bin/',
        }],
-       # enable_gtk_renderer represents if mozc_renderer is supported on Linux
-       # or not.
--      ['target_platform=="Linux" and language=="japanese"', {
-+      ['(target_platform=="Linux" or target_platform=="NetBSD") and language=="japanese"', {
+-      ['target_platform=="Linux"', {
++      ['target_platform=="Linux" or target_platform=="NetBSD"', {
+         # enable_gtk_renderer represents if mozc_renderer is supported on Linux
+         # or not.
          'enable_gtk_renderer%': 1,
-       }, { # else
-         'enable_gtk_renderer%': 0,
-@@ -206,7 +207,7 @@
+@@ -195,7 +196,7 @@
  
      # server_dir represents the directory where mozc_server is
      # installed. This option is only for Linux.
 -    'server_dir%': '/usr/lib/mozc',
 +    'server_dir%': '@PREFIX@/libexec',
  
-     # use_libprotobuf represents if protobuf library is used or not.
-     # This option is only for Linux.
-@@ -300,7 +301,7 @@
+     # Represents the directory where the source code of protobuf is
+     # extracted. This value is ignored when 'use_libprotobuf' is 1.
+@@ -286,7 +287,7 @@
            ['channel_dev==1', {
              'defines': ['CHANNEL_DEV'],
            }],
--          ['not(OS=="linux" and use_libprotobuf!=0)', {
-+          ['not((OS=="linux" or OS=="netbsd") and use_libprotobuf!=0)', {
-             'include_dirs': [
-               '../protobuf/files/src',
-             ],
-@@ -309,12 +310,12 @@
-           # additional suffix except for Japanese so that multiple
-           # converter processes can coexist. Note that Mozc on ChromeOS does
-           # not use IPC so this kind of special treatment is not required.
--          ['language!="japanese" and target_platform=="Linux"', {
-+          ['language!="japanese" and (target_platform=="Linux" or target_platform=="NetBSD")', {
-             'defines': [
-               'MOZC_LANGUAGE_SUFFIX_FOR_LINUX="_<(language)"',
-             ],
-           }],
 -          ['OS=="linux"', {
 +          ['OS=="linux" or OS=="netbsd"', {
              'ldflags': [
                '<@(linux_ldflags)',
              ],
-@@ -485,7 +486,7 @@
+@@ -451,7 +452,7 @@
            },
          },
          'conditions': [
@@ -61,7 +46,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.3 2013/09/07 18:42:14 ryoon Exp $
              'cflags': [
                '<@(debug_extra_cflags)',
              ],
-@@ -523,7 +524,7 @@
+@@ -489,7 +490,7 @@
            },
          },
          'conditions': [
@@ -70,7 +55,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.3 2013/09/07 18:42:14 ryoon Exp $
              'cflags': [
                '<@(release_extra_cflags)',
              ],
-@@ -832,6 +833,22 @@
+@@ -753,6 +754,22 @@
            }],
          ],
        }],
diff --git a/inputmethod/mozc-server/patches/patch-handwriting_handwriting.gyp b/inputmethod/mozc-server/patches/patch-handwriting_handwriting.gyp
index 8ad6fd68dc9..7358c1189dc 100644
--- a/inputmethod/mozc-server/patches/patch-handwriting_handwriting.gyp
+++ b/inputmethod/mozc-server/patches/patch-handwriting_handwriting.gyp
@@ -1,9 +1,9 @@
-$NetBSD: patch-handwriting_handwriting.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $
+$NetBSD: patch-handwriting_handwriting.gyp,v 1.3 2014/01/19 01:18:50 ryoon Exp $
 
---- handwriting/handwriting.gyp.orig	2013-07-17 02:38:04.000000000 +0000
+--- handwriting/handwriting.gyp.orig	2014-01-06 07:10:31.000000000 +0000
 +++ handwriting/handwriting.gyp
 @@ -43,12 +43,12 @@
-         '../gui/zinnia.gyp:zinnia',
+         'zinnia.gyp:zinnia',
        ],
        'conditions': [
 -        ['target_platform=="Linux" and use_libzinnia==1', {
diff --git a/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp b/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp
new file mode 100644
index 00000000000..35d51120048
--- /dev/null
+++ b/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp
@@ -0,0 +1,13 @@
+$NetBSD: patch-handwriting_zinnia.gyp,v 1.1 2014/01/19 01:18:50 ryoon Exp $
+
+--- handwriting/zinnia.gyp.orig	2014-01-06 07:10:31.000000000 +0000
++++ handwriting/zinnia.gyp
+@@ -48,7 +48,7 @@
+         '-Wno-type-limits',
+       ],
+       'conditions': [
+-        ['OS=="linux"', {
++        ['OS=="linux" or OS=="netbsd"', {
+           'conditions': [
+             ['use_libzinnia==1', {
+               'link_settings': {
diff --git a/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc b/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc
index d422b9102bc..4fce834f668 100644
--- a/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc
+++ b/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_ipc__path__manager.cc,v 1.3 2013/09/15 12:30:23 joerg Exp $
+$NetBSD: patch-ipc_ipc__path__manager.cc,v 1.4 2014/01/19 01:18:50 ryoon Exp $
 
---- ipc/ipc_path_manager.cc.orig	2013-08-28 05:25:59.000000000 +0000
+--- ipc/ipc_path_manager.cc.orig	2014-01-06 07:10:26.000000000 +0000
 +++ ipc/ipc_path_manager.cc
 @@ -44,6 +44,11 @@
  #endif  // OS_MACOSX
@@ -13,8 +13,8 @@ $NetBSD: patch-ipc_ipc__path__manager.cc,v 1.3 2013/09/15 12:30:23 joerg Exp $
 +
  #include <cstdlib>
  #include <map>
- 
-@@ -410,6 +415,23 @@ bool IPCPathManager::IsValidServer(uint3
+ #ifdef OS_WIN
+@@ -407,6 +412,23 @@ bool IPCPathManager::IsValidServer(uint3
      return true;
    }
  
diff --git a/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp b/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
index df67798b293..9470ea409cd 100644
--- a/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
+++ b/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
@@ -1,8 +1,8 @@
-$NetBSD: patch-protobuf_protobuf.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $
+$NetBSD: patch-protobuf_protobuf.gyp,v 1.3 2014/01/19 01:18:50 ryoon Exp $
 
---- protobuf/protobuf.gyp.orig	2013-07-17 02:38:05.000000000 +0000
+--- protobuf/protobuf.gyp.orig	2014-01-06 07:10:31.000000000 +0000
 +++ protobuf/protobuf.gyp
-@@ -140,7 +140,7 @@
+@@ -161,7 +161,7 @@
            ],
            'conditions': [
              # for gcc and clang
@@ -11,8 +11,8 @@ $NetBSD: patch-protobuf_protobuf.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $
                'cflags': [
                  '-Wno-conversion-null',  # coded_stream.cc uses NULL to bool.
                  '-Wno-unused-function',
-@@ -176,7 +176,7 @@
-         '.',
+@@ -201,7 +201,7 @@
+         '<(protobuf_root)/src',
        ],
        'conditions': [
 -        ['OS=="linux"', {
@@ -20,7 +20,7 @@ $NetBSD: patch-protobuf_protobuf.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $
            'conditions': [
              ['use_libprotobuf!=1', {
                'cflags': [
-@@ -212,7 +212,7 @@
+@@ -237,7 +237,7 @@
        },
        'conditions': [
          # use system-installed protoc on Linux
diff --git a/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py b/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py
index 8bb5507e044..4f64fb1582b 100644
--- a/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py
+++ b/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
 
 * Fix for pkgsrc installation.
 
---- unix/ibus/gen_mozc_xml.py.orig	2013-08-28 05:25:59.000000000 +0000
+--- unix/ibus/gen_mozc_xml.py.orig	2014-01-06 07:10:26.000000000 +0000
 +++ unix/ibus/gen_mozc_xml.py
 @@ -47,7 +47,7 @@ import sys
  IBUS_COMPONENT_PROPS = {
@@ -42,20 +42,21 @@ $NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
 +        'longname': ['%(product_name)s'],
 +        'layout': ['default'],
 +    },
-     # On Chrome/Chromium OS, we provide three engines.
-     'ChromeOS': {
-         # DO NOT change the engine name 'mozc-jp'. The names is referenced by
-@@ -225,13 +241,21 @@ def main():
-   platform = options.platform
-   common_props = IBUS_ENGINE_COMMON_PROPS
-   if platform == 'Linux':
--    setup_arg.append(os.path.join(options.server_dir, 'mozc_tool'))
-+    setup_arg.append(os.path.join("@PREFIX@/libexec", 'mozc_tool'))
-     setup_arg.append('--mode=config_dialog')
-     if IsIBus15OrGreater(options):
-       # A tentative workaround against IBus 1.5
-       platform = 'Linux-IBus1.5'
-       common_props = IBUS_1_5_ENGINE_COMMON_PROPS
+ }
+ 
+ # A dictionary from --branding to a product name which is embedded into the
+@@ -209,7 +225,7 @@ def main():
+   (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("@PREFIX@/libexec", 'mozc_tool'))
+   setup_arg.append('--mode=config_dialog')
+   if IsIBus15OrGreater(options):
+     # A tentative workaround against IBus 1.5
+@@ -219,6 +235,14 @@ def main():
+     platform = 'Linux'
+     common_props = IBUS_ENGINE_COMMON_PROPS
  
 +  if platform == 'NetBSD':
 +    setup_arg.append(os.path.join("@PREFIX@/libexec", 'mozc_tool'))