Update mozc packages to 2.17.2106.102

Changelog:
* protobuf changes
Not available officially.

11 files changed, 52 insertions, 54 deletions

diff --git a/inputmethod/ibus-mozc/Makefile b/inputmethod/ibus-mozc/Makefile
index bd4e90d4161..e13da233eab 100644
--- a/inputmethod/ibus-mozc/Makefile
+++ b/inputmethod/ibus-mozc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2015/04/25 14:23:22 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2015/07/31 13:07:05 ryoon Exp $
 
 PKGNAME=	ibus-${DISTNAME}
-PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec share/ibus share/ibus/component \
 			share/ibus-mozc
@@ -14,6 +13,7 @@ DEPENDS+=	mozc-tool-[0-9]*:../../inputmethod/mozc-tool
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
+			unix/ibus/ibus.gyp:ibus_mozc_lib \
 			unix/ibus/ibus.gyp:ibus_mozc
 
 do-install:
diff --git a/inputmethod/mozc-elisp/Makefile b/inputmethod/mozc-elisp/Makefile
index a015693f230..bddabbe143b 100644
--- a/inputmethod/mozc-elisp/Makefile
+++ b/inputmethod/mozc-elisp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/31 13:07:05 ryoon Exp $
 #
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=	1
 CATEGORIES=	inputmethod editors
 
 EMACS_MODULES=	base leim
diff --git a/inputmethod/mozc-renderer/Makefile b/inputmethod/mozc-renderer/Makefile
index ff26714217a..0f56a151776 100644
--- a/inputmethod/mozc-renderer/Makefile
+++ b/inputmethod/mozc-renderer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/31 13:07:05 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION=	1
 
 CONFLICTS+=	ibus-mozc<=1.13.1651.102
 
diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile
index b0ccd712323..b58accc318b 100644
--- a/inputmethod/mozc-server/Makefile
+++ b/inputmethod/mozc-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2015/07/31 13:07:05 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec
 
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index bde36ce5610..205260101bc 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2015/02/17 23:55:58 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.19 2015/07/31 13:07:05 ryoon Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -7,16 +7,28 @@
 # used by inputmethod/uim-mozc/Makefile
 #
 
-DISTNAME=	mozc-2.16.2037.102
+DISTNAME=	mozc-2.17.2106.102
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
+GITHUB_PROJECT=	mozc
+GITHUB_TAG=	3648b9bf06d5d9b36bed2425640bfd18ae05b588
 
 MAINTAINER=	ryoon@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/mozc/
+HOMEPAGE=	https://github.com/google/mozc/
 COMMENT=	Japanese inputmethod Mozc engine for IBus
 LICENSE=	modified-bsd
 
+USAGE_DICT=	usage_dict-rev10.txt
+UIM_MOZC=	uim-mozc-318.0562676
+DISTFILES+=	${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} \
+		${USAGE_DICT} \
+		${UIM_MOZC}.tar.xz
+SITES.${USAGE_DICT}=		${MASTER_SITE_LOCAL}
+SITES.${UIM_MOZC}.tar.xz=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}
+
+EXTRACT_USING=	bsdtar
+WRKSRC=		${WRKDIR}/mozc-${GITHUB_TAG}/src
+
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/mozc-server/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/mozc-server/patches
 
@@ -66,6 +78,11 @@ OSDEST=		linux
 
 MOZC_BUILD_MODE=	Release # or Debug
 
+pre-configure:
+	mkdir -p ${WRKSRC}/third_party/japanese_usage_dictionary
+	cp ${WRKDIR}/${USAGE_DICT} \
+		${WRKSRC}/third_party/japanese_usage_dictionary/usage_dict.txt
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		GYP_DEFINES="use_libprotobuf=1" \
diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
index f4a73f33546..5202bb412f4 100644
--- a/inputmethod/mozc-server/distinfo
+++ b/inputmethod/mozc-server/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.13 2015/02/17 23:55:58 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2015/07/31 13:07:05 ryoon Exp $
 
-SHA1 (mozc-2.16.2037.102.tar.xz) = 74c088a81572588d8e60aaf25d066cc74b6fc989
-RMD160 (mozc-2.16.2037.102.tar.xz) = b26f8f58ef2e2f27e5ce42804c6559cb59d33aa9
-Size (mozc-2.16.2037.102.tar.xz) = 37548784 bytes
-SHA1 (uim-mozc-334.tar.xz) = af86ce7a04b291629bd5dc56d5c1115332954a91
-RMD160 (uim-mozc-334.tar.xz) = b988667237f65e61fabf3935f83f5d21a8059f4e
-Size (uim-mozc-334.tar.xz) = 30544 bytes
+SHA1 (mozc-2.17.2106.102-3648b9bf06d5d9b36bed2425640bfd18ae05b588.tar.gz) = cc9c59329fee015a4149686f103a5554a0e085ff
+RMD160 (mozc-2.17.2106.102-3648b9bf06d5d9b36bed2425640bfd18ae05b588.tar.gz) = b40e1c9b62ef6ee4d953add8ab3beed1ee2c4056
+Size (mozc-2.17.2106.102-3648b9bf06d5d9b36bed2425640bfd18ae05b588.tar.gz) = 59324198 bytes
+SHA1 (uim-mozc-318.0562676.tar.xz) = 5cd298aaac5afd7ff8882453e3e8fa698c2c5aa1
+RMD160 (uim-mozc-318.0562676.tar.xz) = 7b93efa2ed2710d5098b1b6b81c0fd195645857b
+Size (uim-mozc-318.0562676.tar.xz) = 24316 bytes
+SHA1 (usage_dict-rev10.txt) = 174fd3073422deb5f7b3740b1c8ea6d52a077c25
+RMD160 (usage_dict-rev10.txt) = 2c70d0c6c46bff422108e3ce617a6eebc311843d
+Size (usage_dict-rev10.txt) = 219146 bytes
 SHA1 (patch-base_base.gyp) = 437fa7ef6c84448a2a8fb049af773ab9df64dc81
 SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
 SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b
@@ -26,10 +29,10 @@ SHA1 (patch-gui_base_locale__util.cc) = 7d1e9cf3c2c36590298496471a97b8c32010a30b
 SHA1 (patch-gui_config__dialog_config__dialog.cc) = aae18b7ea36fd5ff5758625875a04634ffdfd68a
 SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9
 SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608
-SHA1 (patch-gui_gui.gyp) = 70b6d78ca5a482b9e8fa697dbb191cccbdde1c6a
+SHA1 (patch-gui_gui.gyp) = 82377e902935e1fccb79056fa94dd4ad4f8ff29d
 SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
 SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b
-SHA1 (patch-gyp_common.gypi) = c9d93e9ff9c917f759694ed94568d3996e355c6c
+SHA1 (patch-gyp_common.gypi) = 64d8c387f5afbce02b30a42b27ade76f75224f05
 SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c
 SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc
 SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
@@ -42,6 +45,5 @@ SHA1 (patch-protobuf_protobuf.gyp) = 35059f0e24a9d47ca5224a892de84890d72acdf4
 SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473
 SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
 SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
-SHA1 (patch-third__party_protobuf_post__process__dist.sh) = c54363572de0afc2c49b4ed06bc0eb329e4ad237
 SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 566d567ae4f911766309e035697a23350f24bbf5
 SHA1 (patch-unix_ibus_ibus.gyp) = 2fc9309216270846f7ce33d1854d9d76e65e6e96
diff --git a/inputmethod/mozc-server/patches/patch-gui_gui.gyp b/inputmethod/mozc-server/patches/patch-gui_gui.gyp
index b772f3ecb47..b3817bd8fb1 100644
--- a/inputmethod/mozc-server/patches/patch-gui_gui.gyp
+++ b/inputmethod/mozc-server/patches/patch-gui_gui.gyp
@@ -1,9 +1,9 @@
-$NetBSD: patch-gui_gui.gyp,v 1.2 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-gui_gui.gyp,v 1.3 2015/07/31 13:07:05 ryoon Exp $
 
---- gui/gui.gyp.orig	2013-08-28 05:26:12.000000000 +0000
+--- gui/gui.gyp.orig	2015-06-07 07:16:23.000000000 +0000
 +++ gui/gui.gyp
 @@ -387,7 +387,7 @@
