Received: by mail.netbsd.org (Postfix, from userid 605)
	id 988C084D54; Sat, 27 Feb 2021 04:19:49 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id CD88F84D22
	for <pkgsrc-changes@NetBSD.org>; Sat, 27 Feb 2021 04:19:48 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id Lya6gwWtEk6Q for <pkgsrc-changes@netbsd.org>;
	Sat, 27 Feb 2021 04:19:47 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 80D1284C71
	for <pkgsrc-changes@NetBSD.org>; Sat, 27 Feb 2021 04:19:47 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 28AFEFA95; Sat, 27 Feb 2021 04:19:47 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1614399587135650"
MIME-Version: 1.0
Date: Sat, 27 Feb 2021 04:19:47 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/inputmethod
To: pkgsrc-changes@NetBSD.org
Reply-To: ryoon@netbsd.org
X-Mailer: log_accum
Message-Id: <20210227041947.28AFEFA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1614399587135650
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Sat Feb 27 04:19:46 UTC 2021

Modified Files:
	pkgsrc/inputmethod/fcitx5-mozc: Makefile.common distinfo
	pkgsrc/inputmethod/fcitx5-mozc/patches: patch-gyp_common.gypi
	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-gyp_common.gypi
	pkgsrc/inputmethod/mozc-tool: Makefile
Added Files:
	pkgsrc/inputmethod/fcitx5-mozc/patches: patch-protobuf_protobuf.gyp
	pkgsrc/inputmethod/mozc-server/patches: patch-protobuf_protobuf.gyp

Log Message:
mozc: Fix build under NetBSD/i386 and use external protobuf library

* Include mk/atomic64.mk to add -march=i586 to CFLAGS and pass
  CFLAGS to gyp. Fix PR pkg/56025 in another way.
* Use external devel/protobuf to avoid internal protobuf build.
  So bump PKGREVISION.
* dictionary/pos_matcher.h does not generated before its use sometimes.
  Generate it explicitly with
  dictionary/dictionary_base.gyp:text_dictionary_loader target
  for mozc-server.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/fcitx5-mozc/Makefile.common \
    pkgsrc/inputmethod/fcitx5-mozc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx5-mozc/patches/patch-protobuf_protobuf.gyp
cvs rdiff -u -r1.64 -r1.65 pkgsrc/inputmethod/ibus-mozc/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/inputmethod/mozc-elisp/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/inputmethod/mozc-renderer/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/inputmethod/mozc-server/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/inputmethod/mozc-server/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/inputmethod/mozc-server/distinfo
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi
cvs rdiff -u -r0 -r1.7 \
    pkgsrc/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
cvs rdiff -u -r1.59 -r1.60 pkgsrc/inputmethod/mozc-tool/Makefile

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


--_----------=_1614399587135650
Content-Disposition: inline
Content-Length: 14631
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/inputmethod/fcitx5-mozc/Makefile.common
diff -u pkgsrc/inputmethod/fcitx5-mozc/Makefile.common:1.1 pkgsrc/inputmethod/fcitx5-mozc/Makefile.common:1.2
--- pkgsrc/inputmethod/fcitx5-mozc/Makefile.common:1.1	Wed Feb 17 15:29:51 2021
+++ pkgsrc/inputmethod/fcitx5-mozc/Makefile.common	Sat Feb 27 04:19:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2021/02/17 15:29:51 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2021/02/27 04:19:46 ryoon Exp $
 # used by inputmethod/fcitx-mozc/Makefile
 #
 
@@ -60,15 +60,15 @@ MOZC_BUILD_MODE=	Release # or Debug
 # Maybe fix this later.
 BUILDLINK_TRANSFORM+=	rm:-Werror=char-subscripts
 
-#		GYP_DEFINES="use_libprotobuf=1"
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		GYP_DEFINES="use_libprotobuf=1" \
 		${PYTHONBIN} build_mozc.py \
 		gyp \
 		--gypdir=${LOCALBASE}/bin
 
 .include "../../devel/glib2/buildlink3.mk"
-#.include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
 # gmock is not used yet...
 #.include "../../devel/gmock/buildlink3.mk"
 .include "../../inputmethod/zinnia/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-mozc/distinfo
