CVS commit: pkgsrc/inputmethod

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/inputmethod
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Sun, 17 Dec 2017 14:15:44 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun Dec 17 14:15:44 UTC 2017

Modified Files:
        pkgsrc/inputmethod/ibus-mozc: Makefile
        pkgsrc/inputmethod/mozc-elisp: Makefile
        pkgsrc/inputmethod/mozc-renderer: Makefile
        pkgsrc/inputmethod/mozc-server: Makefile Makefile.common distinfo
        pkgsrc/inputmethod/mozc-server/patches: patch-base_clock.cc
            patch-base_cpu__stats.cc patch-base_logging.cc patch-base_mutex.cc
            patch-base_password__manager.cc patch-base_port.h
            patch-base_process.cc patch-base_run__level.cc
            patch-base_system__util.cc patch-build__mozc.py
            patch-build__tools_mozc__version.py patch-build__tools_util.py
            patch-client_client.cc patch-config_stats__config__util__test.cc
            patch-gui_config__dialog_config__dialog.cc
            patch-gui_config__dialog_keybinding__editor.cc
            patch-gui_dictionary__tool_dictionary__tool.cc
            patch-gui_qt__libraries.gypi
            patch-gui_word__register__dialog_word__register__dialog.cc
            patch-gyp_common.gypi patch-handwriting_zinnia.gyp
            patch-handwriting_zinnia__handwriting.cc
            patch-ipc_ipc__path__manager.cc
            patch-ipc_ipc__path__manager__test.cc patch-ipc_unix__ipc.cc
            patch-net_net.gyp patch-session_session.cc
            patch-session_session__test.cc
            patch-third__party_protobuf_post__process__dist.sh
            patch-unix_ibus_ibus.gyp
        pkgsrc/inputmethod/mozc-tool: Makefile
        pkgsrc/inputmethod/uim-mozc: Makefile
Added Files:
        pkgsrc/inputmethod/mozc-server/patches: patch-base_base.gyp
            patch-base_thread.cc patch-gui_qt__moc.gypi patch-gui_qt__rcc.gypi
            patch-gui_qt__uic.gypi patch-gyp_directories.gypi
            patch-unix_ibus_path__util.cc
Removed Files:
        pkgsrc/inputmethod/mozc-server/patches: patch-gui_base_locale__util.cc
            patch-protobuf_protobuf.gyp patch-unix_ibus_gen__mozc__xml.py

Log Message:
mozc: update to 2.20.2673.102.

pkgsrc changes:
- switch to using qt5 (to follow upstream)
- handle ${PREFIX} in more places
- fix package COMMENT (remove "for IBus")
- GCC_REQD 4.7 for c++11
- add patch comments

See PR pkg/52689 for more details.

