Update to 1.15.1785.102

* devel/ninja is required to build.

Changelog:
r271 2014-07-13 1.15.1834.102 - r265 2014-07-06 1.15.1828.102

You can check out Mozc r271 as follows.

gclient sync --revision=271

Summary of changes between 1.15.1834.102 (r271) and 1.15.1828.102 (r265).

    Build related changes:
        Ninja and GYP r1948 are now required to build Mozc for Android, NaCl, or Linux desktop. Note that you don't need to install Ninja manually, since depot_tools maintains pre-built Ninja binaries.
        A sample Dockerfile is now available at mozc/docker/ubuntu12.04/Dockerfile. It provides a reference build environment of Mozc for Android, NaCl, and Linux desktop. See BuildInDocker for details.
    Fixed issues:
        FIX: Use ninja on Linux ( Issue 222 )
        FIX: Inconsistency between visible candidate and actual commit in suggestion ( Issue 239 )
        FIX: Provide a Dockerfile to set up build environment for Android, NaCl, and Linux desktop ( Issue 240 )
    Commit summary:
        r271: Add an all-in-one Dockerfile to build Mozc for Android, NaCl, and Linux desktop (Ubuntu 12.04 edition)
        r270: Minor clean up in gyp file
        r269: Zero query suggestion shouldn't be triggered when committing with key event
        r268: Use Ninja to build Android, NaCl, and Linux Desktop binaries part 3
        r267: Use Ninja to build Android, NaCl, and Linux Desktop binaries part 2
        r266: Use Ninja to build Android, NaCl, and Linux Desktop binaries
        r265: Pull GYP r1948

r253 2014-07-06 1.15.1827.102 - r241 2014-06-28 1.15.1815.102

You can check out Mozc r253 as follows.

gclient sync --revision=253

Summary of changes between 1.15.1827.102 (r253) and 1.15.1815.102 (r241).

    Fixed issues:
        FIX: Menu item for MozcTool lacks text label in ibus-mozc ( Issue 233 )
        FIX: Explorer crashes when tsf-mozc is enabled on Windows 8.1 update1 ( Issue 236 )
    Commit summary:
        r253: Specify the absolute path of the project root directory for include directories
        r252: Disable ITfFnGetLinguisticAlternates until the root cause of Explorer crashes is addressed
        r251: Specify text label for the menu item of MozcTool in ibus-mozc
        r250: Do not pass incomplete types to STL containers
        r249: Explicitly include <unistd.h> for OSX
        r248: Stop using template to implement BasicCodeGenByteArrayStreamBuf
        r247: Explicity invoke bash for make-standalone-toolchain.sh
        r246: Make config_file_stream_test.cc more robust
        r245: Replace NULL with nullptr in mozc::NumberUtil
        r244: Enable Unicode 6 Emoji conversion by default for desktop (part 4)
        r243: Unify nested preprocessor conditions into one line (part 3)
        r242: Minor style fixes
        r241: Unify nested preprocessor conditions into one line (part 2)

r234 2014-06-22 1.15.1814.102 - r206 2014-05-24 1.15.1786.102

You can check out Mozc r234 as follows.

gclient sync --revision=234

Summary of changes between 1.15.1814.102 (r234) and 1.15.1786.102 (r206).

    Build related changes:
        'build_mozc.py build_tools' is deprecated. Mozc no longer requires 2-pass build. ( Issue 223 )
    Fixed issues:
        FIX: Wrong key mapping for Numpad-End in mozc.el ( Issue 170 )
        FIX: mozc::converter::CandidateFilter drops candidates unexpectedly ( Issue 220 )
        FIX: Preceding text is not correctly extracted in ibus-mozc ( Issue 226 )
        FIX: Undo-Commit is not functional in ibus-mozc ( Issue 227 )
        FIX: NaCl-Mozc uses wrong version for downloadable dictionary
    Commit summary:
        r234: Ensure that the IPC client is configured before it is used in ibus-mozc
        r233: Teach ibus-mozc about the correct substring position when extracting surrounding text (part 2)
        r232: Teach ibus-mozc about the correct substring position when extracting surrounding text (part 1)
        r231: Enable Unicode 6 Emoji conversion by default for desktop (part 3)
        r230: Enable Unicode 6 Emoji conversion by default for desktop (part 2)
        r229: Enable Unicode 6 Emoji conversion by default for desktop
        r228: Unify nested preprocessor conditions into one line
        r227: Strictly check the range of the operands for integer operations performed in NumberUtil
        r226: Simplify test cases for SafeStrToDouble/SafeStrToFloat
        r225: Remove a redundant constant definition
        r224: UtilTest::StripWhiteSpaces should work with a single letter text.
        r223: Use different internal namespace for gflags
        r222: Fix the version check logic of the downloadable dictionary for NaCl-Mozc.
        r221: Do not use shell syntax in gyp (part 2)
        r220: Do not use shell syntax in gyp (part 1)
        r219: Use absolute path to teach the linker about a file location
        r218: Add a missing build dependency
        r217: Fix wrong reading for U+1F3C4
        r216: Fix key mapping for Numpad-End in mozc.el
        r215: Remove a redundant NULL initialization of unique_ptr
        r214: Stop using 2-pass build on OS X
        r213: Minor style fixes
        r212: Manage the root directory of protobuf for Java source in gyp rather than ant
        r211: Stop using 2-pass build except for OS X
        r210: Remove execute bit from files that shouldn't have it
        r209: Remove platform-dependent mozc::Encryptor part 2
        r208: Remove platform-dependent mozc::Encryptor
        r207: Fix the bug that Top_cost + cost_offset exceeds INT_MAX when lid is first/last name
        r206: Remove an obsolete directory that is no longer used

8 files changed, 51 insertions, 133 deletions

diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile
index c72764d8a8f..82e9fd3f760 100644
--- a/inputmethod/mozc-server/Makefile
+++ b/inputmethod/mozc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/06/15 13:08:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2014/07/19 09:03:04 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
 
@@ -6,7 +6,8 @@ INSTALLATION_DIRS+=	libexec
 
 do-build:
 	cd ${WRKSRC} && env ${MAKE_ENV} \
-		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
+		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
+		${_MAKE_JOBS} \
 			server/server.gyp:mozc_server
 
 do-install:
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index af43fbef1da..18e26aa3c50 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2014/06/15 13:08:34 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.11 2014/07/19 09:03:04 ryoon Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -7,9 +7,8 @@
 # used by inputmethod/uim-mozc/Makefile
 #
 
-DISTNAME=	mozc-1.15.1785.102
+DISTNAME=	mozc-1.15.1834.102
 CATEGORIES=	inputmethod
-#MASTER_SITES=	http://mozc.googlecode.com/files/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}
 EXTRACT_SUFX=	.tar.xz
 
@@ -22,6 +21,7 @@ DISTINFO_FILE=	${.CURDIR}/../../inputmethod/mozc-server/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/mozc-server/patches
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
+BUILD_DEPENDS+=	ninja-[0-9]*:../../devel/ninja
 
 PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-gyp
 
@@ -33,6 +33,7 @@ CXXFLAGS+=	-std=c++11
 USE_TOOLS+=	gmake pkg-config
 
 FIND_PREFIX:=	GYPDIR=${PYPKGPREFIX}-gyp
+#FIND_PREFIX:=	NINJADIR=ninja
 .include "../../mk/find-prefix.mk"
 
 OPENSSL_CFLAGS=		-I${BUILDLINK_PREFIX.openssl}/include
@@ -68,16 +69,16 @@ MOZC_BUILD_MODE=	Release # or Debug
 do-configure:
 	cd ${WRKSRC} && env ${MAKE_ENV} \
 		GYP_DEFINES="use_libprotobuf=1" \
-		${PYTHONBIN} build_mozc.py gyp \
-		--gypdir=${GYPDIR}/bin && \
-		${PYTHONBIN} build_mozc.py build_tools -c ${MOZC_BUILD_MODE} \
-		${_MAKE_JOBS}
+		${PYTHONBIN} build_mozc.py \
+		gyp \
+		--gypdir=${GYPDIR}/bin
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 # gmock is not used yet...
 #.include "../../devel/gmock/buildlink3.mk"
 .include "../../inputmethod/zinnia/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 
diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
index e0230a3b1bb..258802c22b9 100644
--- a/inputmethod/mozc-server/distinfo
+++ b/inputmethod/mozc-server/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2014/06/15 13:08:34 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2014/07/19 09:03:04 ryoon Exp $
 
-SHA1 (mozc-1.15.1785.102.tar.xz) = e3114c30007c9c1d6c449a015091b67a3f1f77ae
-RMD160 (mozc-1.15.1785.102.tar.xz) = 972f26eaa824efe4a5a18106cae2acb68b28f869
-Size (mozc-1.15.1785.102.tar.xz) = 35417096 bytes
+SHA1 (mozc-1.15.1834.102.tar.xz) = 77f062eb9b8f860a9a566c8e70160c038a7f8a1a
+RMD160 (mozc-1.15.1834.102.tar.xz) = a9c7ed8cca7cc22152c2967e722764b26750aaec
+Size (mozc-1.15.1834.102.tar.xz) = 32444272 bytes
 SHA1 (uim-mozc-334.tar.xz) = af86ce7a04b291629bd5dc56d5c1115332954a91
 RMD160 (uim-mozc-334.tar.xz) = b988667237f65e61fabf3935f83f5d21a8059f4e
 Size (uim-mozc-334.tar.xz) = 30544 bytes
-SHA1 (patch-base_base.gyp) = a54c372450cf2e64d1318ae434d1bfd79cc142d0
+SHA1 (patch-base_base.gyp) = d1b0c6133bcef09a58bb02da0154fe54a5e71564
 SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
 SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b
 SHA1 (patch-base_logging.cc) = 96ee9d1426ef1cf946a00fb15c9754603ab15bb8
@@ -14,11 +14,11 @@ SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31
 SHA1 (patch-base_mutex.h) = 6c3c8f0845f0fdad815c4877026894000d5eac2c
 SHA1 (patch-base_password__manager.cc) = f16982447f54e397d1aa103260d8f4d10aa76f96
 SHA1 (patch-base_process.cc) = abdd6a955e87506972e7f71fd4bc3a300f49b304
-SHA1 (patch-base_run__level.cc) = 8aa169a8be51674898906740cb8f6103b99021b4
+SHA1 (patch-base_run__level.cc) = bf9897527494fda5e5f97366e2fd26a283225450
 SHA1 (patch-base_system__util.cc) = f3ef575a15cd518fe7d29264b39f775ccf502802
 SHA1 (patch-base_thread.h) = 8aaacbb1421cf0e886f3b58dfd2c653f3d82ef70
 SHA1 (patch-base_util.cc) = c473cb595535075b53c9c235fc28f5e7da26d087
-SHA1 (patch-build__mozc.py) = a8b4596c9c5f86ca8dbbf3ea03e1873ff86baa00
+SHA1 (patch-build__mozc.py) = b6e94a43564cd4a7032cc9c6d5bd297453010d36
 SHA1 (patch-build__tools_mozc__version.py) = a6ff8a82b1328086b7d758f73a7d3c31e87bccc9
 SHA1 (patch-build__tools_util.py) = 6416884ba288d60eb8e558e8c5de7ef6e538b82e
 SHA1 (patch-client_client.cc) = 7ca43dde3f207331005599653c6520667e3ca93c
@@ -40,7 +40,6 @@ SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2
 SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
 SHA1 (patch-ipc_unix__ipc.cc) = d821deb2f38bf77bf6b364eb31d419c0a86c1a7f
 SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
-SHA1 (patch-protobuf_genproto.gypi) = 601165a376bcd05983f87733285737ee043c13fe
 SHA1 (patch-protobuf_protobuf.gyp) = c1b08a30b8f9b2ca0d7cac180891cf3d9bc257f3
 SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473
 SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
@@ -48,4 +47,3 @@ SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
 SHA1 (patch-third__party_protobuf_post__process__dist.sh) = c54363572de0afc2c49b4ed06bc0eb329e4ad237
 SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 566d567ae4f911766309e035697a23350f24bbf5
 SHA1 (patch-unix_ibus_ibus.gyp) = 2fc9309216270846f7ce33d1854d9d76e65e6e96
-SHA1 (patch-unix_ibus_mozc__engine.cc) = 2ce0a680a0fad1abdc646737b6b5a4c3a9e87e6e
diff --git a/inputmethod/mozc-server/patches/patch-base_base.gyp b/inputmethod/mozc-server/patches/patch-base_base.gyp
index 55bcba80265..d6a784b135a 100644
--- a/inputmethod/mozc-server/patches/patch-base_base.gyp
+++ b/inputmethod/mozc-server/patches/patch-base_base.gyp
@@ -1,6 +1,6 @@
-$NetBSD: patch-base_base.gyp,v 1.3 2014/06/15 13:08:34 ryoon Exp $
+$NetBSD: patch-base_base.gyp,v 1.4 2014/07/19 09:03:04 ryoon Exp $
 
---- base/base.gyp.orig	2014-05-21 10:51:31.000000000 +0000
+--- base/base.gyp.orig	2014-07-06 07:03:03.000000000 +0000
 +++ base/base.gyp
 @@ -78,7 +78,7 @@
          # shared among *host* binaries and *target* binaries. This means that
@@ -11,32 +11,3 @@ $NetBSD: patch-base_base.gyp,v 1.3 2014/06/15 13:08:34 ryoon Exp $
           'not (target_platform=="NaCl" and _toolset=="target")', {
            'defines': [
              'HAVE_LIBRT=1',
-@@ -274,23 +274,23 @@
-           },
-         }],
-         ['use_legacy_encryptor==1 and '
--         'OS=="linux" and target_platform!="Android" and '
-+         'OS=="netbsd" or (OS=="linux" and target_platform!="Android") and '
-          'not (target_platform=="NaCl" and _toolset=="target")', {
-           'cflags': [
--            '<!@(<(pkg_config_command) --cflags-only-other openssl)',
-+            '@OPENSSL_CFLAGS@',
-           ],
-           'defines': [
-             'HAVE_OPENSSL=1',
-           ],
-           'include_dirs': [
--            '<!@(<(pkg_config_command) --cflags-only-I openssl)',
-+            '@OPENSSL_INC@',
-           ],
-           'link_settings': {
-             'ldflags': [
--              '<!@(<(pkg_config_command) --libs-only-L openssl)',
-+              '@OPENSSL_LDFLAGS@',
-             ],
-             'libraries': [
--              '<!@(<(pkg_config_command) --libs-only-l openssl)',
-+              '@OPENSSL_LIBS@',
-             ],
-           },
-         }],
diff --git a/inputmethod/mozc-server/patches/patch-base_run__level.cc b/inputmethod/mozc-server/patches/patch-base_run__level.cc
index ad7c08ec5c1..15ae237684b 100644
--- a/inputmethod/mozc-server/patches/patch-base_run__level.cc
+++ b/inputmethod/mozc-server/patches/patch-base_run__level.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_run__level.cc,v 1.1 2013/04/29 09:52:17 ryoon Exp $
+$NetBSD: patch-base_run__level.cc,v 1.2 2014/07/19 09:03:04 ryoon Exp $
 
---- base/run_level.cc.orig	2013-03-29 04:33:43.000000000 +0000
+--- base/run_level.cc.orig	2014-07-06 07:03:03.000000000 +0000
 +++ base/run_level.cc
-@@ -34,10 +34,10 @@
- #include <aclapi.h>
- #endif  // OS_WIN
+@@ -38,10 +38,10 @@
+ #include <unistd.h>
+ #endif  // OS_MACOSX
  
 -#ifdef OS_LINUX
 +#if defined(OS_LINUX) || defined(OS_NETBSD)
diff --git a/inputmethod/mozc-server/patches/patch-build__mozc.py b/inputmethod/mozc-server/patches/patch-build__mozc.py
index ce10f9507f3..1d1b017ac26 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.4 2014/01/19 01:18:50 ryoon Exp $
+$NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
 
---- build_mozc.py.orig	2014-01-06 07:10:26.000000000 +0000
+--- build_mozc.py.orig	2014-07-14 10:14:21.000000000 +0000
 +++ build_mozc.py
 @@ -60,6 +60,7 @@ from build_tools.util import FindFileFro
  from build_tools.util import GetNumberOfProcessors
@@ -10,7 +10,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
  from build_tools.util import IsMac
  from build_tools.util import IsWindows
  from build_tools.util import PrintErrorAndExit