diff -u pkgsrc/inputmethod/fcitx5-mozc/distinfo:1.1 pkgsrc/inputmethod/fcitx5-mozc/distinfo:1.2
--- pkgsrc/inputmethod/fcitx5-mozc/distinfo:1.1	Wed Feb 17 15:29:51 2021
+++ pkgsrc/inputmethod/fcitx5-mozc/distinfo	Sat Feb 27 04:19:46 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2021/02/17 15:29:51 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2021/02/27 04:19:46 ryoon Exp $
 
 SHA1 (fcitx-mozc-2.26.4276.100.tar.xz) = d9b245a065a317b196816ff41cf52fc2fe3ff728
 RMD160 (fcitx-mozc-2.26.4276.100.tar.xz) = 1bd5ce4ec04d4be15840651cb570900b3dcb3e01
@@ -32,12 +32,13 @@ SHA1 (patch-gui_qt__moc.gypi) = e3d42e61
 SHA1 (patch-gui_qt__rcc.gypi) = d38a849fe8e81672eb441a41936f454d8e45ff5c
 SHA1 (patch-gui_qt__uic.gypi) = 7dd69ee109e81f0e70f2866b77555412518b4844
 SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 218e3706b819855814ba8871504fc7ccb4e40b23
-SHA1 (patch-gyp_common.gypi) = 18e03490d6758ce49f4b79eb1259409cd440faba
+SHA1 (patch-gyp_common.gypi) = 6b9019c92a1b0f404feffb8b5a38b00caaeaf80a
 SHA1 (patch-gyp_directories.gypi) = eea985113aac5b99bf3c12267ad754817eef5dcc
 SHA1 (patch-ipc_ipc__path__manager.cc) = cd1352bd5333f1ed755dcf6221f931fcd0a936d3
 SHA1 (patch-ipc_ipc__path__manager__test.cc) = 1b83b513383f184f5ab5a56cce734b7934998533
 SHA1 (patch-ipc_named__event.cc) = 8be0b1e5c4675e5b238e07b63e395dbed3c2d125
 SHA1 (patch-ipc_unix__ipc.cc) = d5d86910ca610015103a309bba8d6392d96f6ce6
+SHA1 (patch-protobuf_protobuf.gyp) = bb1c9684881199936abb8acd73948d1cb174a1ea
 SHA1 (patch-renderer_renderer.gyp) = 83493259d6b8cd9ab6871512bebc9616d72132d1
 SHA1 (patch-session_session.cc) = 3ae2c8dd056aae4c92d9dbfdac53d9c45261aad2
 SHA1 (patch-session_session__test.cc) = 7396e2f4931257d8a33087b1bed5418a038fefa1

Index: pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi
diff -u pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi:1.1 pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi:1.2
--- pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi:1.1	Wed Feb 17 15:29:51 2021
+++ pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi	Sat Feb 27 04:19:46 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-gyp_common.gypi,v 1.1 2021/02/17 15:29:51 ryoon Exp $
+$NetBSD: patch-gyp_common.gypi,v 1.2 2021/02/27 04:19:46 ryoon Exp $
 
 * NetBSD support
 
 --- gyp/common.gypi.orig	2021-02-15 05:04:33.000000000 +0000
 +++ gyp/common.gypi
-@@ -93,6 +93,13 @@
+@@ -93,6 +93,14 @@
        '-fstack-protector',
        '--param=ssp-buffer-size=4',
      ],
@@ -14,11 +14,12 @@ $NetBSD: patch-gyp_common.gypi,v 1.1 202
 +      '-fPIC',
 +      '-D_NETBSD_SOURCE',
 +      '-fno-exceptions',
++      '<!(echo $CFLAGS)',
 +    ],
      # mac_cflags will be used in Mac.
      # Xcode 4.5 which we are currently using does not support ssp-buffer-size.
      # TODO(horo): When we can use Xcode 4.6 which supports ssp-buffer-size,
-@@ -128,6 +135,12 @@
+@@ -128,6 +136,12 @@
          'compiler_host': 'clang',
          'compiler_host_version_int': 304,  # Clang 3.4 or higher
        }],