Upstream changes:
(from https://github.com/google/mozc/blob/master/docs/release_history.md)

Summary of changes between 2.19.2644.102 and 2.20.2673.102 as follows.

    Third party libraries:
        None.
    Build related changes:
        --qtver GYP build option was removed (280e38f).
        Mozc for macOS now uses macOS 10.11 SDK by default (b2a74bb).
    Major changes:
        src/data/installer/credits_ja.html was removed (2ec6c8f).
        Mozc for macOS now generates 64-bit executables. 32-bit machine is no longer supported on macOS.
        Mozc for Android now has more translations (d914458).
    Fixed issues:
        #187: build_mozc.py always generates 32 bit binaries on 64 bit OSX
        #327: Switch to Qt5 from Qt4
        #348: DirectWrite may fail to render text in certain enviromnents
        #391: ImportError: gen_zip_code_seed.py
        #399: OK/Cancel buttons on Mozc key binding editor dialog cannot be clicked on Windows
        #400: Close icon on GUI dialogs do not work on Windows
    Total commits:
        30 commits.

Summary of changes between 2.18.2613.102 and 2.19.2643.102 as follows.

    Third party libraries:
        protobuf: e8ae137 -> c44ca26
        Dropped dependency on fonttools
    Build related changes:
        --qtver=5 GYP build option is implicitly assumed on macOS and Linux builds (f76c304). On Windows, --qtver=4 is still the default.
    Major changes:
        Mozc for macOS now supports 10.12 as a runtime environment.
        Mozc for Android now uses on-device font to render keytop icons (f5dcad).
    Fixed issues:
        #263: Incorrect position in voiced sound marks on the key pad in Android
        #384: HUAWEI P9 lite does not show MozcView.
        #388: Having multiple abbreviation user dictionary entries with the same reading should be supported
        #389: Emoticon user dictionary entry should not be treated a content word
    Total commits:
        39 commits.

Summary of changes between 2.17.2532.102 and 2.18.2612.102 as follows.

    Third party libraries:
        protobuf: d5fb408 -> e8ae137
        GYP: e2e928b -> 4ec6c4e
        breakpad: d2904bb -> 85b27e4
        Dropped dependency on zlib
    Build related changes:
        Renamed src/mozc_version_template.txt to src/data/version/mozc_version_template.bzl
        Reference build environment now uses Ubuntu 14.04.5 (a7cbf72)
        Reference build environment now uses Ninja 1.7.1 (d2bc62b)
        Removed --android_compiler GYP option (5ce7fa6)
        Android build requires Android NDK r12b (5ce7fa6)
    Major changes:
        Improved Store Apps compatibility on Windows (0488082)
    Fixed issues:
        NPE in UserDictionaryToolActivity.onPostResume on Android (09b47c3)
        #273: Compilation errors in Android arm64 and mips64 build
        #373: Unexpected size bloat of the APK
        #374: Duplicate candidates after Undo
        #375: 90- is suggested from 090-
        #376: Suggestion-only user dictionary entry may not work
        #377: Abbreviation user dictionary entry may not work
        #378: Suppression word may not work
        #379: Single character noun user dictionary entry may not work
        #380: Dependency on dictionary/pos_matcher.h from session/session_server.cc is missing in GYP rules
        #382: Fix typo
    Total commits:
        84 commits.

Summary of changes between 2.17.2405.102 and 2.17.2531.102 as follows.

    Third party libraries:
        protobuf: 1a59a71 -> d5fb408
    Build related changes:
        Building Mozc for Windows requires Visual Studio 2015 update 3.
        --qtdir option is no longer supported in Linux desktop build (d003076).
    Major changes:
        Updated system dictionary.
        Removed several Shift-JIS-based normalizations on Windows (26241b0).
        Mozc for Windows requires SSE2 even on 32-bit environment.
        Mozc for Windows supports Windows 7 SP1 and later only.
        Mozc for macOS supports macOS 10.9 and later only.
        Mozc for desktop platforms (Windows, macOS, desktop Linux) supports Qt5 behind --qtver=5 GYP option.
    Fixed issues:
        Fix OOM when importing too large dictionary file on Android (5c859ae)
        #298: Fix NPE on Samsung devices on showing toast
        #315: Switch to Visual C++ 2015
        #372: Discontinue the support of Windows Vista
    Total commits:
        128 commits.

Summary of changes between 2.17.2355.102 and 2.17.2404.102 as follows.

    Third party libraries:
        protobuf: 172019c -> 1a59a71
    Build related changes:
        Building Mozc requires protobuf 3.0 or later.
        --android_stl GYP option is removed in Android build. You cannot use GNU STL to build Mozc for Android anymore.
    Major changes:
        None.
    Fixed issues:
        #369: Unexpected software keyboard layout can be chosen
        #370: Mozc keeps crashing on Android N Developer Preview 5
        #371: Shortcut word in personal dictionary should not be used for multi segment conversion
    Total commits:
        50 commits.

Summary of changes between 2.17.2323.102 and 2.17.2354.102 as follows.

    Third party libraries:
        None.
    Build related changes:
        None.
    Major changes:
        2.17.2323.102 and later commits in OSS repository preserve the original CL commit date in Google internal repository.
            Consider to specify --topo-order option to git log to see commits in the actual commit order.
        Multiple performance improvements in Android.
    Fixed issues:
        None.
    Total commits:
        32 commits.

Summary of changes between 2.17.2314.102 and 2.17.2322.102 as follows.

    Third party libraries:
        googletest: 1d53731 -> 82b11b8
        WTL: 9.0.4140 -> 9.1.5321
    Build related changes:
        Building macOS binaries now requires Ninja instead of xcodebuild.
    Major changes:
        None.
    Fixed issues:
        #247: Use ninja to build Mac binaries
        #355: Native resource leak due to the missing pthread_detach call in mozc::Thread::Detach
        #361: ImmSetCandidateWindow() with CFS_EXCLUDE isn't supported on Win Vista and Win7
    Total commits:
        15 commits.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/inputmethod/ibus-mozc/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/inputmethod/mozc-elisp/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/mozc-renderer/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/inputmethod/mozc-server/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/inputmethod/mozc-server/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/inputmethod/mozc-server/distinfo
cvs rdiff -u -r0 -r1.7 \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_base.gyp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_clock.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-net_net.gyp \
    pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py \
    pkgsrc/inputmethod/mozc-server/patches/patch-client_client.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-config_stats__config__util__test.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_keybinding__editor.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp \
    pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager__test.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-session_session__test.cc
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_logging.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_mutex.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_process.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_run__level.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_system__util.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_util.py \
    pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-session_session.cc
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_password__manager.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_port.h \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/mozc-server/patches/patch-base_thread.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__moc.gypi \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__rcc.gypi \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__uic.gypi \
    pkgsrc/inputmethod/mozc-server/patches/patch-gyp_directories.gypi \
    pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_path__util.cc
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/inputmethod/mozc-server/patches/patch-build__mozc.py \
    pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_base_locale__util.cc
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc \
    pkgsrc/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
cvs rdiff -u -r1.7 -r0 \
    pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py
cvs rdiff -u -r1.30 -r1.31 pkgsrc/inputmethod/mozc-tool/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/inputmethod/uim-mozc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/ibus-mozc/Makefile
diff -u pkgsrc/inputmethod/ibus-mozc/Makefile:1.35 pkgsrc/inputmethod/ibus-mozc/Makefile:1.36
--- pkgsrc/inputmethod/ibus-mozc/Makefile:1.35  Thu Aug 24 20:03:26 2017
+++ pkgsrc/inputmethod/ibus-mozc/Makefile       Sun Dec 17 14:15:44 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.36 2017/12/17 14:15:44 tsutsui Exp $
 
 PKGNAME=       ibus-${DISTNAME}
-PKGREVISION=   7
 
 INSTALLATION_DIRS+=    libexec share/ibus share/ibus/component \
                        share/ibus-mozc

Index: pkgsrc/inputmethod/mozc-elisp/Makefile
diff -u pkgsrc/inputmethod/mozc-elisp/Makefile:1.25 pkgsrc/inputmethod/mozc-elisp/Makefile:1.26
--- pkgsrc/inputmethod/mozc-elisp/Makefile:1.25 Thu Aug 24 20:03:26 2017
+++ pkgsrc/inputmethod/mozc-elisp/Makefile      Sun Dec 17 14:15:43 2017
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.26 2017/12/17 14:15:43 tsutsui Exp $
 #
 
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=   7
 CATEGORIES=    inputmethod editors
 
 EMACS_MODULES= base leim

Index: pkgsrc/inputmethod/mozc-renderer/Makefile
diff -u pkgsrc/inputmethod/mozc-renderer/Makefile:1.16 pkgsrc/inputmethod/mozc-renderer/Makefile:1.17
--- pkgsrc/inputmethod/mozc-renderer/Makefile:1.16      Thu Aug 24 20:03:26 2017
+++ pkgsrc/inputmethod/mozc-renderer/Makefile   Sun Dec 17 14:15:43 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.17 2017/12/17 14:15:43 tsutsui Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION=   7
 
 CONFLICTS+=    ibus-mozc<=1.13.1651.102
 

Index: pkgsrc/inputmethod/mozc-server/Makefile
diff -u pkgsrc/inputmethod/mozc-server/Makefile:1.33 pkgsrc/inputmethod/mozc-server/Makefile:1.34
--- pkgsrc/inputmethod/mozc-server/Makefile:1.33        Thu Aug 24 20:03:26 2017
+++ pkgsrc/inputmethod/mozc-server/Makefile     Sun Dec 17 14:15:43 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.34 2017/12/17 14:15:43 tsutsui Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=   7
 
 INSTALLATION_DIRS+=    libexec
 

Index: pkgsrc/inputmethod/mozc-server/Makefile.common
diff -u pkgsrc/inputmethod/mozc-server/Makefile.common:1.25 pkgsrc/inputmethod/mozc-server/Makefile.common:1.26
--- pkgsrc/inputmethod/mozc-server/Makefile.common:1.25 Sat Jul  9 13:03:52 2016
+++ pkgsrc/inputmethod/mozc-server/Makefile.common      Sun Dec 17 14:15:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2016/07/09 13:03:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.26 2017/12/17 14:15:43 tsutsui Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -7,14 +7,14 @@
 # used by inputmethod/uim-mozc/Makefile
 #
 
-DISTNAME=      mozc-2.17.2313.102
+DISTNAME=      mozc-2.20.2673.102
 CATEGORIES=    inputmethod
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/google/mozc/
-COMMENT=       Japanese inputmethod Mozc engine for IBus
+COMMENT=       Japanese inputmethod Mozc engine
 LICENSE=       modified-bsd
 
 UIM_MOZC=      uim-mozc-321.3ea28b1
@@ -34,6 +34,7 @@ BUILD_DEPENDS+=       ninja-build-[0-9]*:../..
 USE_LANGUAGES= c c++
 
 USE_TOOLS+=    gmake pkg-config
+GCC_REQD+=     4.7     # for c++11
 
 OPENSSL_CFLAGS=                -I${BUILDLINK_PREFIX.openssl}/include
 OPENSSL_INC=           -I${BUILDLINK_PREFIX.openssl}/include
@@ -43,15 +44,13 @@ 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
+SUBST_FILES.gyp+=      gyp/directories.gypi
 SUBST_FILES.gyp+=      handwriting/zinnia_handwriting.cc
-SUBST_FILES.gyp+=      unix/ibus/gen_mozc_xml.py
 SUBST_FILES.gyp+=      unix/ibus/ibus.gyp
-SUBST_FILES.gyp+=      gyp/common.gypi
+SUBST_FILES.gyp+=      unix/ibus/path_util.cc
 SUBST_VARS.gyp+=       OPENSSL_CFLAGS OPENSSL_INC OPENSSL_LDFLAGS OPENSSL_LIBS
-SUBST_VARS.gyp+=       PREFIX QTDIR
+SUBST_VARS.gyp+=       PREFIX
 
 # To disable flock(1) in link stage.
 ALL_ENV+=      LINK=${CXX}
@@ -78,7 +77,7 @@ do-configure:
 .include "../../inputmethod/zinnia/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/mozc-server/distinfo
diff -u pkgsrc/inputmethod/mozc-server/distinfo:1.19 pkgsrc/inputmethod/mozc-server/distinfo:1.20
--- pkgsrc/inputmethod/mozc-server/distinfo:1.19        Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/distinfo     Sun Dec 17 14:15:43 2017
@@ -1,45 +1,49 @@
-$NetBSD: distinfo,v 1.19 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2017/12/17 14:15:43 tsutsui Exp $
 
-SHA1 (mozc-2.17.2313.102.tar.xz) = c4a010b0a5ca47b589af4dbd1c4056e26989286a
-RMD160 (mozc-2.17.2313.102.tar.xz) = 59eabd43ec34926750c00e184eefd1a4dff98b48
-SHA512 (mozc-2.17.2313.102.tar.xz) = 96492296d168496c3c21228c7b374aa3dc55d42399455cd52eab06d8ea4ed2a25d34dabb484de98edd55db2a8b4321158bfd0cb9be68a2216e1ed5e239aae3fb
-Size (mozc-2.17.2313.102.tar.xz) = 47600492 bytes
+SHA1 (mozc-2.20.2673.102.tar.xz) = 9cedf4d392593e04755fa44afd79cd40bb80b9d1
+RMD160 (mozc-2.20.2673.102.tar.xz) = 723fef550d88c5a4dc33f2ec9c8d7ee694e60d64
+SHA512 (mozc-2.20.2673.102.tar.xz) = 06ce43b0fa6d5a696cddafc97cd84bfa4482204ffb3793a6d3811dd50c4ed859289394ee471987b20fd637768bdfcc2f0289993b88e24c141c93514229dfc402
+Size (mozc-2.20.2673.102.tar.xz) = 44187096 bytes
 SHA1 (uim-mozc-321.3ea28b1.tar.xz) = 22b7c2a5b0a7fef778ee72ebe5873a75e879d26b
 RMD160 (uim-mozc-321.3ea28b1.tar.xz) = 30d160d02a39065e4bc34968fbe6232018b0b202
 SHA512 (uim-mozc-321.3ea28b1.tar.xz) = b28f4d207a52c208694371dbc550ac5022a29c5870b8d856bca8052106d8be88ab8d066bdc6d895ac6fa9f350ce6be16d638603e46058f9528691f97cb86d054
 Size (uim-mozc-321.3ea28b1.tar.xz) = 24400 bytes
-SHA1 (patch-base_clock.cc) = 996d2ca52301d53ff0b23b1d1ee8a7370621782a
-SHA1 (patch-base_cpu__stats.cc) = c5c22b9aecadfc92832f990115879ef4625d6b37
-SHA1 (patch-base_logging.cc) = 2a119d02f959da09792af142e2cd6d1341750333
-SHA1 (patch-base_mutex.cc) = 0aaf0e317b2110008d1e331eff760ea532fbe0c0
+SHA1 (patch-base_base.gyp) = d8d9abc0da196f0573ad645937812710c7c67746
+SHA1 (patch-base_clock.cc) = 0fa3f4b3bcd34283870a317032172745dcf90eaa
+SHA1 (patch-base_cpu__stats.cc) = c55ee389eced767e875553937a80c8ba6c6abd2d
+SHA1 (patch-base_logging.cc) = 5dddcbbf4445e91e6f8ab41999c938e0491c05c4
+SHA1 (patch-base_mutex.cc) = 9563ff1563eef8dc73417454b2ba06322a2cd76d
 SHA1 (patch-base_mutex.h) = cf12a1574d28dd612820578560a76b3b8ab6e27d
-SHA1 (patch-base_password__manager.cc) = 4883771e3942864d26a5c7c6f3b8fce6bf61c9f0
-SHA1 (patch-base_port.h) = 89ff9a614a86cb53c7047c244fb491a7bce3e64c
-SHA1 (patch-base_process.cc) = b6a9cbb24a481364f3fea1c900f6d455a2e55d10
-SHA1 (patch-base_run__level.cc) = 3475e4a8ce01237fd9abda86f6f495def0e42d3b
-SHA1 (patch-base_system__util.cc) = 6ea56e6a8c05ff705e702a475f3eefce57d3ab94
-SHA1 (patch-build__mozc.py) = 72740d9adbd8728ad88affe30f5201f71805111c
-SHA1 (patch-build__tools_mozc__version.py) = a6ff8a82b1328086b7d758f73a7d3c31e87bccc9
-SHA1 (patch-build__tools_util.py) = c7daafd5ee0f8f5dcb1130a6d230f9821c3a3a12
-SHA1 (patch-client_client.cc) = 014ab13164e17a490896303bd2ad2eab2589eae9
-SHA1 (patch-config_stats__config__util__test.cc) = 0d1fc3b9050f489a615dd0ad42c41faf2096c282
-SHA1 (patch-gui_base_locale__util.cc) = 67159274882110f2e54953ab5d059c8357aeadec
-SHA1 (patch-gui_config__dialog_config__dialog.cc) = 643f777be01c29070d317a179caf3b646a95033a
-SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 462ff2b33303c63709d72ff5cfabc5fe2f4e383a
-SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608
-SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
-SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = bd9db643c207f9810d33d596e050453c18593497
-SHA1 (patch-gyp_common.gypi) = bad5e98e6a110e4b04a8c2f8dcb813d9ccf626e5
-SHA1 (patch-handwriting_zinnia.gyp) = 8e0a5d398124666000c3fb84c50616460ddb5b33
-SHA1 (patch-handwriting_zinnia__handwriting.cc) = 8d7950a9c98408df9e78550515aa9471eb277bbf
-SHA1 (patch-ipc_ipc__path__manager.cc) = c96fbac6d1d81ddd7f999c30bdc2539ee2df2564
-SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2939fbdf
+SHA1 (patch-base_password__manager.cc) = 8216bc58d398fae4935e99fe5d11febbee380644
+SHA1 (patch-base_port.h) = 775b8a5afe2336218fc936d009bae9f6b13a4379
+SHA1 (patch-base_process.cc) = 1cba930ffdf14694fa55e473c2e94ee2cf523de4
+SHA1 (patch-base_run__level.cc) = 849a6a6727463305c2fdca4eed0fb4a4cac10567
+SHA1 (patch-base_system__util.cc) = c4d81bb3d4633a11d969520af610c3e10417ab4e
+SHA1 (patch-base_thread.cc) = 2cc63c1d369f842a29e07311364c2a3537f3b428
+SHA1 (patch-build__mozc.py) = 5fd1e328c9a35cc01a507566afeda1179657e685
+SHA1 (patch-build__tools_mozc__version.py) = 7130eac051d0d4f78da887aedd669fc4713dbd62
+SHA1 (patch-build__tools_util.py) = 5ca614adf2453fcc33c18cda74c0d9b2e4f6bc21
+SHA1 (patch-client_client.cc) = f1eb1860c41a97c82a338f74acdcf0ed3477b6da
+SHA1 (patch-config_stats__config__util__test.cc) = 3514f04a921908795c03d0e8685135297dc9e2af
+SHA1 (patch-gui_config__dialog_config__dialog.cc) = de2750a6bf99c4e38983cf5322adae8c46ca45d6
+SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 529e902c146907d3a91181bad3822bbbec69b6b7
+SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = cae617cc8e324b0f93adc1e76632a018530cd2c7
+SHA1 (patch-gui_qt__libraries.gypi) = ceb8d5b15d4cd5b2d907406f02413290bd4ab652
+SHA1 (patch-gui_qt__moc.gypi) = e3d42e61b35012cda10da13aa03cee67786e171c
+SHA1 (patch-gui_qt__rcc.gypi) = d38a849fe8e81672eb441a41936f454d8e45ff5c
+SHA1 (patch-gui_qt__uic.gypi) = 7dd69ee109e81f0e70f2866b77555412518b4844
+SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 6e247fcab5d570b733365b57c5a5d72a021dd16f
+SHA1 (patch-gyp_common.gypi) = 13cd5010a6f3ed314a94248144657955f8bbbe72
+SHA1 (patch-gyp_directories.gypi) = 6504d8b43f83be3908b39a5e51598c2aba0dffd9
+SHA1 (patch-handwriting_zinnia.gyp) = b59e546cb9b8b91dcd627885e1853e8ba8dead46
+SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd87817aabcd290c9fb25f3ebe4f36ce670ae44b
+SHA1 (patch-ipc_ipc__path__manager.cc) = 533d37b3802385873450ebeef561425aef7d9c63
+SHA1 (patch-ipc_ipc__path__manager__test.cc) = 1b83b513383f184f5ab5a56cce734b7934998533
 SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
-SHA1 (patch-ipc_unix__ipc.cc) = 112397bc3fb6b04a816677f891f75e4c67eb59c1
-SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
-SHA1 (patch-protobuf_protobuf.gyp) = 35059f0e24a9d47ca5224a892de84890d72acdf4
-SHA1 (patch-session_session.cc) = 21ce71225ea6885bff7160aed832974ef34876f2
-SHA1 (patch-session_session__test.cc) = a3e208c37078b223d4ea0fb6fb8a603f2f5fee19
-SHA1 (patch-third__party_protobuf_post__process__dist.sh) = 790c167c3c62a1f8360d130accf7ed7280baf9b5
-SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 1ac5fb40b774dc751c2d01a13ca55b6a995eed34
-SHA1 (patch-unix_ibus_ibus.gyp) = 2fc9309216270846f7ce33d1854d9d76e65e6e96
+SHA1 (patch-ipc_unix__ipc.cc) = 25107c2e84844ecaa3445efb48cc3f2795579dec
+SHA1 (patch-net_net.gyp) = 61353724533f9239f4c58fa37f0a8fb2eb5552c3
+SHA1 (patch-session_session.cc) = 773017ac54e79239f6734a124f457b0b81bb1ced
+SHA1 (patch-session_session__test.cc) = 99165b29555844a40d30cf5554cc5c66773b70ed
+SHA1 (patch-third__party_protobuf_post__process__dist.sh) = 8adc79d5d7eed3cbf406ebcfbd5832b7a050ced6
+SHA1 (patch-unix_ibus_ibus.gyp) = aa2077cf3c379bf9ce33e97abe478540346782ad
+SHA1 (patch-unix_ibus_path__util.cc) = a6aa368d9ce8926e200602fdc370c13e35d5a8cf

Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_clock.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_clock.cc:1.1 pkgsrc/inputmethod/mozc-server/patches/patch-base_clock.cc:1.2
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_clock.cc:1.1      Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_clock.cc  Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_clock.cc,v 1.1 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_clock.cc,v 1.2 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/clock.cc.orig 2016-05-15 08:11:10.000000000 +0000
 +++ base/clock.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-net_net.gyp
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-net_net.gyp:1.1 pkgsrc/inputmethod/mozc-server/patches/patch-net_net.gyp:1.2
--- pkgsrc/inputmethod/mozc-server/patches/patch-net_net.gyp:1.1        Mon Apr 29 09:52:18 2013
+++ pkgsrc/inputmethod/mozc-server/patches/patch-net_net.gyp    Sun Dec 17 14:15:43 2017
@@ -1,8 +1,10 @@
-$NetBSD: patch-net_net.gyp,v 1.1 2013/04/29 09:52:18 ryoon Exp $
+$NetBSD: patch-net_net.gyp,v 1.2 2017/12/17 14:15:43 tsutsui Exp $
 
---- net/net.gyp.orig   2013-03-29 04:33:42.000000000 +0000
+* NetBSD support
+
+--- net/net.gyp.orig   2017-11-02 13:32:47.000000000 +0000
 +++ net/net.gyp
-@@ -61,7 +61,7 @@
+@@ -64,7 +64,7 @@
                  },
                },
              }],
@@ -10,4 +12,4 @@ $NetBSD: patch-net_net.gyp,v 1.1 2013/04
 +            ['target_platform=="Linux" or target_platform=="NetBSD"', {
                # Enable libcurl
                'cflags': [
-                 '<!@(<(pkg_config_command) --cflags libcurl)',
+                 '<!@(pkg-config --cflags libcurl)',
Index: pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp:1.1 pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp:1.2
--- pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp:1.1 Sun Jun 15 13:08:34 2014
+++ pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp     Sun Dec 17 14:15:43 2017
@@ -1,6 +1,8 @@
-$NetBSD: patch-unix_ibus_ibus.gyp,v 1.1 2014/06/15 13:08:34 ryoon Exp $
+$NetBSD: patch-unix_ibus_ibus.gyp,v 1.2 2017/12/17 14:15:43 tsutsui Exp $
 
---- unix/ibus/ibus.gyp.orig    2014-05-21 10:49:56.000000000 +0000
+* use ${PREFIX} paths
+
+--- unix/ibus/ibus.gyp.orig    2017-11-02 13:32:47.000000000 +0000
 +++ unix/ibus/ibus.gyp
 @@ -31,8 +31,8 @@
    'variables': {

Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc:1.2 Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc     Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_cpu__stats.cc,v 1.2 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_cpu__stats.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/cpu_stats.cc.orig     2016-05-15 08:11:10.000000000 +0000
 +++ base/cpu_stats.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py:1.2      Sun Jan 19 01:18:50 2014
+++ pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py  Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-build__tools_mozc__version.py,v 1.2 2014/01/19 01:18:50 ryoon Exp $
+$NetBSD: patch-build__tools_mozc__version.py,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- build_tools/mozc_version.py.orig   2014-01-06 07:10:26.000000000 +0000
 +++ build_tools/mozc_version.py
Index: pkgsrc/inputmethod/mozc-server/patches/patch-client_client.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-client_client.cc:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-client_client.cc:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-client_client.cc:1.2   Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-client_client.cc       Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-client_client.cc,v 1.2 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-client_client.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- client/client.cc.orig      2016-05-15 08:11:10.000000000 +0000
 +++ client/client.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-config_stats__config__util__test.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-config_stats__config__util__test.cc:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-config_stats__config__util__test.cc:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-config_stats__config__util__test.cc:1.2        Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-config_stats__config__util__test.cc    Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-config_stats__config__util__test.cc,v 1.2 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-config_stats__config__util__test.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- config/stats_config_util_test.cc.orig      2016-05-15 08:11:10.000000000 +0000
 +++ config/stats_config_util_test.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_keybinding__editor.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_keybinding__editor.cc:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_keybinding__editor.cc:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_keybinding__editor.cc:1.2   Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_keybinding__editor.cc       Sun Dec 17 14:15:43 2017
@@ -1,6 +1,8 @@
-$NetBSD: patch-gui_config__dialog_keybinding__editor.cc,v 1.2 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-gui_config__dialog_keybinding__editor.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
 
---- gui/config_dialog/keybinding_editor.cc.orig        2016-05-15 08:11:11.000000000 +0000
+* NetBSD support
+
+--- gui/config_dialog/keybinding_editor.cc.orig        2017-11-02 13:32:47.000000000 +0000
 +++ gui/config_dialog/keybinding_editor.cc
 @@ -37,7 +37,7 @@
  #include <windows.h>
@@ -11,7 +13,7 @@ $NetBSD: patch-gui_config__dialog_keybin
  #define XK_MISCELLANY
  #include <X11/keysymdef.h>
  #endif
-@@ -125,7 +125,7 @@ const WinVirtualKeyEntry kWinVirtualKeyM
+@@ -128,7 +128,7 @@ const WinVirtualKeyEntry kWinVirtualKeyM
    { VK_DBE_DBCSCHAR, "Hankaku/Zenkaku" },        // Zenkaku/hankaku
    // { VK_KANJI, "Kanji" },  // Do not support Kanji
  };
@@ -20,7 +22,7 @@ $NetBSD: patch-gui_config__dialog_keybin
  struct LinuxVirtualKeyEntry {
    uint16 virtual_key;
    const char *mozc_key_name;
-@@ -394,7 +394,7 @@ KeyBindingFilter::KeyState KeyBindingFil
+@@ -397,7 +397,7 @@ KeyBindingFilter::KeyState KeyBindingFil
        return Encode(result);
      }
    }
@@ -29,11 +31,11 @@ $NetBSD: patch-gui_config__dialog_keybin
    const uint16 virtual_key = key_event.nativeVirtualKey();
  
    // The XKB defines three types of logical key code: "xkb::Hiragana",
-@@ -504,7 +504,7 @@ bool KeyBindingFilter::eventFilter(QObje
+@@ -507,7 +507,7 @@ bool KeyBindingFilter::eventFilter(QObje
  KeyBindingEditor::KeyBindingEditor(QWidget *parent, QWidget *trigger_parent)
      : QDialog(parent), trigger_parent_(trigger_parent) {
    setupUi(this);
--#ifdef OS_LINUX
+-#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_NETBSD)
    // Workaround for the issue https://github.com/google/mozc/issues/9
    // Seems that even after clicking the button for the keybinding dialog,
Index: pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp:1.2     Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp Sun Dec 17 14:15:43 2017
@@ -1,9 +1,11 @@
-$NetBSD: patch-handwriting_zinnia.gyp,v 1.2 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-handwriting_zinnia.gyp,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
 
---- handwriting/zinnia.gyp.orig        2016-05-15 08:11:11.000000000 +0000
+* NetBSD support
+
+--- handwriting/zinnia.gyp.orig        2017-11-02 13:32:47.000000000 +0000
 +++ handwriting/zinnia.gyp
-@@ -80,7 +80,7 @@
-                 'VERSION="0.06"',
+@@ -88,7 +88,7 @@
+                 'ZINNIA_STATIC_LIBRARY',
                ],
              }],
 -            ['target_platform=="Linux" or target_platform=="Mac"', {
Index: pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager__test.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager__test.cc:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager__test.cc:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager__test.cc:1.2    Sat Jul 20 04:34:53 2013
+++ pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager__test.cc        Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-ipc_ipc__path__manager__test.cc,v 1.2 2013/07/20 04:34:53 ryoon Exp $
+$NetBSD: patch-ipc_ipc__path__manager__test.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- ipc/ipc_path_manager_test.cc.orig  2013-07-17 02:37:50.000000000 +0000
 +++ ipc/ipc_path_manager_test.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-session_session__test.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-session_session__test.cc:1.2 pkgsrc/inputmethod/mozc-server/patches/patch-session_session__test.cc:1.3
--- pkgsrc/inputmethod/mozc-server/patches/patch-session_session__test.cc:1.2   Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-session_session__test.cc       Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-session_session__test.cc,v 1.2 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-session_session__test.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- session/session_test.cc.orig       2016-05-15 08:11:12.000000000 +0000
 +++ session/session_test.cc

Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_logging.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_logging.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-base_logging.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_logging.cc:1.4    Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_logging.cc        Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_logging.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_logging.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/logging.cc.orig       2016-05-15 08:11:10.000000000 +0000
 +++ base/logging.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_mutex.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_mutex.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-base_mutex.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_mutex.cc:1.4      Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_mutex.cc  Sun Dec 17 14:15:43 2017
@@ -1,6 +1,8 @@
-$NetBSD: patch-base_mutex.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_mutex.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
 
---- base/mutex.cc.orig 2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+
+--- base/mutex.cc.orig 2017-11-02 13:32:45.000000000 +0000
 +++ base/mutex.cc
 @@ -53,7 +53,7 @@ namespace mozc {
  
@@ -19,8 +21,8 @@ $NetBSD: patch-base_mutex.cc,v 1.4 2016/
 +#endif  // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD
  
  // Use OSAtomicCompareAndSwapInt on Mac OSX
- // http://developer.apple.com/iphone/library/documentation/
-@@ -85,7 +85,7 @@ inline int InterlockedCompareExchange(vo
+ // https://developer.apple.com/library/prerelease/mac/documentation/Darwin/Reference/ManPages/man3/OSAtomicCompareAndSwapInt.3.html
+@@ -84,7 +84,7 @@ inline int InterlockedCompareExchange(vo
    return OSAtomicCompareAndSwapInt(old_value, new_value, target)
        ? old_value : *target;
  }
@@ -29,7 +31,7 @@ $NetBSD: patch-base_mutex.cc,v 1.4 2016/
  
  }  // namespace
  
-@@ -183,7 +183,7 @@ Mutex::Mutex() {
+@@ -182,7 +182,7 @@ Mutex::Mutex() {
    // PTHREAD_MUTEX_RECURSIVE_NP but Mac OS X 10.5 does not
    pthread_mutexattr_t attr;
    pthread_mutexattr_init(&attr);
Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_process.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_process.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-base_process.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_process.cc:1.4    Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_process.cc        Sun Dec 17 14:15:43 2017
@@ -1,8 +1,10 @@
-$NetBSD: patch-base_process.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_process.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
 
---- base/process.cc.orig       2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+
+--- base/process.cc.orig       2017-11-02 13:32:45.000000000 +0000
 +++ base/process.cc
-@@ -46,12 +46,12 @@
+@@ -44,12 +44,12 @@
  #include "base/mac_process.h"
  #endif  // OS_MACOSX
  
@@ -17,8 +19,8 @@ $NetBSD: patch-base_process.cc,v 1.4 201
  
  #include <cstdlib>
  #include <memory>
-@@ -125,12 +125,12 @@ bool Process::OpenBrowser(const string &
-   return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW);
+@@ -96,12 +96,12 @@ bool Process::OpenBrowser(const string &
+   return WinUtil::ShellExecuteInSystemDir(L"open", wurl.c_str(), nullptr);
  #endif
  
 -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
@@ -33,7 +35,7 @@ $NetBSD: patch-base_process.cc,v 1.4 201
  
  #ifdef OS_MACOSX
    return MacProcess::OpenBrowserForMac(url);
-@@ -209,7 +209,7 @@ bool Process::SpawnProcess(const string 
+@@ -180,7 +180,7 @@ bool Process::SpawnProcess(const string 
    }
  #endif
  
@@ -42,7 +44,7 @@ $NetBSD: patch-base_process.cc,v 1.4 201
    // Do not call posix_spawn() for obviously bad path.
    if (!S_ISREG(statbuf.st_mode)) {
      LOG(ERROR) << "Not a regular file: " << path;
-@@ -232,7 +232,7 @@ bool Process::SpawnProcess(const string 
+@@ -203,7 +203,7 @@ bool Process::SpawnProcess(const string 
    // (www.gnu.org/software/libc/manual/html_node/Heap-Consistency-Checking.html)
    const int kOverwrite = 0;  // Do not overwrite.
    ::setenv("MALLOC_CHECK_", "2", kOverwrite);
@@ -51,7 +53,7 @@ $NetBSD: patch-base_process.cc,v 1.4 201
    pid_t tmp_pid = 0;
  
    // Spawn new process.
-@@ -403,7 +403,7 @@ bool Process::LaunchErrorMessageDialog(c
+@@ -374,7 +374,7 @@ bool Process::LaunchErrorMessageDialog(c
    }
  #endif  // OS_WIN
  
@@ -60,7 +62,7 @@ $NetBSD: patch-base_process.cc,v 1.4 201
    const char kMozcTool[] = "mozc_tool";
    const string arg = "--mode=error_message_dialog --error_type=" + error_type;
    size_t pid = 0;
-@@ -411,7 +411,7 @@ bool Process::LaunchErrorMessageDialog(c
+@@ -382,7 +382,7 @@ bool Process::LaunchErrorMessageDialog(c
      LOG(ERROR) << "cannot launch " << kMozcTool;
      return false;
    }
Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_run__level.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_run__level.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-base_run__level.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_run__level.cc:1.4 Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_run__level.cc     Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_run__level.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_run__level.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/run_level.cc.orig     2016-05-15 08:11:10.000000000 +0000
 +++ base/run_level.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_system__util.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_system__util.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-base_system__util.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_system__util.cc:1.4       Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_system__util.cc   Sun Dec 17 14:15:43 2017
@@ -1,8 +1,10 @@
-$NetBSD: patch-base_system__util.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_system__util.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
 
---- base/system_util.cc.orig   2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+
+--- base/system_util.cc.orig   2017-11-02 13:32:45.000000000 +0000
 +++ base/system_util.cc
-@@ -372,11 +372,11 @@ string SystemUtil::GetServerDirectory() 
+@@ -372,7 +372,7 @@ string SystemUtil::GetServerDirectory() 
  #elif defined(OS_MACOSX)
    return MacUtil::GetServerDirectory();
  
@@ -11,11 +13,6 @@ $NetBSD: patch-base_system__util.cc,v 1.
  #if defined(MOZC_SERVER_DIRECTORY)
    return MOZC_SERVER_DIRECTORY;
  #else
--  return "/usr/lib/mozc";
-+  return "@PREFIX@/lib/mozc";
- #endif  // MOZC_SERVER_DIRECTORY
- 
- #endif  // OS_WIN, OS_MACOSX, OS_LINUX, ...
 @@ -450,7 +450,7 @@ string SystemUtil::GetUserNameAsString()
    return ppw->pw_name;
  
@@ -34,16 +31,7 @@ $NetBSD: patch-base_system__util.cc,v 1.
    const char *display = getenv("DISPLAY");
    if (display == NULL) {
      return "";
-@@ -691,7 +691,7 @@ bool SystemUtil::IsPlatformSupported() {
- #if defined(OS_MACOSX)
-   // TODO(yukawa): support Mac.
-   return true;
--#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
-   // TODO(yukawa): support Linux.
-   return true;
- #elif defined(OS_WIN)
-@@ -930,10 +930,13 @@ string SystemUtil::GetOSVersionString() 
+@@ -812,6 +812,9 @@ string SystemUtil::GetOSVersionString() 
  #elif defined(OS_LINUX) || defined(OS_NACL)
    const string ret = "Linux";
    return ret;
@@ -53,12 +41,7 @@ $NetBSD: patch-base_system__util.cc,v 1.
  #else  // !OS_WIN && !OS_MACOSX && !OS_LINUX
    const string ret = "Unknown";
    return ret;
--#endif  // OS_WIN, OS_MACOSX, OS_LINUX
-+#endif  // OS_WIN, OS_MACOSX, OS_LINUX, OS_NETBSD
- }
- 
- bool SystemUtil::MacOSVersionIsGreaterOrEqual(int32 major,
-@@ -977,7 +980,7 @@ uint64 SystemUtil::GetTotalPhysicalMemor
+@@ -847,7 +850,7 @@ uint64 SystemUtil::GetTotalPhysicalMemor
      return 0;
    }
    return total_memory;
@@ -67,7 +50,7 @@ $NetBSD: patch-base_system__util.cc,v 1.
  #if defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
    const long page_size = sysconf(_SC_PAGESIZE);
    const long number_of_phyisical_pages = sysconf(_SC_PHYS_PAGES);
-@@ -992,7 +995,7 @@ uint64 SystemUtil::GetTotalPhysicalMemor
+@@ -862,7 +865,7 @@ uint64 SystemUtil::GetTotalPhysicalMemor
  #endif  // defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
  #else  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
  #error "unknown platform"
@@ -75,4 +58,4 @@ $NetBSD: patch-base_system__util.cc,v 1.
 +#endif  // OS_WIN, OS_MACOSX, OS_LINUX, OS_NETBSD
  }
  
- bool SystemUtil::IsLittleEndian() {
+ }  // namespace mozc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_util.py
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_util.py:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_util.py:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_util.py:1.4       Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-build__tools_util.py   Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-build__tools_util.py,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-build__tools_util.py,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- build_tools/util.py.orig   2016-05-15 08:11:10.000000000 +0000
 +++ build_tools/util.py
Index: pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc:1.4  Sun Jan 19 01:18:50 2014
+++ pkgsrc/inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc      Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-ipc_ipc__path__manager.cc,v 1.4 2014/01/19 01:18:50 ryoon Exp $
+$NetBSD: patch-ipc_ipc__path__manager.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- ipc/ipc_path_manager.cc.orig       2014-01-06 07:10:26.000000000 +0000
 +++ ipc/ipc_path_manager.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc:1.4   Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc       Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-ipc_unix__ipc.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-ipc_unix__ipc.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- ipc/unix_ipc.cc.orig       2016-05-15 08:11:11.000000000 +0000
 +++ ipc/unix_ipc.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-session_session.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-session_session.cc:1.4 pkgsrc/inputmethod/mozc-server/patches/patch-session_session.cc:1.5
--- pkgsrc/inputmethod/mozc-server/patches/patch-session_session.cc:1.4 Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-session_session.cc     Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-session_session.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-session_session.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- session/session.cc.orig    2016-05-15 08:11:12.000000000 +0000
 +++ session/session.cc

Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_password__manager.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_password__manager.cc:1.3 pkgsrc/inputmethod/mozc-server/patches/patch-base_password__manager.cc:1.4
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_password__manager.cc:1.3  Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_password__manager.cc      Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_password__manager.cc,v 1.3 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_password__manager.cc,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/password_manager.cc.orig      2016-05-15 08:11:10.000000000 +0000
 +++ base/password_manager.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_port.h
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-base_port.h:1.3 pkgsrc/inputmethod/mozc-server/patches/patch-base_port.h:1.4
--- pkgsrc/inputmethod/mozc-server/patches/patch-base_port.h:1.3        Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_port.h    Sun Dec 17 14:15:43 2017
@@ -1,19 +1,21 @@
-$NetBSD: patch-base_port.h,v 1.3 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_port.h,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
 
---- base/port.h.orig   2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+* kludge to build with gcc45
+
+--- base/port.h.orig   2017-11-02 13:32:45.000000000 +0000
 +++ base/port.h
-@@ -56,6 +56,10 @@
+@@ -56,6 +56,9 @@
  #endif  // !OS_ANDROID && !OS_NACL
  #endif  // OS_LINUX
  
 +#ifdef OS_NETBSD
 +#define MOZC_OS_DEFINED
 +#endif  // OS_NETBSD
-+
+ 
  #ifndef MOZC_OS_DEFINED
  #error "OS_XXX (e.g., OS_WIN) must be defined."
- #endif  // !MOZC_OS_DEFINED
-@@ -157,4 +161,9 @@ static const  int64 kint64max  = (( int6
+@@ -154,4 +157,9 @@ static const  int64 kint64max  = (( int6
  #define AS_STRING(x)   AS_STRING_INTERNAL(x)
  #define AS_STRING_INTERNAL(x)   #x
  
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi:1.3 pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi:1.4
--- pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi:1.3     Sun Jun 15 13:08:34 2014
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi Sun Dec 17 14:15:43 2017
@@ -1,13 +1,15 @@
-$NetBSD: patch-gui_qt__libraries.gypi,v 1.3 2014/06/15 13:08:34 ryoon Exp $
+$NetBSD: patch-gui_qt__libraries.gypi,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
 
---- gui/qt_libraries.gypi.orig 2014-05-21 10:51:21.000000000 +0000
+* NetBSD support
+
+--- gui/qt_libraries.gypi.orig 2017-11-02 13:32:47.000000000 +0000
 +++ gui/qt_libraries.gypi
-@@ -84,7 +84,7 @@
+@@ -98,7 +98,7 @@
          '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
        ]
      }],
--    ['OS=="linux"', {
-+    ['OS=="linux" or OS=="netbsd"', {
-       'conditions': [
-         ['qt_dir', {
-           'libraries': [
+-    ['target_platform=="Linux"', {
++    ['target_platform=="Linux" or target_platform=="NetBSD"', {
+       'cflags': ['<!@(pkg-config --cflags Qt5Widgets Qt5Gui Qt5Core)'],
+       'libraries': ['<!@(pkg-config --libs Qt5Widgets Qt5Gui Qt5Core)'],
+     }],
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc:1.3 
pkgsrc/inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc:1.4
--- pkgsrc/inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc:1.3       Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc   Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-gui_word__register__dialog_word__register__dialog.cc,v 1.3 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-gui_word__register__dialog_word__register__dialog.cc,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- gui/word_register_dialog/word_register_dialog.cc.orig      2016-05-15 08:11:11.000000000 +0000
 +++ gui/word_register_dialog/word_register_dialog.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc:1.3 pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc:1.4
--- pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc:1.3 Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc     Sun Dec 17 14:15:43 2017
@@ -1,15 +1,15 @@
-$NetBSD: patch-handwriting_zinnia__handwriting.cc,v 1.3 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-handwriting_zinnia__handwriting.cc,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
 
 * Not confirmed yet.
 
---- handwriting/zinnia_handwriting.cc.orig     2016-05-15 08:11:11.000000000 +0000
+--- handwriting/zinnia_handwriting.cc.orig     2017-11-02 13:32:47.000000000 +0000
 +++ handwriting/zinnia_handwriting.cc
 @@ -59,7 +59,7 @@ string ZinniaHandwriting::GetModelFileNa
-   return FileUtil::JoinPath(MacUtil::GetResourcesDirectory(), kModelFile);
- #elif defined(OS_LINUX)
-   const char kModelFile[] =
--      "/usr/share/tegaki/models/zinnia/handwriting-ja.model";
-+      "@PREFIX@/share/tegaki/models/zinnia/handwriting-ja.model";
-   return kModelFile;
- #else
    const char kModelFile[] = "handwriting-ja.model";
+   return FileUtil::JoinPath(MacUtil::GetResourcesDirectory(), kModelFile);
+ #else  // OS_LINUX
+-  return "/usr/share/tegaki/models/zinnia/handwriting-ja.model";
++  return "@PREFIX@/tegaki/models/zinnia/handwriting-ja.model";
+ #endif
+ #endif  // else defined(MOZC_BUILD)
+ }
Index: pkgsrc/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh:1.3 pkgsrc/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh:1.4
--- pkgsrc/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh:1.3       Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh   Sun Dec 17 14:15:43 2017
@@ -1,6 +1,8 @@
-$NetBSD: patch-third__party_protobuf_post__process__dist.sh,v 1.3 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-third__party_protobuf_post__process__dist.sh,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
 
---- third_party/protobuf/post_process_dist.sh.orig     2016-05-15 08:11:12.000000000 +0000
+* appease pkglint
+
+--- third_party/protobuf/post_process_dist.sh.orig     2017-11-02 13:35:43.000000000 +0000
 +++ third_party/protobuf/post_process_dist.sh
 @@ -15,7 +15,7 @@
  #    non-testdata .txt files are converted to Windows-style line endings.
@@ -8,6 +10,6 @@ $NetBSD: patch-third__party_protobuf_pos
  
 -if [ "$1" == "" ]; then
 +if [ "$1" = "" ]; then
-   echo "USAGE:  $1 DISTFILE" >&2
+   echo "USAGE:  $0 DISTFILE" >&2
    exit 1
  fi

Index: pkgsrc/inputmethod/mozc-server/patches/patch-build__mozc.py
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-build__mozc.py:1.8 pkgsrc/inputmethod/mozc-server/patches/patch-build__mozc.py:1.9
--- pkgsrc/inputmethod/mozc-server/patches/patch-build__mozc.py:1.8     Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-build__mozc.py Sun Dec 17 14:15:43 2017
@@ -1,6 +1,8 @@
-$NetBSD: patch-build__mozc.py,v 1.8 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-build__mozc.py,v 1.9 2017/12/17 14:15:43 tsutsui Exp $
 
---- build_mozc.py.orig 2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+
+--- build_mozc.py.orig 2017-11-02 13:32:45.000000000 +0000
 +++ build_mozc.py
 @@ -58,6 +58,7 @@ from build_tools.util import GetNumberOf
  from build_tools.util import GetRelPath
@@ -10,16 +12,15 @@ $NetBSD: patch-build__mozc.py,v 1.8 2016
  from build_tools.util import IsWindows
  from build_tools.util import PrintErrorAndExit
  from build_tools.util import RemoveDirectoryRecursively
-@@ -123,6 +124,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':
-@@ -223,6 +226,12 @@ def GetGypFileNames(options):
+@@ -102,6 +103,7 @@ def GetBuildShortBaseName(target_platfor
+       'Windows': 'out_win',
+       'Mac': 'out_mac',
+       'Linux': 'out_linux',
++      'NetBSD': 'out_bsd',
+       'Android': 'out_android',
+       'NaCl': 'out_nacl'
+   }
+@@ -179,6 +181,12 @@ def GetGypFileNames(options):
    elif options.target_platform == 'Android':
      # Add Android Mozc gyp scripts.
      gyp_file_names.extend(glob.glob('%s/android/*/*.gyp' % SRC_DIR))
@@ -32,7 +33,7 @@ $NetBSD: patch-build__mozc.py,v 1.8 2016
    gyp_file_names.sort()
    return gyp_file_names
  
-@@ -318,6 +327,8 @@ def AddTargetPlatformOption(parser):
+@@ -243,6 +251,8 @@ def AddTargetPlatformOption(parser):
    # If you want Android build, specify "Android".
    if IsLinux():
      default_target = 'Linux'
@@ -41,7 +42,7 @@ $NetBSD: patch-build__mozc.py,v 1.8 2016
    elif IsWindows():
      default_target = 'Windows'
    elif IsMac():
-@@ -497,6 +508,12 @@ def ExpandMetaTarget(options, meta_targe
+@@ -410,6 +420,12 @@ 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')
@@ -54,7 +55,27 @@ $NetBSD: patch-build__mozc.py,v 1.8 2016
    elif target_platform == 'Mac':
      targets = [SRC_DIR + '/mac/mac.gyp:DiskImage']
    elif target_platform == 'Windows':
-@@ -753,7 +770,8 @@ def GypMain(options, unused_args, _):
+@@ -585,7 +601,8 @@ def GypMain(options, unused_args):
+   if options.noqt or target_platform in ['Android', 'NaCl']:
+     gyp_options.extend(['-D', 'use_qt=NO'])
+     gyp_options.extend(['-D', 'qt_dir='])
+-  elif target_platform == 'Linux':
++  elif (target_platform == 'Linux' or
++       target_platform == 'NetBSD'):
+     gyp_options.extend(['-D', 'use_qt=YES'])
+     gyp_options.extend(['-D', 'qt_dir='])
+ 
+@@ -607,7 +624,8 @@ def GypMain(options, unused_args):
+   else:
+     gyp_options.extend(['-D', 'use_wix=NO'])
+ 
+-  if target_platform == 'Linux':
++  if (target_platform == 'Linux' or
++       target_platform == 'NetBSD'): 
+     gyp_options.extend(['-D', 'enable_gtk_renderer=1'])
+ 
+   # Android
+@@ -653,7 +671,8 @@ def GypMain(options, unused_args):
      gyp_options.extend(['-D', 'channel_dev=1'])
  
    def SetCommandLineForFeature(option_name, windows=False, mac=False,
@@ -64,7 +85,7 @@ $NetBSD: patch-build__mozc.py,v 1.8 2016
      """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
-@@ -775,6 +793,8 @@ def GypMain(options, unused_args, _):
+@@ -675,6 +694,8 @@ def GypMain(options, unused_args):
            option on Android platform.
        nacl: A boolean which replesents the default value of the target
            option on NaCl.
@@ -73,15 +94,15 @@ $NetBSD: patch-build__mozc.py,v 1.8 2016
  
      Raises:
        ValueError: An error occurred when 'option_name' is empty.
-@@ -786,6 +806,7 @@ def GypMain(options, unused_args, _):
+@@ -685,6 +706,7 @@ def GypMain(options, unused_args):
      default_enabled = {'Windows': windows,
                         'Mac': mac,
                         'Linux': linux,
 +                       'NetBSD': netbsd,
                         'Android': android,
-                        'NaCl': nacl}[options.target_platform]
+                        'NaCl': nacl}.get(target_platform, False)
      enable_option_name = 'enable_%s' % option_name
-@@ -798,6 +819,7 @@ def GypMain(options, unused_args, _):
+@@ -697,6 +719,7 @@ def GypMain(options, unused_args):
  
    SetCommandLineForFeature(option_name='cloud_handwriting',
                             linux=is_official_dev,
@@ -89,29 +110,20 @@ $NetBSD: patch-build__mozc.py,v 1.8 2016
                             windows=is_official_dev,
                             mac=is_official_dev)
  
-@@ -825,7 +847,8 @@ def GypMain(options, unused_args, _):
-   else:
-     gyp_options.extend(['-D', 'use_dynamically_linked_qt=0'])
- 
--  if (options.target_platform == 'Linux' and
-+  if ((options.target_platform == 'Linux' or
-+       options.target_platform == 'NetBSD') and
+@@ -706,7 +729,8 @@ def GypMain(options, unused_args):
+   if IsWindows():
+     gyp_options.extend(['-G', 'msvs_version=2015'])
+ 
+-  if (target_platform == 'Linux' and
++  if ((target_platform == 'Linux' or
++       target_platform == 'NetBSD') and
        '%s/unix/ibus/ibus.gyp' % SRC_DIR in gyp_file_names):
      gyp_options.extend(['-D', 'use_libibus=1'])
  
-@@ -857,7 +880,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='])
-@@ -1282,7 +1305,7 @@ def CleanBuildFilesAndDirectories(option
-                                      GetMozcVersion().GetTargetPlatform())
-   if target_platform:
-     directory_names.append(target_platform)
+@@ -1163,7 +1187,7 @@ def CleanMain(options, unused_args):
+     if build_base:
+       directory_names.append(build_base)
+ 
 -  if IsLinux():
 +  if IsLinux() or IsNetBSD():
      # Remove auto-generated files.
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi:1.8 pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi:1.9
--- pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi:1.8    Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi        Sun Dec 17 14:15:43 2017
@@ -1,63 +1,45 @@
-$NetBSD: patch-gyp_common.gypi,v 1.8 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-gyp_common.gypi,v 1.9 2017/12/17 14:15:43 tsutsui Exp $
 
---- gyp/common.gypi.orig       2016-05-15 08:11:11.000000000 +0000
+* NetBSD support
+
+--- gyp/common.gypi.orig       2017-11-02 13:32:47.000000000 +0000
 +++ gyp/common.gypi
-@@ -158,7 +158,7 @@
+@@ -88,6 +88,12 @@
+       '-fstack-protector',
+       '--param=ssp-buffer-size=4',
+     ],
++    # netbsd_cflags will be used for NetBSD.
++    'netbsd_cflags': [
++      '<@(gcc_cflags)',
++      '-fPIC',
++      '-fno-exceptions',
++    ],
+     # nacl_cflags will be used for NaCl.
+     # -fno-omit-frame-pointer flag does not work correctly.
+     #   http://code.google.com/p/chromium/issues/detail?id=122623
+@@ -133,6 +139,12 @@
          'compiler_host': 'clang',
          'compiler_host_version_int': 304,  # Clang 3.4 or higher
        }],
--      ['target_platform=="Linux"', {
-+      ['target_platform=="Linux" or target_platform=="NetBSD"', {
-         # enable_gtk_renderer represents if mozc_renderer is supported on Linux
-         # or not.
-         'compiler_target': 'clang',
-@@ -206,7 +206,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',
- 
-     # Represents the directory where the source code of protobuf is
-     # extracted. This value is ignored when 'use_libprotobuf' is 1.
-@@ -415,7 +415,7 @@
-           },
-         },
-         'conditions': [
--          ['OS=="linux"', {
-+          ['OS=="linux" or OS=="netbsd"', {
-             'cflags': [
-               '<@(debug_extra_cflags)',
-             ],
-@@ -481,7 +481,7 @@
-           },
-         },
-         'conditions': [
--          ['OS=="linux"', {
-+          ['OS=="linux" or OS=="netbsd"', {
-             'cflags': [
-               '<@(release_extra_cflags)',
-             ],
-@@ -578,7 +578,7 @@
-       ['channel_dev==1', {
-         'defines': ['CHANNEL_DEV'],
-       }],
--      ['OS=="linux"', {
-+      ['OS=="linux" or OS=="netbsd"', {
-         'ldflags': [
-           '<@(linux_ldflags)',
-         ],
-@@ -807,6 +807,22 @@
++      ['target_platform=="NetBSD"', {
++        'compiler_target': 'gcc',
++        'compiler_target_version_int': 409,  # GCC 4.9 or higher
++        'compiler_host': 'clang',
++        'compiler_host_version_int': 304,  # Clang 3.4 or higher
++      }],
+     ],
+   },
+   'target_defaults': {
+@@ -371,6 +383,24 @@
            }],
          ],
        }],
 +      ['OS=="netbsd"', {
 +        'defines': [
 +          'OS_NETBSD',
-+          'MOZC_SERVER_DIRECTORY="<@(server_dir)"',
 +        ],
 +        'cflags': [
-+          '<@(gcc_cflags)',
++          '<@(netbsd_cflags)',
 +          '-fPIC',
 +          '-fno-exceptions',
 +        ],
@@ -66,7 +48,19 @@ $NetBSD: patch-gyp_common.gypi,v 1.8 201
 +          # <unordered_map> and <unordered_set>.
 +          '-Wno-deprecated',
 +        ],
++        'ldflags': [
++          '-pthread',
++        ],
 +      }],
        ['OS=="mac"', {
          'defines': [
            'OS_MACOSX',
+@@ -442,7 +472,7 @@
+         ['READELF.host', '<!(which readelf)'],
+       ],
+     }],
+-    ['target_platform=="Linux"', {
++    ['target_platform=="Linux" or target_platform=="NetBSD"', {
+       'make_global_settings': [
+         ['AR', '<!(which ar)'],
+         ['CC', '<!(which clang)'],

Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc:1.5 pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc:1.6
--- pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc:1.5       Mon May 16 11:51:49 2016
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc   Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.5 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.6 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- gui/config_dialog/config_dialog.cc.orig    2016-05-15 08:11:11.000000000 +0000
 +++ gui/config_dialog/config_dialog.cc
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc:1.5 pkgsrc/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc:1.6
--- pkgsrc/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc:1.5   Sun Jun 15 13:08:34 2014
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc       Sun Dec 17 14:15:43 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.5 2014/06/15 13:08:34 ryoon Exp $
+$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.6 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- gui/dictionary_tool/dictionary_tool.cc.orig        2014-05-21 10:51:22.000000000 +0000
 +++ gui/dictionary_tool/dictionary_tool.cc

Index: pkgsrc/inputmethod/mozc-tool/Makefile
diff -u pkgsrc/inputmethod/mozc-tool/Makefile:1.30 pkgsrc/inputmethod/mozc-tool/Makefile:1.31
--- pkgsrc/inputmethod/mozc-tool/Makefile:1.30  Thu Aug 24 20:03:26 2017
+++ pkgsrc/inputmethod/mozc-tool/Makefile       Sun Dec 17 14:15:44 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.31 2017/12/17 14:15:44 tsutsui Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-tool-/}
-PKGREVISION=   7
 
 INSTALLATION_DIRS+=    libexec
 

Index: pkgsrc/inputmethod/uim-mozc/Makefile
diff -u pkgsrc/inputmethod/uim-mozc/Makefile:1.18 pkgsrc/inputmethod/uim-mozc/Makefile:1.19
--- pkgsrc/inputmethod/uim-mozc/Makefile:1.18   Thu Aug 24 20:03:26 2017
+++ pkgsrc/inputmethod/uim-mozc/Makefile        Sun Dec 17 14:15:44 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.19 2017/12/17 14:15:44 tsutsui Exp $
 
 PKGNAME=       uim-${DISTNAME}
-PKGREVISION=   7
 
 CONFLICTS+=    ibus-mozc<=1.13.1651.102
 

Added files:

Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_base.gyp
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-base_base.gyp:1.7
--- /dev/null   Sun Dec 17 14:15:44 2017
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_base.gyp  Sun Dec 17 14:15:43 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-base_base.gyp,v 1.7 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
+
+--- base/base.gyp.orig 2017-11-02 13:32:45.000000000 +0000
++++ base/base.gyp
+@@ -141,7 +141,7 @@
+             },
+           },
+         }],
+-        ['target_platform=="Linux" and server_dir!=""', {
++        ['(target_platform=="Linux" or target_platform=="NetBSD") and server_dir!=""', {
+           'defines': [
+             'MOZC_SERVER_DIRECTORY="<(server_dir)"',
+           ],

Index: pkgsrc/inputmethod/mozc-server/patches/patch-base_thread.cc
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-base_thread.cc:1.1
--- /dev/null   Sun Dec 17 14:15:44 2017
+++ pkgsrc/inputmethod/mozc-server/patches/patch-base_thread.cc Sun Dec 17 14:15:43 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-base_thread.cc,v 1.1 2017/12/17 14:15:43 tsutsui Exp $
+
+* tweak for NetBSD pthread_setname_np(3)
+
+--- base/thread.cc.orig        2017-11-02 13:32:45.000000000 +0000
++++ base/thread.cc
+@@ -145,9 +145,11 @@ void Thread::Start(const string &thread_
+     // NaCl doesn't support setname.
+ #elif defined(OS_MACOSX)
+     pthread_setname_np(thread_name.c_str());
+-#else  // !(OS_NACL | OS_MACOSX)
++#elif defined(OS_NETBSD)
++    pthread_setname_np(*state_->handle_, "%s", (void *)thread_name.c_str());
++#else  // !(OS_NACL | OS_MACOSX | OS_NETBSD)
+     pthread_setname_np(*state_->handle_, thread_name.c_str());
+-#endif  // !(OS_NACL | OS_MACOSX)
++#endif  // !(OS_NACL | OS_MACOSX | OS_NETBSD)
+   }
+ }
+ 
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__moc.gypi
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__moc.gypi:1.1
--- /dev/null   Sun Dec 17 14:15:44 2017
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__moc.gypi       Sun Dec 17 14:15:43 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-gui_qt__moc.gypi,v 1.1 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
+
+--- gui/qt_moc.gypi.orig       2017-11-02 13:32:47.000000000 +0000
++++ gui/qt_moc.gypi
+@@ -33,7 +33,7 @@
+ 
+   'variables': {
+     'conditions': [
+-      ['target_platform=="Linux"', {
++      ['target_platform=="Linux" or target_platform=="NetBSD"', {
+         'moc_path': '<!(pkg-config --variable=host_bins Qt5Core)/moc',
+       }, 'qt_dir', {
+         'moc_path': '<(qt_dir)/bin/moc<(EXECUTABLE_SUFFIX)',
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__rcc.gypi
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__rcc.gypi:1.1
--- /dev/null   Sun Dec 17 14:15:44 2017
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__rcc.gypi       Sun Dec 17 14:15:43 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-gui_qt__rcc.gypi,v 1.1 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
+
+--- gui/qt_rcc.gypi.orig       2017-11-02 13:32:47.000000000 +0000
++++ gui/qt_rcc.gypi
+@@ -33,7 +33,7 @@
+ 
+   'variables': {
+     'conditions': [
+-      ['target_platform=="Linux"', {
++      ['target_platform=="Linux" or target_platform=="NetBSD"', {
+         'rcc_path': '<!(pkg-config --variable=host_bins Qt5Core)/rcc',
+       }, 'qt_dir', {
+         'rcc_path': '<(qt_dir)/bin/rcc<(EXECUTABLE_SUFFIX)',
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__uic.gypi
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__uic.gypi:1.1
--- /dev/null   Sun Dec 17 14:15:44 2017
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gui_qt__uic.gypi       Sun Dec 17 14:15:43 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-gui_qt__uic.gypi,v 1.1 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
+
+--- gui/qt_uic.gypi.orig       2017-11-02 13:32:47.000000000 +0000
++++ gui/qt_uic.gypi
+@@ -33,7 +33,7 @@
+ 
+   'variables': {
+     'conditions': [
+-      ['target_platform=="Linux"', {
++      ['target_platform=="Linux" or target_platform=="NetBSD"', {
+         'uic_path': '<!(pkg-config --variable=host_bins Qt5Core)/uic',
+       }, 'qt_dir', {
+         'uic_path': '<(qt_dir)/bin/uic<(EXECUTABLE_SUFFIX)',
Index: pkgsrc/inputmethod/mozc-server/patches/patch-gyp_directories.gypi
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-gyp_directories.gypi:1.1
--- /dev/null   Sun Dec 17 14:15:44 2017
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gyp_directories.gypi   Sun Dec 17 14:15:43 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-gyp_directories.gypi,v 1.1 2017/12/17 14:15:43 tsutsui Exp $
+
+* use ${PREFIX} paths
+
+--- gyp/directories.gypi.orig  2017-11-02 13:32:47.000000000 +0000
++++ gyp/directories.gypi
+@@ -42,7 +42,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',
+ 
+     # Represents the directory where the source code of protobuf is
+     # extracted. This value is ignored when 'use_libprotobuf' is 1.
+@@ -85,7 +85,7 @@
+         # Win / Mac / Linux:
+         #     this file path is directory used by binaries without copying.
+         'zinnia_model_file%':
+-        '/usr/share/tegaki/models/zinnia/handwriting-ja.model',
++        '@PREFIX@/share/tegaki/models/zinnia/handwriting-ja.model',
+       }],
+     ],
+   },
Index: pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_path__util.cc
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_path__util.cc:1.1
--- /dev/null   Sun Dec 17 14:15:44 2017
+++ pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_path__util.cc        Sun Dec 17 14:15:43 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-unix_ibus_path__util.cc,v 1.1 2017/12/17 14:15:43 tsutsui Exp $
+
+* use ${PREFIX} path
+
+--- unix/ibus/path_util.cc.orig        2017-11-02 13:32:47.000000000 +0000
++++ unix/ibus/path_util.cc
+@@ -30,7 +30,7 @@
+ #include "unix/ibus/path_util.h"
+ 
+ namespace {
+-const char kInstalledDirectory[] = "/usr/share/ibus-mozc";
++const char kInstalledDirectory[] = "@PREFIX@/share/ibus-mozc";
+ }
+ 
+ namespace mozc {

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index