-             '../session/session_base.gyp:session_protocol',
+             '../protocol/protocol.gyp:commands_proto',
            ],
          }],
 -        ['use_libzinnia==1 and OS=="linux"', {
diff --git a/inputmethod/mozc-server/patches/patch-gyp_common.gypi b/inputmethod/mozc-server/patches/patch-gyp_common.gypi
index ec9308606b3..4eca1ac2990 100644
--- a/inputmethod/mozc-server/patches/patch-gyp_common.gypi
+++ b/inputmethod/mozc-server/patches/patch-gyp_common.gypi
@@ -1,10 +1,10 @@
-$NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
+$NetBSD: patch-gyp_common.gypi,v 1.7 2015/07/31 13:07:05 ryoon Exp $
 
---- gyp/common.gypi.orig	2015-02-17 14:35:04.000000000 +0000
+--- gyp/common.gypi.orig	2015-06-07 07:16:23.000000000 +0000
 +++ gyp/common.gypi
 @@ -158,7 +158,7 @@
          'compiler_host': 'clang',
-         'compiler_host_version_int': 305,  # Clang 3.5 or higher
+         'compiler_host_version_int': 304,  # Clang 3.4 or higher
        }],
 -      ['target_platform=="Linux"', {
 +      ['target_platform=="Linux" or target_platform=="NetBSD"', {
@@ -29,7 +29,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
              'ldflags': [
                '<@(linux_ldflags)',
              ],
-@@ -513,7 +513,7 @@
+@@ -523,7 +523,7 @@
            },
          },
          'conditions': [
@@ -38,7 +38,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
              'cflags': [
                '<@(debug_extra_cflags)',
              ],
-@@ -574,7 +574,7 @@
+@@ -589,7 +589,7 @@
            },
          },
          'conditions': [
@@ -47,7 +47,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
              'cflags': [
                '<@(release_extra_cflags)',
              ],
-@@ -793,6 +793,22 @@
+@@ -814,6 +814,22 @@
            }],
          ],
        }],
diff --git a/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh b/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh
deleted file mode 100644
index 65475a90882..00000000000
--- a/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_protobuf_post__process__dist.sh,v 1.1 2014/06/15 13:08:34 ryoon Exp $
-
---- third_party/protobuf/post_process_dist.sh.orig	2014-05-21 10:51:38.000000000 +0000
-+++ third_party/protobuf/post_process_dist.sh
-@@ -15,7 +15,7 @@
- #    non-testdata .txt files are converted to Windows-style line endings.
- # 5) Cleans up after itself.
- 
--if [ "$1" == "" ]; then
-+if [ "$1" = "" ]; then
-   echo "USAGE:  $1 DISTFILE" >&2
-   exit 1
- fi
diff --git a/inputmethod/mozc-tool/Makefile b/inputmethod/mozc-tool/Makefile
index ee8ae75281d..23e97da064d 100644
--- a/inputmethod/mozc-tool/Makefile
+++ b/inputmethod/mozc-tool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2015/04/25 14:23:23 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/31 13:07:05 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-tool-/}
-PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec
 
diff --git a/inputmethod/uim-mozc/Makefile b/inputmethod/uim-mozc/Makefile
index 932ec7946ed..6db371be6dc 100644
--- a/inputmethod/uim-mozc/Makefile
+++ b/inputmethod/uim-mozc/Makefile
@@ -1,10 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/04/25 14:23:25 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/31 13:07:05 ryoon Exp $
 
 PKGNAME=	uim-${DISTNAME}
-PKGREVISION=	1
-
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} uim-mozc-334.tar.xz
-SITES.uim-mozc-334.tar.xz=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}
 
 CONFLICTS+=	ibus-mozc<=1.13.1651.102
 
@@ -22,8 +18,8 @@ SUBST_FILES.mozc_tool=		scm/mozc-custom.scm
 SUBST_SED.mozc_tool=		-e 's,/usr/lib/mozc/mozc_tool,${PREFIX}/libexec/mozc_tool,g'
 
 post-extract:
-	mv ${WRKDIR}/uim-mozc-334/uim ${WRKSRC}/unix
-	mv ${WRKDIR}/uim-mozc-334/scm ${WRKSRC}
+	mv ${WRKDIR}/${UIM_MOZC}/uim ${WRKSRC}/unix
+	mv ${WRKDIR}/${UIM_MOZC}/scm ${WRKSRC}
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \