12 files changed, 106 insertions, 31 deletions

diff --git a/japanese/fcitx-mozc/Makefile b/japanese/fcitx-mozc/Makefile
index 12cdca513d01..a6b6e0eb1531 100644
--- a/japanese/fcitx-mozc/Makefile
+++ b/japanese/fcitx-mozc/Makefile
@@ -1,7 +1,6 @@
 # Created by: Daichi GOTO <daichi@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	15
 PKGNAMEPREFIX=	ja-fcitx-
 
 COMMENT=	Mozc engine for Fcitx
diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile
index 253c5ec81e76..c932f4949b9e 100644
--- a/japanese/ibus-mozc/Makefile
+++ b/japanese/ibus-mozc/Makefile
@@ -1,7 +1,6 @@
 # Created by: Daichi GOTO <daichi@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	15
 PKGNAMEPREFIX=	ja-ibus-
 
 COMMENT=	Mozc engine for IBus
diff --git a/japanese/mozc-el/Makefile b/japanese/mozc-el/Makefile
index da870e9ae538..16f0bcc2a6b1 100644
--- a/japanese/mozc-el/Makefile
+++ b/japanese/mozc-el/Makefile
@@ -1,7 +1,6 @@
 # Created by: TAKANO, Yuji
 # $FreeBSD$
 
-PORTREVISION=	3
 PKGNAMESUFFIX=	-el${EMACS_PKGNAMESUFFIX}
 
 COMMENT=	Emacs input method for Mozc
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index d652d0ee4d97..c8ac9d3bb8ef 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mozc
-PORTVERSION=	2.20.2677.102.02
+PORTVERSION=	2.23.2815.102.00
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	14
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -14,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ninja:devel/ninja \
-		gyp:devel/py-gyp
+		gyp:devel/py-gyp@${PY_FLAVOR}
 EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
 		libzinnia.so:japanese/zinnia
@@ -48,11 +47,11 @@ LICENSE_PERMS_NAISTL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE_NAISTL=	${WRKSRC}/src/data/dictionary_oss/README.txt
 LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX}
 .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
-USES+=		qt:5
+USES+=		qt:5 gnome
 USE_GNOME=	glib20 gtk20
 USE_QT=		buildtools core gui widgets
 .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
-USES+=		gettext-runtime
+USES+=		gettext-runtime gnome
 USE_XORG=	xcb
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
@@ -100,6 +99,8 @@ BUILD_MOZC_CMD=	cd ${BUILD_WRKSRC} && \
 BUILD_MOZC_CMD_BUILD=	${BUILD_MOZC_CMD} build -c ${BUILD_MODE} ${_MAKE_JOBS}
 BUILD_GYP_CMD=	${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gyp
 
+post-extract:	# XXX: do not activate fcitx5
+	${RM} -r ${WRKSRC}/src/unix/fcitx5
 post-patch:
 	${FIND} ${BUILD_WRKSRC} \( -name '*.gyp' -o -name '*.gypi' \) -exec \
 	    ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \;
@@ -138,8 +139,8 @@ GYP_DEFINES+=	use_libibus=0 \
 
 MASTER_SITES+=	LOCAL/kuriyama:zipcode
 DISTFILES+= \
-	ken_all-20161031.zip:zipcode \
-	jigyosyo-20161031.zip:zipcode
+	ken_all-20181228.zip:zipcode \
+	jigyosyo-20181228.zip:zipcode
 
 PLIST_FILES+=	bin/mozc \
 		bin/mozc_server \
@@ -215,7 +216,7 @@ GYP_DEFINES+=	use_libibus=1 \
 LIB_DEPENDS+=	libibus-1.0.so:textproc/ibus
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool \
-		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR}
 
 PLIST_FILES+=	libexec/mozc_renderer \
 		libexec/ibus-engine-mozc \