@@ -31,7 +32,18 @@ $NetBSD: patch-gyp_common.gypi,v 1.1 202
      ],
    },
    'target_defaults': {
-@@ -318,6 +331,24 @@
+@@ -137,8 +151,8 @@
+       'mac_debug_optimization%': '0',    # Use -O0 unless overridden
+ 
+       # Extra cflags for gcc
+-      'release_extra_cflags%': ['-O2'],
+-      'debug_extra_cflags%': ['-O0', '-g'],
++      'release_extra_cflags%': ['-O2', '<!(echo $CFLAGS)', ],
++      'debug_extra_cflags%': ['-O0', '-g', '<!(echo $CFLAGS)', ],
+     },
+     'configurations': {
+       'Debug': {
+@@ -318,6 +332,24 @@
            }],
          ],
        }],
@@ -56,7 +68,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.1 202
        ['OS=="mac"', {
          'defines': [
            '__APPLE__',
-@@ -410,7 +441,7 @@
+@@ -410,7 +442,7 @@
      ],
    },
    'conditions': [

Index: pkgsrc/inputmethod/ibus-mozc/Makefile
diff -u pkgsrc/inputmethod/ibus-mozc/Makefile:1.64 pkgsrc/inputmethod/ibus-mozc/Makefile:1.65
--- pkgsrc/inputmethod/ibus-mozc/Makefile:1.64	Mon Feb 15 14:50:22 2021
+++ pkgsrc/inputmethod/ibus-mozc/Makefile	Sat Feb 27 04:19:46 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2021/02/15 14:50:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.65 2021/02/27 04:19:46 ryoon Exp $
 
 PKGNAME=	ibus-${DISTNAME}
+PKGREVISION=	1
 
 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.53 pkgsrc/inputmethod/mozc-elisp/Makefile:1.54
--- pkgsrc/inputmethod/mozc-elisp/Makefile:1.53	Mon Feb 15 14:50:23 2021
+++ pkgsrc/inputmethod/mozc-elisp/Makefile	Sat Feb 27 04:19:46 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2021/02/15 14:50:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2021/02/27 04:19:46 ryoon Exp $
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
+PKGREVISION=	1
 CATEGORIES=	inputmethod editors
 
 EMACS_MODULES=	base leim

Index: pkgsrc/inputmethod/mozc-renderer/Makefile
diff -u pkgsrc/inputmethod/mozc-renderer/Makefile:1.45 pkgsrc/inputmethod/mozc-renderer/Makefile:1.46
--- pkgsrc/inputmethod/mozc-renderer/Makefile:1.45	Mon Feb 15 14:50:23 2021
+++ pkgsrc/inputmethod/mozc-renderer/Makefile	Sat Feb 27 04:19:46 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2021/02/15 14:50:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2021/02/27 04:19:46 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
+PKGREVISION=	1
 
 CONFLICTS+=	ibus-mozc<=1.13.1651.102
 

Index: pkgsrc/inputmethod/mozc-server/Makefile
diff -u pkgsrc/inputmethod/mozc-server/Makefile:1.62 pkgsrc/inputmethod/mozc-server/Makefile:1.63
--- pkgsrc/inputmethod/mozc-server/Makefile:1.62	Mon Feb 15 14:50:23 2021
+++ pkgsrc/inputmethod/mozc-server/Makefile	Sat Feb 27 04:19:46 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2021/02/15 14:50:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2021/02/27 04:19:46 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
+PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec
 
@@ -8,6 +9,7 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build \
 		-c ${MOZC_BUILD_MODE} \
+			dictionary/dictionary_base.gyp:text_dictionary_loader \
 			server/server.gyp:mozc_server
 
 do-install:

Index: pkgsrc/inputmethod/mozc-server/Makefile.common
diff -u pkgsrc/inputmethod/mozc-server/Makefile.common:1.33 pkgsrc/inputmethod/mozc-server/Makefile.common:1.34
--- pkgsrc/inputmethod/mozc-server/Makefile.common:1.33	Wed Feb 17 00:14:25 2021
+++ pkgsrc/inputmethod/mozc-server/Makefile.common	Sat Feb 27 04:19:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2021/02/17 00:14:25 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.34 2021/02/27 04:19:46 ryoon Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -76,12 +76,13 @@ BUILDLINK_TRANSFORM+=	rm:-Werror=char-su
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		GYP_DEFINES="use_libprotobuf=1" \
 		${PYTHONBIN} build_mozc.py \
 		gyp \
 		--gypdir=${LOCALBASE}/bin
 
 .include "../../devel/glib2/buildlink3.mk"
-#.include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
 # gmock is not used yet...
 #.include "../../devel/gmock/buildlink3.mk"
 .include "../../inputmethod/zinnia/buildlink3.mk"
@@ -90,4 +91,5 @@ do-configure:
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 
 .include "../../lang/python/tool.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/mozc-server/distinfo
diff -u pkgsrc/inputmethod/mozc-server/distinfo:1.23 pkgsrc/inputmethod/mozc-server/distinfo:1.24
--- pkgsrc/inputmethod/mozc-server/distinfo:1.23	Mon Feb 15 14:50:23 2021
+++ pkgsrc/inputmethod/mozc-server/distinfo	Sat Feb 27 04:19:46 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/02/15 14:50:23 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2021/02/27 04:19:46 ryoon Exp $
 
 SHA1 (mozc-2.26.4282.100.tar.xz) = aacec607aec52145ba66c993f9c02ae2d1a5948c
 RMD160 (mozc-2.26.4282.100.tar.xz) = b2f9f6fc129811b25640d4ae5582ab324b6bf2a4
@@ -33,12 +33,13 @@ SHA1 (patch-gui_qt__moc.gypi) = e3d42e61
 SHA1 (patch-gui_qt__rcc.gypi) = d38a849fe8e81672eb441a41936f454d8e45ff5c
 SHA1 (patch-gui_qt__uic.gypi) = 7dd69ee109e81f0e70f2866b77555412518b4844
 SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 218e3706b819855814ba8871504fc7ccb4e40b23
-SHA1 (patch-gyp_common.gypi) = 18e03490d6758ce49f4b79eb1259409cd440faba
+SHA1 (patch-gyp_common.gypi) = 6b9019c92a1b0f404feffb8b5a38b00caaeaf80a
 SHA1 (patch-gyp_directories.gypi) = eea985113aac5b99bf3c12267ad754817eef5dcc
 SHA1 (patch-ipc_ipc__path__manager.cc) = cd1352bd5333f1ed755dcf6221f931fcd0a936d3
 SHA1 (patch-ipc_ipc__path__manager__test.cc) = 1b83b513383f184f5ab5a56cce734b7934998533
 SHA1 (patch-ipc_named__event.cc) = 8be0b1e5c4675e5b238e07b63e395dbed3c2d125
 SHA1 (patch-ipc_unix__ipc.cc) = d5d86910ca610015103a309bba8d6392d96f6ce6
+SHA1 (patch-protobuf_protobuf.gyp) = bb1c9684881199936abb8acd73948d1cb174a1ea
 SHA1 (patch-renderer_renderer.gyp) = 83493259d6b8cd9ab6871512bebc9616d72132d1
 SHA1 (patch-session_session.cc) = 3ae2c8dd056aae4c92d9dbfdac53d9c45261aad2
 SHA1 (patch-session_session__test.cc) = 7396e2f4931257d8a33087b1bed5418a038fefa1

Index: pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi:1.10 pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi:1.11
--- pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi:1.10	Mon Feb 15 14:50:23 2021
+++ pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi	Sat Feb 27 04:19:46 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-gyp_common.gypi,v 1.10 2021/02/15 14:50:23 ryoon Exp $
+$NetBSD: patch-gyp_common.gypi,v 1.11 2021/02/27 04:19:46 ryoon Exp $
 
 * NetBSD support
 
 --- gyp/common.gypi.orig	2021-02-15 05:04:33.000000000 +0000
 +++ gyp/common.gypi
-@@ -93,6 +93,13 @@
+@@ -93,6 +93,14 @@
        '-fstack-protector',
        '--param=ssp-buffer-size=4',
      ],
@@ -14,11 +14,12 @@ $NetBSD: patch-gyp_common.gypi,v 1.10 20
 +      '-fPIC',
 +      '-D_NETBSD_SOURCE',
 +      '-fno-exceptions',
++      '<!(echo $CFLAGS)',
 +    ],
      # mac_cflags will be used in Mac.
      # Xcode 4.5 which we are currently using does not support ssp-buffer-size.
      # TODO(horo): When we can use Xcode 4.6 which supports ssp-buffer-size,
