 @@ -1,48 +1,49 @@
-# $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
 # used by inputmethod/mozc-tool/Makefile
 # used by inputmethod/mozc-renderer/Makefile
 # 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
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/mozc/
 COMMENT=	Japanese inputmethod Mozc engine for IBus
 LICENSE=	modified-bsd
 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
 USE_LANGUAGES=	c c++
 # nullptr requires -std=c++11, and -std=c++11 requires gcc 4.7 or later
 GCC_REQD+=	4.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
 OPENSSL_INC=		-I${BUILDLINK_PREFIX.openssl}/include
 OPENSSL_LDFLAGS=	-L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto
 OPENSSL_LIBS=		-lssl -lcrypto
 SUBST_CLASSES+=		gyp
 SUBST_STAGE.gyp=	pre-configure
 SUBST_MESSAGE.gyp=	Fix gyp defaults
 SUBST_FILES.gyp+=	base/base.gyp
 SUBST_FILES.gyp+=	base/process.cc
 SUBST_FILES.gyp+=	base/system_util.cc
 @@ -58,28 +59,28 @@ ALL_ENV+=	LINK=${CXX}
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 OSDEST=		bsd
 .elif ${OPSYS} == "Linux"
 OSDEST=		linux
 .endif
 MOZC_BUILD_MODE=	Release # or Debug
 do-configure:
 	cd ${WRKSRC} && env ${MAKE_ENV} \
 		GYP_DEFINES="use_libprotobuf=1" \
-		${PYTHONBIN} build_mozc.py gyp \
+		${PYTHONBIN} build_mozc.py \
-		--gypdir=${GYPDIR}/bin && \
+		gyp \
-		${PYTHONBIN} build_mozc.py build_tools -c ${MOZC_BUILD_MODE} \
+		--gypdir=${GYPDIR}/bin
 		${_MAKE_JOBS}
 .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"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,51 +1,49 @@
-$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
+SHA1 (mozc-1.15.1834.102.tar.xz) = 77f062eb9b8f860a9a566c8e70160c038a7f8a1a
-RMD160 (mozc-1.15.1785.102.tar.xz) = 972f26eaa824efe4a5a18106cae2acb68b28f869
+RMD160 (mozc-1.15.1834.102.tar.xz) = a9c7ed8cca7cc22152c2967e722764b26750aaec
-Size (mozc-1.15.1785.102.tar.xz) = 35417096 bytes
+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
 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
 SHA1 (patch-config_stats__config__util__test.cc) = db51e6619c5c04ac8fa50890825206ea922dccf2
 SHA1 (patch-gui_base_locale__util.cc) = 7d1e9cf3c2c36590298496471a97b8c32010a30b
 SHA1 (patch-gui_config__dialog_config__dialog.cc) = aae18b7ea36fd5ff5758625875a04634ffdfd68a
 SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9
 SHA1 (patch-gui_config__dialog_keymap__editor.cc) = a78a4fb5c484e672b0cfecf38c6713cf74007cb5
 SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608
 SHA1 (patch-gui_gui.gyp) = 70b6d78ca5a482b9e8fa697dbb191cccbdde1c6a
 SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
 SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b
 SHA1 (patch-gyp_common.gypi) = 4859bc46c17088f29f0addd75a0af6b4f5fc3525
 SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c
 SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc
 SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
 SHA1 (patch-ipc_ipc__path__manager.cc) = c96fbac6d1d81ddd7f999c30bdc2539ee2df2564
 SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2939fbdf
 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
 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

 @@ -1,197 +1,172 @@