-@@ -120,6 +121,8 @@ def GetBuildBaseName(options, target_pla
+@@ -121,6 +122,8 @@ def GetBuildShortBaseName(options, targe
      build_base = 'out_mac'
    elif target_platform == 'Linux':
      build_base = 'out_linux'
@@ -19,7 +19,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
    elif target_platform == 'Android':
      build_base = 'out_android'
    elif target_platform == 'NaCl':
-@@ -214,6 +217,14 @@ def GetGypFileNames(options):
+@@ -220,6 +223,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)
@@ -34,7 +34,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
    elif options.target_platform == 'NaCl':
      # 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):
+@@ -315,6 +326,8 @@ def AddTargetPlatformOption(parser):
    # If you want Android build, specify "Android".
    if IsLinux():
      default_target = 'Linux'
@@ -43,7 +43,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
    elif IsWindows():
      default_target = 'Windows'
    elif IsMac():
-@@ -506,6 +519,14 @@ def ExpandMetaTarget(options, meta_targe
+@@ -512,6 +525,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')
@@ -58,7 +58,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
    elif target_platform == 'Mac':
      targets = [SRC_DIR + '/mac/mac.gyp:DiskImage']
    elif target_platform == 'Windows':
-@@ -531,7 +552,7 @@ def ParseBuildOptions(args=None, values=
+@@ -537,7 +558,7 @@ def ParseBuildOptions(args=None, values=
    """Parses command line options for the build command."""
    parser = optparse.OptionParser(usage='Usage: %prog build [options]')
    AddCommonOptions(parser)
@@ -67,7 +67,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
      default_build_concurrency = GetNumberOfProcessors() * 2
      parser.add_option('--jobs', '-j', dest='jobs',
                        default=('%d' % default_build_concurrency),
-@@ -551,7 +572,7 @@ def ParseRunTestsOptions(args=None, valu
+@@ -566,7 +587,7 @@ def ParseRunTestsOptions(args=None, valu
    parser = optparse.OptionParser(
        usage='Usage: %prog runtests [options] [test_targets] [-- build options]')
    AddCommonOptions(parser)
@@ -76,7 +76,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
      default_build_concurrency = GetNumberOfProcessors() * 2
      parser.add_option('--jobs', '-j', dest='jobs',
                        default=('%d' % default_build_concurrency),
-@@ -777,7 +798,8 @@ def GypMain(options, unused_args, _):
+@@ -787,7 +808,8 @@ def GypMain(options, unused_args, _):
      gyp_options.extend(['-D', 'channel_dev=1'])
  
    def SetCommandLineForFeature(option_name, windows=False, mac=False,
@@ -86,7 +86,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
      """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
-@@ -799,6 +821,8 @@ def GypMain(options, unused_args, _):
+@@ -809,6 +831,8 @@ def GypMain(options, unused_args, _):
            option on Android platform.
        nacl: A boolean which replesents the default value of the target
            option on NaCl.
@@ -95,7 +95,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
  
      Raises:
        ValueError: An error occurred when 'option_name' is empty.
-@@ -811,6 +835,7 @@ def GypMain(options, unused_args, _):
+@@ -821,6 +845,7 @@ def GypMain(options, unused_args, _):
                         'Mac': mac,
                         'Linux': linux,
                         'Android': android,
@@ -103,7 +103,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
                         'NaCl': nacl}[options.target_platform]
      enable_option_name = 'enable_%s' % option_name
      enabled = options.ensure_value(enable_option_name, default_enabled)
-@@ -822,10 +847,12 @@ def GypMain(options, unused_args, _):
+@@ -832,10 +857,12 @@ def GypMain(options, unused_args, _):
  
    SetCommandLineForFeature(option_name='cloud_handwriting',
                             linux=is_official_dev,
@@ -116,7 +116,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
                             windows=is_official,
                             mac=is_official,
                             android=is_official,
-@@ -863,7 +890,8 @@ def GypMain(options, unused_args, _):
+@@ -873,7 +900,8 @@ def GypMain(options, unused_args, _):
    else:
      gyp_options.extend(['-D', 'use_zinnia=NO'])
  
@@ -126,7 +126,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
        '%s/unix/ibus/ibus.gyp' % SRC_DIR in gyp_file_names):
      gyp_options.extend(['-D', 'use_libibus=1'])
  
-@@ -896,7 +924,7 @@ def GypMain(options, unused_args, _):
+@@ -906,7 +934,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.
@@ -135,49 +135,33 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
      gyp_options.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()])
    else:
      gyp_options.extend(['-D', 'pkg_config_command='])
-@@ -1049,6 +1077,41 @@ def BuildOnMac(options, targets, origina
+@@ -1050,6 +1078,25 @@ def BuildOnMac(options, targets, origina
                '-parallelizeTargets',
                'BUILD_WITH_GYP=1'])
  
 +def BuildOnBSD(options, targets, unused_original_directory_name):
-+  """Build the targets on *BSD."""
++  """Build the targets on BSD."""
 +  target_names = []
 +  for target in targets:
 +    (unused_gyp_file_name, target_name) = (
 +        CanonicalTargetToGypFileAndTargetName(target))
 +    target_names.append(target_name)
 +
-+    make_command = os.getenv('BUILD_COMMAND', 'make')
-+
-+  envvars = [
-+      'CFLAGS',
-+      'CXXFLAGS',
-+      'CXX',
-+      'CC',
-+      'AR',
-+      'AS',
-+      'RANLIB',
-+      'LD',
-+  ]
-+  for envvar in envvars:
-+    if envvar in os.environ:
-+      os.environ[envvar] = os.getenv(envvar)
-+
-+  # set output directory
-+  os.environ['builddir_name'] = 'out_bsd'
-+
-+  build_args = ['-j%s' % options.jobs,
-+                'MAKE_JOBS=%s' % options.jobs,
-+                'BUILDTYPE=%s' % options.configuration]
-+  build_args.append('builddir_name=%s' %
-+                    GetBuildBaseName(options,
-+                                     GetMozcVersion().GetTargetPlatform()))
++  ninja = 'ninja'
++  if hasattr(options, 'android_device'):
++    # Only for android testing.
++    os.environ['ANDROID_DEVICES'] = options.android_device
 +
++  short_basename =  GetBuildShortBaseName(options,
++                                          GetMozcVersion().GetTargetPlatform())
++  make_command = ninja
++  build_args = ['-j %s' % options.jobs,
++                '-C', '%s/%s' % (short_basename, options.configuration)]
 +  RunOrDie([make_command] + build_args + target_names)
  
  def BuildOnWindows(targets):
    """Build the target on Windows."""
-@@ -1076,6 +1139,8 @@ def BuildMain(options, targets, original
+@@ -1077,6 +1124,8 @@ def BuildMain(options, targets, original
      BuildOnMac(options, targets, original_directory_name)
    elif IsLinux():
      BuildOnLinux(options, targets, original_directory_name)
@@ -186,12 +170,3 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
    elif IsWindows():
      BuildOnWindows(targets)
    else:
-@@ -1341,7 +1406,7 @@ def CleanBuildFilesAndDirectories(option
-     elif IsMac():
-       directory_names.extend(glob.glob(os.path.join(gyp_directory_name,
-                                                     '*.xcodeproj')))
--    elif IsLinux():
-+    elif IsLinux() or IsNetBSD():
-       file_names.extend(glob.glob(os.path.join(gyp_directory_name,
-                                                '*.target.mk')))
-       file_names.extend(glob.glob(os.path.join(gyp_directory_name,
diff --git a/inputmethod/mozc-server/patches/patch-protobuf_genproto.gypi b/inputmethod/mozc-server/patches/patch-protobuf_genproto.gypi
deleted file mode 100644
index 4bd9db00023..00000000000
--- a/inputmethod/mozc-server/patches/patch-protobuf_genproto.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-protobuf_genproto.gypi,v 1.3 2013/09/07 18:42:14 ryoon Exp $
-
---- protobuf/genproto.gypi.orig	2013-08-28 05:26:13.000000000 +0000
-+++ protobuf/genproto.gypi
-@@ -34,7 +34,7 @@
-     'protoc_command': 'protoc<(EXECUTABLE_SUFFIX)',
-   },
-   'conditions': [
--    ['target_platform!="Linux"', {
-+    ['target_platform!="Linux" and target_platform!="NetBSD"', {
-       'variables': {
-         'protoc_wrapper_additional_options': ['--protoc_dir=<(mozc_build_tools_dir)'],
-       },
diff --git a/inputmethod/mozc-server/patches/patch-unix_ibus_mozc__engine.cc b/inputmethod/mozc-server/patches/patch-unix_ibus_mozc__engine.cc
deleted file mode 100644
index ddc51b71fb4..00000000000
--- a/inputmethod/mozc-server/patches/patch-unix_ibus_mozc__engine.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-unix_ibus_mozc__engine.cc,v 1.2 2013/07/20 04:34:53 ryoon Exp $
-
-* I am not sure.
-
---- unix/ibus/mozc_engine.cc.orig	2013-07-17 02:37:50.000000000 +0000
-+++ unix/ibus/mozc_engine.cc
-@@ -265,7 +265,7 @@ bool GetSurroundingText(IBusEngine *engi
-   }
- 
-   const uint32 selection_start = min(cursor_pos, anchor_pos);
--  const uint32 selection_length = abs(info->relative_selected_length);
-+  const uint32 selection_length = ::abs(info->relative_selected_length);
-   info->preceding_text = surrounding_text.substr(0, selection_start);
-   Util::SubString(surrounding_text,
-                   selection_start,