diff --git a/devel/py-gyp/Makefile b/devel/py-gyp/Makefile
index df5b23b62dc8..7a59fb9fc71f 100644
--- a/devel/py-gyp/Makefile
+++ b/devel/py-gyp/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gyp
-PORTVERSION=	20160504
+PORTVERSION=	20200512
 CATEGORIES=	devel python
-MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-e679e688ba6db12336b79650c27fcf8a5ed21e60
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Build System That Generates Other Build Systems
@@ -14,7 +12,9 @@ COMMENT=	Build System That Generates Other Build Systems
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:2.7
+USES=		python:3.5+
+USE_GITHUB=	yes
+GH_ACCOUNT=	hrs-allbsd
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/devel/py-gyp/distinfo b/devel/py-gyp/distinfo
index e673817a6309..d568644540a9 100644
--- a/devel/py-gyp/distinfo
+++ b/devel/py-gyp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 51fadf46a7a108b0c8f273fb726b113609d7be5394d286716cbf472d1327d18c
-SIZE (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 620920
+TIMESTAMP = 1597418236
+SHA256 (hrs-allbsd-gyp-20200512_GH0.tar.gz) = 22db1aec59725a051b242b99455000f508f4469fab85b18131ac547bb40f9dcd
+SIZE (hrs-allbsd-gyp-20200512_GH0.tar.gz) = 628340
diff --git a/japanese/fcitx-mozc/Makefile b/japanese/fcitx-mozc/Makefile
index f0d4f3fb12cd..f2905b99fdee 100644
--- a/japanese/fcitx-mozc/Makefile
+++ b/japanese/fcitx-mozc/Makefile
@@ -5,8 +5,6 @@ PKGNAMEPREFIX=	ja-fcitx-
 
 COMMENT=	Mozc engine for Fcitx
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
 DATADIR=	${PREFIX}/share/fcitx/${PORTNAME}
 
 MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile
index bc402cf9ffa1..d0a1ff3c137f 100644
--- a/japanese/ibus-mozc/Makefile
+++ b/japanese/ibus-mozc/Makefile
@@ -5,8 +5,6 @@ PKGNAMEPREFIX=	ja-ibus-
 
 COMMENT=	Mozc engine for IBus
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
 DATADIR=	${PREFIX}/share/ibus-${PORTNAME}
 
 MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
diff --git a/japanese/mozc-el/Makefile b/japanese/mozc-el/Makefile
index 9e5c342b833d..16f0bcc2a6b1 100644
--- a/japanese/mozc-el/Makefile
+++ b/japanese/mozc-el/Makefile
@@ -1,7 +1,6 @@
 # Created by: TAKANO, Yuji
 # $FreeBSD$
 
-PORTREVISION=	2
 PKGNAMESUFFIX=	-el${EMACS_PKGNAMESUFFIX}
 
 COMMENT=	Emacs input method for Mozc
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index ef81c2f2d522..07e9b264038c 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	mozc
-PORTVERSION=	2.23.2815.102.00
+PORTVERSION=	2.23.2815.102.01
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	7
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	Mozc Japanese Input Method, Server
 
 BUILD_DEPENDS=	ninja:devel/ninja \
-		gyp:devel/py-gyp@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}gyp>=20200512:devel/py-gyp@${PY_FLAVOR}
 EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
 		libzinnia.so:japanese/zinnia
@@ -27,7 +26,7 @@ GH_ACCOUNT=	hrs-allbsd
 GH_TUPLE=	hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic
 
 USES=		compiler:c++11-lang pkgconfig gmake \
-		tar:bzip2 python:2.7,build shebangfix
+		tar:bzip2 python:3.5+,build shebangfix
 SHEBANG_FILES=	src/build_mozc.py
 BUILD_WRKSRC=	${WRKSRC}/src
 
@@ -106,7 +105,8 @@ post-patch:
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
 	${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
 	    ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh
-	${REINPLACE_CMD} "s,/usr,${LOCALBASE:Q}," \
+	${REINPLACE_CMD} \
+	    "s,IconName=.*,IconName=${LOCALBASE:Q}/share/fcitx/mozc/icon/mozc.png," \
 	    ${BUILD_WRKSRC}/unix/fcitx/mozc.conf
 .endif
 
@@ -138,15 +138,15 @@ GYP_DEFINES+=	use_libibus=0 \
 
 MASTER_SITES+=	LOCAL/kuriyama:zipcode
 DISTFILES+= \
-	ken_all-20181228.zip:zipcode \
-	jigyosyo-20181228.zip:zipcode
+	ken_all-20200430.zip:zipcode \
+	jigyosyo-20200430.zip:zipcode
 
 PLIST_FILES+=	bin/mozc \
 		bin/mozc_server \
 		libexec/mozc_emacs_helper
 SUB_FILES+=	mozc
 
-post-extract-mozc_server:
+post-patch-mozc_server:
 	@for F in ${DISTFILES:M*\:zipcode:C/\:zipcode//}; do \
 		${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \
 		    ${DISTDIR}/$$F; \
@@ -159,7 +159,7 @@ post-extract-mozc_server:
 	${MV} ${WRKSRC_udic}/usage_dict.txt \
 	    ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary
 
-post-extract: post-extract-mozc_server
+post-patch: post-patch-mozc_server
 
 do-build-mozc_server:
 	${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server
@@ -214,8 +214,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@${PY_FLAVOR}
+		mozc_tool:japanese/mozc-tool
 
 PLIST_FILES+=	libexec/mozc_renderer \
 		libexec/ibus-engine-mozc \
@@ -378,6 +377,7 @@ do-install-fcitx_mozc:
 CATEGORIES+=	elisp
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server
 
+NO_ARCH=	yes
 PLIST_FILES+=	${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \
 		${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz \
 		${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el
diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo
index 53044bc587b1..c1fd3fa98107 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,10 +1,10 @@
-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
+TIMESTAMP = 1597425320
+SHA256 (ken_all-20200430.zip) = b60b5becaf5af4315cc1b4204e0a8bbd61b8848beb5b9437f917c22ef7a85e96
+SIZE (ken_all-20200430.zip) = 1690470
+SHA256 (jigyosyo-20200430.zip) = 2f42b3780f1cecdbb8bc295389f349b12f6ec872542f42333bbac971f47e5f27
+SIZE (jigyosyo-20200430.zip) = 767036
+SHA256 (hrs-allbsd-mozc-v2.23.2815.102.01_GH0.tar.gz) = 05da136f52230aa8f7d0b96e8c3aaf4a2367a44bc1026bd4b23d22b46c6687b6
+SIZE (hrs-allbsd-mozc-v2.23.2815.102.01_GH0.tar.gz) = 36712681
 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/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index bf0b64c8c542..ae7710325997 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -5,9 +5,6 @@ PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
-
 MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
 FILESDIR=	${.CURDIR}/files
 DATADIR=	${PREFIX}/share/uim