-$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
  from build_tools.util import GetRelPath
  from build_tools.util import IsLinux
 +from build_tools.util import IsNetBSD
  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'
 +  elif target_platform == 'NetBSD':
 +    build_base = 'out_bsd'
    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)
 +  elif options.target_platform == 'NetBSD':
 +    gyp_file_names.extend(glob.glob('%s/unix/*/*.gyp' % SRC_DIR))
 +    # Add ibus.gyp if ibus version is >=1.4.1.
 +    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 == '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'
 +  elif IsNetBSD():
 +    default_target = 'NetBSD'
    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')
 +  elif target_platform == 'NetBSD':
 +    targets = [SRC_DIR + '/server/server.gyp:mozc_server',
 +               SRC_DIR + '/renderer/renderer.gyp:mozc_renderer',
 +               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 == '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)
 -  if IsLinux():
 +  if IsLinux() or IsNetBSD():
      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)
 -  if IsLinux():
 +  if IsLinux() or ISNetBSD():
      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,
 -                               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
-@@ -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.
 +      netbsd:  boolean which replesents the default value of the target option
 +	  on NetBSD platform.
      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,
 +		       'NetBSD' : netbsd,
                         '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,
 +			   netbsd=is_official_dev,
                             windows=is_official_dev,
                             mac=is_official_dev)
    SetCommandLineForFeature(option_name='http_client',
                             linux=is_official,
 +			   netbsd=is_official,
                             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'])
 -  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):
      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.
 -  if IsLinux():
 +  if IsLinux() or IsNetBSD():
      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')
++  ninja = 'ninja'
 +  if hasattr(options, 'android_device'):
-+  envvars = [
++    # Only for android testing.
-+      'CFLAGS',
++    os.environ['ANDROID_DEVICES'] = options.android_device
 +      '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()))
++
 +  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)
 +  elif IsNetBSD():
 +    BuildOnBSD(options, targets, original_directory_name)
    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,

 @@ -1,16 +1,17 @@
-# $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-/}
 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:
 	${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/mozc_server \
 		${DESTDIR}${PREFIX}/libexec/mozc_server
 .include "../../inputmethod/mozc-server/Makefile.common"

 @@ -1,42 +1,13 @@
-$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
          # you should implement *host* binaries by using limited libraries
          # which are also available on NDK.
 -        ['OS=="linux" and target_platform!="Android" and '
 +        ['OS=="netbsd" or (OS=="linux" and target_platform!="Android") and '
           '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@',
              ],
            },
          }],

 @@ -1,17 +1,17 @@
-$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 @@
+@@ -38,10 +38,10 @@
- #include <aclapi.h>
+ #include <unistd.h>
- #endif  // OS_WIN
+ #endif  // OS_MACOSX
 -#ifdef OS_LINUX
 +#if defined(OS_LINUX) || defined(OS_NETBSD)
  #include <unistd.h>
  #include <sys/types.h>
 -#endif  // OS_LINUX
 +#endif  // OS_LINUX || OS_NETBSD
  #include "base/const.h"
  #include "base/logging.h"

 @@ -1,27 +1,27 @@
-# $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=	ibus-${DISTNAME}
 INSTALLATION_DIRS+=	libexec share/ibus share/ibus/component \
 			share/ibus-mozc
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=	mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
 DEPENDS+=	mozc-server-[0-9]*:../../inputmethod/mozc-server
 DEPENDS+=	mozc-tool-[0-9]*:../../inputmethod/mozc-tool
 do-build:
 	cd ${WRKSRC} && env ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
 			unix/ibus/ibus.gyp:ibus_mozc
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/ibus_mozc \
 		${DESTDIR}${PREFIX}/libexec/ibus-engine-mozc
-	${INSTALL_DATA} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/obj/gen/unix/ibus/mozc.xml \
+	${INSTALL_DATA} ${WRKSRC}/out_${OSDEST}/${MOZC_BUILD_MODE}/gen/unix/ibus/mozc.xml \
 		${DESTDIR}${PREFIX}/share/ibus/component
 	${INSTALL_DATA} ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
 		${DESTDIR}${PREFIX}/share/ibus-mozc/product_icon.png
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../inputmethod/mozc-server/Makefile.common"