@@ -269,13 +270,15 @@ RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-unix-uim-mozc.cc \
-		${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp
+		${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp \
+		${PATCHDIR}/extra-patch-src-unix-uim-key_translator.h \
+		${PATCHDIR}/extra-patch-src-unix-uim-key_translator.cc
 PLIST_FILES+=	lib/uim/plugin/libuim-mozc.so \
 		%%DATADIR%%/mozc.scm \
 		%%DATADIR%%/mozc-custom.scm \
 		%%DATADIR%%/mozc-key-custom.scm \
 		%%DATADIR%%/pixmaps/mozc.png \
-		"@postexec ${LOCALBASE}/bin/uim-module-manager --register mozc" \
+		"@postexec ${SETENV} MOZC_NOLOG=true ${LOCALBASE}/bin/uim-module-manager --register mozc" \
 		"@preunexec ${LOCALBASE}/bin/uim-module-manager --unregister mozc"
 
 GYP_OPTIONS+=	--noqt
@@ -310,9 +313,10 @@ do-install-uim_mozc:
 
 # fcitx_mozc
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
-GYP_OPTIONS+=	--noqt --use_fcitx
+GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
-		enable_gtk_renderer=0
+		enable_gtk_renderer=0 \
+		use_fcitx="YES"
 
 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 0cba83e5ff80..53044bc587b1 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,10 +1,10 @@
-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.02_GH0.tar.gz) = 55fff5f29aae002a0e0ed445a039c543174313e57f78a040f86b2793976e24f0
-SIZE (hrs-allbsd-mozc-v2.20.2677.102.02_GH0.tar.gz) = 37575296
+TIMESTAMP = 1551724666
+SHA256 (ken_all-20181228.zip) = 814257c9c93d4393bedb4025542a4b54def16fd6e88268b03e29fe6d19ba10da
+SIZE (ken_all-20181228.zip) = 1687342
+SHA256 (jigyosyo-20181228.zip) = 9d3b7a11c1b851c70a41f4dc6cf3bffd800f3cf254bcad1d65ea0829fc67bb5d
+SIZE (jigyosyo-20181228.zip) = 763205
+SHA256 (hrs-allbsd-mozc-v2.23.2815.102.00_GH0.tar.gz) = 9e9415c4dcd261308177592d944a5e6d72fc75cef8e28384072966a1ba4446fc
+SIZE (hrs-allbsd-mozc-v2.23.2815.102.00_GH0.tar.gz) = 36711684
 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/extra-patch-src-unix-uim-key_translator.cc b/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.cc
new file mode 100644
index 000000000000..a5036a1c14a0
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.cc
@@ -0,0 +1,33 @@
+--- src/unix/uim/key_translator.cc.orig	2019-03-04 19:32:08.940982000 +0900
++++ src/unix/uim/key_translator.cc	2019-03-04 19:32:33.285357000 +0900
+@@ -368,25 +368,25 @@
+ 
+ void KeyTranslator::Init() {
+   for (int i = 0; i < arraysize(special_key_map); ++i) {
+-    CHECK(special_key_map_.insert(make_pair(special_key_map[i].from,
++    CHECK(special_key_map_.insert(std::make_pair(special_key_map[i].from,
+                                             special_key_map[i].to)).second);
+   }
+   for (int i = 0; i < arraysize(modifier_key_map); ++i) {
+-    CHECK(modifier_key_map_.insert(make_pair(modifier_key_map[i].from,
++    CHECK(modifier_key_map_.insert(std::make_pair(modifier_key_map[i].from,
+                                              modifier_key_map[i].to)).second);
+   }
+   for (int i = 0; i < arraysize(modifier_mask_map); ++i) {
+-    CHECK(modifier_mask_map_.insert(make_pair(modifier_mask_map[i].from,
++    CHECK(modifier_mask_map_.insert(std::make_pair(modifier_mask_map[i].from,
+                                               modifier_mask_map[i].to)).second);
+   }
+   for (int i = 0; i < arraysize(kana_map_jp); ++i) {
+     CHECK(kana_map_jp_.insert(
+-        make_pair(kana_map_jp[i].code, make_pair(
++        std::make_pair(kana_map_jp[i].code, std::make_pair(
+             kana_map_jp[i].no_shift, kana_map_jp[i].shift))).second);
+   }
+   for (int i = 0; i < arraysize(kana_map_us); ++i) {
+     CHECK(kana_map_us_.insert(
+-        make_pair(kana_map_us[i].code, make_pair(
++        std::make_pair(kana_map_us[i].code, std::make_pair(
+             kana_map_us[i].no_shift, kana_map_us[i].shift))).second);
+   }
+ }
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h b/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h
new file mode 100644
index 000000000000..bc56d9036607
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h
@@ -0,0 +1,13 @@
+--- src/unix/uim/key_translator.h.orig	2015-07-15 10:04:31.000000000 +0900
++++ src/unix/uim/key_translator.h	2019-03-04 19:28:03.722916000 +0900
+@@ -62,8 +62,8 @@
+ 
+  private:
+   typedef hash_map<unsigned int, commands::KeyEvent::SpecialKey> SpecialKeyMap;
+-  typedef map<unsigned int, commands::KeyEvent::ModifierKey> ModifierKeyMap;
+-  typedef map<unsigned int, pair<string, string> > KanaMap;
++  typedef std::map<unsigned int, commands::KeyEvent::ModifierKey> ModifierKeyMap;
++  typedef std::map<unsigned int, std::pair<string, string> > KanaMap;
+ 
+   // Returns true iff key is modifier key such as SHIFT, ALT, or CAPSLOCK.
+   bool IsModifierKey(unsigned int keyval,
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc b/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc
index 2fced9df6401..90c8d7ad8ba7 100644
--- a/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc
+++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc
@@ -1,5 +1,5 @@
---- src/unix/uim/mozc.cc.orig	2016-05-11 00:39:29.009401000 +0900
-+++ src/unix/uim/mozc.cc	2016-05-11 00:40:58.320083000 +0900
+--- src/unix/uim/mozc.cc.orig	2015-07-15 10:04:31.000000000 +0900
++++ src/unix/uim/mozc.cc	2019-03-04 19:35:14.711403000 +0900
 @@ -48,6 +48,7 @@
  # include "plugin.h"
  #endif
@@ -8,6 +8,15 @@
  #include "base/port.h"
  #include "base/util.h"
  #include "protocol/config.pb.h"
+@@ -902,7 +903,7 @@
+   int i;
+ 
+   for (i = 0; key_tab[i].key; i++)
+-    key_map.insert(make_pair(key_tab[i].str, key_tab[i].key));
++    key_map.insert(std::make_pair(key_tab[i].str, key_tab[i].key));
+ }
+ 
+ static uim_lisp
 @@ -1196,7 +1197,7 @@
    argv[0] = (char *)name;
    argv[1] =  NULL;
diff --git a/japanese/mozc-server/files/patch-src-base-init_mozc.cc b/japanese/mozc-server/files/patch-src-base-init_mozc.cc
new file mode 100644
index 000000000000..707ec476599a
--- /dev/null
+++ b/japanese/mozc-server/files/patch-src-base-init_mozc.cc
@@ -0,0 +1,21 @@
+--- src/base/init_mozc.cc.orig	2019-03-04 18:35:55 UTC
++++ src/base/init_mozc.cc
+@@ -35,6 +35,7 @@
+ #endif  // OS_WIN
+ 
+ #include <string>
++#include <stdlib.h>
+ 
+ #include "base/file_util.h"
+ #include "base/flags.h"
+@@ -94,7 +95,9 @@ void InitMozc(const char *arg0, int *argc, char ***arg
+   mozc_flags::ParseCommandLineFlags(argc, argv, remove_flags);
+ 
+   const string program_name = *argc > 0 ? (*argv)[0] : "UNKNOWN";
+-  Logging::InitLogStream(GetLogFilePathFromProgramName(program_name));
++  const char *nolog = getenv("MOZC_NOLOG");
++  if (nolog == NULL)
++    Logging::InitLogStream(GetLogFilePathFromProgramName(program_name));
+ 
+ }
+ 
diff --git a/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el b/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el
index dac728d79b7f..5fa1efa6a9c9 100644
--- a/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el
+++ b/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el
@@ -1,6 +1,6 @@
---- src/unix/emacs/mozc.el.orig	2015-02-15 04:18:31.000000000 +0900
-+++ src/unix/emacs/mozc.el	2015-02-19 04:01:46.000000000 +0900
-@@ -1538,7 +1538,7 @@
+--- src/unix/emacs/mozc.el.orig	2019-03-04 18:35:55 UTC
++++ src/unix/emacs/mozc.el
+@@ -1540,7 +1540,7 @@ Return the new value of `mozc-session-seq'."
  
  ;;;; Communication with Mozc server through the helper process
  
@@ -9,7 +9,7 @@
    "Helper program's name or path to the helper program.
  The helper program helps Emacs communicate with Mozc server,
  which doesn't understand S-expression.")
-@@ -1973,12 +1973,12 @@
+@@ -1975,12 +1975,12 @@ INPUT-METHOD is not used."
    "Deactivate function `mozc-mode' via LEIM."
    (mozc-mode nil))
  
@@ -28,7 +28,7 @@
  
  (defun mozc-leim-register-input-method ()
    "Register function `mozc-mode' as an input method of LEIM.
-@@ -1994,10 +1994,10 @@
+@@ -1996,10 +1996,10 @@ Do nothing if LEIM is not available."
  ;; Register mozc-mode as an input method after the init file has been read
  ;; so the user has a chance to specify `mozc-leim-title' in the init file
  ;; after loading this file.
diff --git a/japanese/mozc-tool/Makefile b/japanese/mozc-tool/Makefile
index 4b7b82a75647..4d571eca8019 100644
--- a/japanese/mozc-tool/Makefile
+++ b/japanese/mozc-tool/Makefile
@@ -1,7 +1,6 @@
 # Created by: Daichi GOTO <daichi@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	15
 PKGNAMESUFFIX=	-tool
 
 COMMENT=	Mozc tool for IBus, SCIM, and others
diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index 83f40e7d3e03..ae7710325997 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,7 +1,6 @@
 # Created by: Koichiro IWAO <meta+ports@vmeta.jp>
 # $FreeBSD$
 
-PORTREVISION=	15
 PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim