5 files changed, 6 insertions, 74 deletions

diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 4dbb2d11fe03..704b8ac67271 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mozc
-PORTVERSION=	2.20.2677.102.01
+PORTVERSION=	2.20.2677.102.02
 DISTVERSIONPREFIX=	v
 CATEGORIES=	japanese
 
@@ -77,7 +77,6 @@ GYP_DEFINES=	use_libprotobuf=1 \
 		compiler_host='${_CCTYPE}' \
 		compiler_target='${_CCTYPE}' \
 		use_libzinnia=1 \
-		use_fcitx=0 \
 		zinnia_model_file='${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model' \
 		ibus_mozc_icon_path='${LOCALBASE}/share/ibus-mozc/icons/product_icon.png' \
 		ibus_mozc_path='${PREFIX}/libexec/ibus-engine-mozc'
@@ -307,10 +306,9 @@ do-install-uim_mozc:
 
 # fcitx_mozc
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
-GYP_OPTIONS+=	--noqt
+GYP_OPTIONS+=	--noqt --use_fcitx
 GYP_DEFINES+=	use_libibus=0 \
-		enable_gtk_renderer=0 \
-		use_fcitx=1
+		enable_gtk_renderer=0
 
 LIB_DEPENDS+=	libfcitx-core.so:chinese/fcitx
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo
index 184edfe01796..0cba83e5ff80 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1483252889
+TIMESTAMP = 1483299024
 SHA256 (ken_all-20161031.zip) = a363eefa9867c497b12bf5a603f64426af7bd938733c2925dd2747150d2cdd42
 SIZE (ken_all-20161031.zip) = 1685061
 SHA256 (jigyosyo-20161031.zip) = 1a8d9cf30421a5bdfbccb6e3d9fc4f141895821ac0275425a60ad858e38c2a43
 SIZE (jigyosyo-20161031.zip) = 754418
-SHA256 (hrs-allbsd-mozc-v2.20.2677.102.01_GH0.tar.gz) = 31e254b21d17c3e070252ae33686e7c3960a05521fac7a60ac7e9bf1a5be1505
-SIZE (hrs-allbsd-mozc-v2.20.2677.102.01_GH0.tar.gz) = 37574885
+SHA256 (hrs-allbsd-mozc-v2.20.2677.102.02_GH0.tar.gz) = 55fff5f29aae002a0e0ed445a039c543174313e57f78a040f86b2793976e24f0
+SIZE (hrs-allbsd-mozc-v2.20.2677.102.02_GH0.tar.gz) = 37575296
 SHA256 (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425_GH0.tar.gz) = 2af954cd844c6a3113449d7dca37e36b769ecb2b49d3a54318a3bdee1a75af56
 SIZE (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425_GH0.tar.gz) = 71050
 SHA256 (e-kato-macuim-v0.6.16.2.1_GH0.tar.gz) = ae999a2f02379bd049484a22684c37be5eb1f4db9763fa79885c4981502336e9
diff --git a/japanese/mozc-server/files/patch-src-build_mozc.py b/japanese/mozc-server/files/patch-src-build_mozc.py
deleted file mode 100644
index c3c4b8e93b83..000000000000
--- a/japanese/mozc-server/files/patch-src-build_mozc.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/build_mozc.py.orig	2017-01-02 01:13:46.394876000 +0900
-+++ src/build_mozc.py	2017-01-02 01:20:39.314369000 +0900
-@@ -637,9 +637,6 @@
-   else:
-     gyp_options.extend(['-D', 'use_wix=NO'])
- 
--  if target_platform == 'Linux':
--    gyp_options.extend(['-D', 'enable_gtk_renderer=1'])
--
-   # Android
-   if target_platform == 'Android':
-     android_home = GetAndroidHome(options)
-@@ -864,7 +861,7 @@
-   ninja = GetNinjaPath()
- 
-   ninja_targets = [GetNinjaTargetName(target) for target in targets]
--  RunOrDie([ninja, '-C', build_arg] + ninja_targets)
-+  RunOrDie([ninja, '-v', '-C', build_arg] + ninja_targets)
- 
- 
- def BuildOnWindows(targets):
diff --git a/japanese/mozc-server/files/patch-src-gyp-defines.gypi b/japanese/mozc-server/files/patch-src-gyp-defines.gypi
deleted file mode 100644
index 2a18930823c0..000000000000
--- a/japanese/mozc-server/files/patch-src-gyp-defines.gypi
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gyp/defines.gypi.orig	2017-01-01 15:13:15.000000000 +0900
-+++ src/gyp/defines.gypi	2017-01-02 01:25:19.028785000 +0900
-@@ -71,6 +71,8 @@
-     # use_libibus represents if ibus library is used or not.
-     # This option is only for Linux.
-     'use_libibus%': '0',
-+
-+    'use_fcitx%': '0',
-   },
-   'target_defaults': {
-     'defines': [
diff --git a/japanese/mozc-server/files/patch-src-unix-fcitx-fcitx.gyp b/japanese/mozc-server/files/patch-src-unix-fcitx-fcitx.gyp
deleted file mode 100644
index ce05f23c0e36..000000000000
--- a/japanese/mozc-server/files/patch-src-unix-fcitx-fcitx.gyp
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/unix/fcitx/fcitx.gyp.orig	2017-01-01 15:13:15.000000000 +0900
-+++ src/unix/fcitx/fcitx.gyp	2017-01-02 01:52:57.325440000 +0900
-@@ -47,8 +47,14 @@
-         '../../protocol/protocol.gyp:commands_proto',
-     ],
-     'fcitx_defines': [
--      'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
--    ]
-+    ],
-+    'conditions': [
-+      ['use_fcitx==1', {
-+        'fcitx_defines': [
-+          'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
-+        ]
-+      }]
-+    ],
-   },
-   'targets': [
-     {
-@@ -90,8 +96,12 @@
-         '<@(fcitx_dependencies)',
-         'gen_fcitx_mozc_i18n',
-       ],
--      'cflags': [
--        '<!@(pkg-config --cflags <@(pkg_config_libs))',
-+      'conditions': [
-+        ['use_fcitx==1', {
-+          'cflags': [
-+            '<!@(pkg-config --cflags <@(pkg_config_libs))',
-+          ],
-+        }],
-       ],
-       'include_dirs': [
-         '<@(fcitx_dep_include_dirs)',