-@@ -128,6 +135,12 @@
+@@ -128,6 +136,12 @@
          'compiler_host': 'clang',
          'compiler_host_version_int': 304,  # Clang 3.4 or higher
        }],
@@ -31,7 +32,18 @@ $NetBSD: patch-gyp_common.gypi,v 1.10 20
      ],
    },
    'target_defaults': {
-@@ -318,6 +331,24 @@
+@@ -137,8 +151,8 @@
+       'mac_debug_optimization%': '0',    # Use -O0 unless overridden
+ 
+       # Extra cflags for gcc
+-      'release_extra_cflags%': ['-O2'],
+-      'debug_extra_cflags%': ['-O0', '-g'],
++      'release_extra_cflags%': ['-O2', '<!(echo $CFLAGS)', ],
++      'debug_extra_cflags%': ['-O0', '-g', '<!(echo $CFLAGS)', ],
+     },
+     'configurations': {
+       'Debug': {
+@@ -318,6 +332,24 @@
            }],
          ],
        }],
@@ -56,7 +68,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.10 20
        ['OS=="mac"', {
          'defines': [
            '__APPLE__',
-@@ -410,7 +441,7 @@
+@@ -410,7 +442,7 @@
      ],
    },
    'conditions': [

Index: pkgsrc/inputmethod/mozc-tool/Makefile
diff -u pkgsrc/inputmethod/mozc-tool/Makefile:1.59 pkgsrc/inputmethod/mozc-tool/Makefile:1.60
--- pkgsrc/inputmethod/mozc-tool/Makefile:1.59	Mon Feb 15 14:50:23 2021
+++ pkgsrc/inputmethod/mozc-tool/Makefile	Sat Feb 27 04:19:46 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2021/02/15 14:50:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2021/02/27 04:19:46 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-tool-/}
+PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec
 

Added files:

Index: pkgsrc/inputmethod/fcitx5-mozc/patches/patch-protobuf_protobuf.gyp
diff -u /dev/null pkgsrc/inputmethod/fcitx5-mozc/patches/patch-protobuf_protobuf.gyp:1.1
--- /dev/null	Sat Feb 27 04:19:47 2021
+++ pkgsrc/inputmethod/fcitx5-mozc/patches/patch-protobuf_protobuf.gyp	Sat Feb 27 04:19:46 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-protobuf_protobuf.gyp,v 1.1 2021/02/27 04:19:46 ryoon Exp $
+
+* Pass LDFLAGS from pkgsrc.
+  Fix -lprotobuf is not found error.
+
+--- protobuf/protobuf.gyp.orig	2021-02-15 05:04:33.000000000 +0000
++++ protobuf/protobuf.gyp
+@@ -156,6 +156,9 @@
+             'libraries': [
+               '-lprotobuf',
+             ],
++            'ldflags': [
++              '<!(echo $LDFLAGS)',
++            ],
+           },
+         },
+         {  # else

Index: pkgsrc/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp:1.7
--- /dev/null	Sat Feb 27 04:19:47 2021
+++ pkgsrc/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp	Sat Feb 27 04:19:46 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-protobuf_protobuf.gyp,v 1.7 2021/02/27 04:19:46 ryoon Exp $
+
+* Pass LDFLAGS from pkgsrc.
+  Fix -lprotobuf is not found error.
+
+--- protobuf/protobuf.gyp.orig	2021-02-15 05:04:33.000000000 +0000
++++ protobuf/protobuf.gyp
+@@ -156,6 +156,9 @@
+             'libraries': [
+               '-lprotobuf',
+             ],
++            'ldflags': [
++              '<!(echo $LDFLAGS)',
++            ],
+           },
+         },
+         {  # else


--_----------=_1614399587135650--