git: 50c97dbfefc0 - main - fcitx5: Update related ports to the latest version as 2023-03-18

From: Li-Wen Hsu <lwhsu_at_FreeBSD.org>
Date: Sat, 18 Mar 2023 13:13:34 UTC
The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=50c97dbfefc00515dc5da57b18c07bb4a8986296

commit 50c97dbfefc00515dc5da57b18c07bb4a8986296
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2023-03-18 13:12:46 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2023-03-18 13:12:46 +0000

    fcitx5: Update related ports to the latest version as 2023-03-18
    
    While here, use the official site to fetch distfiles from
    
    Approved by:    khng
    Differential Revision: https://reviews.freebsd.org/D37948
---
 chinese/fcitx5-chewing/Makefile                    |  12 +-
 chinese/fcitx5-chewing/distinfo                    |   6 +-
 chinese/fcitx5-chewing/pkg-plist                   |   8 +-
 chinese/fcitx5-chinese-addons/Makefile             |  25 ++-
 chinese/fcitx5-chinese-addons/distinfo             |   6 +-
 chinese/fcitx5-chinese-addons/pkg-plist            |  86 +++++++++-
 chinese/fcitx5-rime/Makefile                       |  17 +-
 chinese/fcitx5-rime/distinfo                       |   6 +-
 chinese/fcitx5-rime/pkg-plist                      |   1 +
 chinese/fcitx5-table-extra/Makefile                |  13 +-
 chinese/fcitx5-table-extra/distinfo                |   6 +-
 chinese/fcitx5-table-extra/pkg-plist               | 108 ++++++++++++
 chinese/fcitx5-table-other/Makefile                |  15 +-
 chinese/fcitx5-table-other/distinfo                |   6 +-
 chinese/fcitx5-table-other/pkg-plist               | 186 +++++++++++++++++++++
 chinese/libime-jyutping/Makefile                   |  26 ++-
 chinese/libime-jyutping/distinfo                   |   6 +-
 chinese/libime-jyutping/pkg-plist                  |   3 +
 chinese/libime/Makefile                            |  22 ++-
 chinese/libime/distinfo                            |  16 +-
 chinese/libime/pkg-plist                           |   1 +
 japanese/fcitx5-anthy/Makefile                     |  10 +-
 japanese/fcitx5-anthy/distinfo                     |   6 +-
 japanese/fcitx5-anthy/pkg-plist                    |  10 +-
 korean/fcitx5-hangul/Makefile                      |  20 +--
 korean/fcitx5-hangul/distinfo                      |   6 +-
 korean/fcitx5-hangul/pkg-plist                     |  20 +++
 textproc/fcitx5-configtool/Makefile                |  30 ++--
 textproc/fcitx5-configtool/distinfo                |   6 +-
 textproc/fcitx5-configtool/pkg-plist               |   3 +
 textproc/fcitx5-gtk/Makefile                       |  16 +-
 textproc/fcitx5-gtk/distinfo                       |   6 +-
 textproc/fcitx5-lua/Makefile                       |   9 +-
 textproc/fcitx5-lua/distinfo                       |   6 +-
 textproc/fcitx5-lua/pkg-plist                      |   4 +-
 textproc/fcitx5-qt-common/Makefile                 |   2 -
 textproc/fcitx5-qt/Makefile                        |  16 +-
 textproc/fcitx5-qt/distinfo                        |   8 +-
 .../fcitx5-qt/files/extra-patch-CMakeLists.txt     |   5 +-
 textproc/fcitx5-qt/pkg-plist.qt5                   |   1 +
 textproc/fcitx5/Makefile                           |  52 +++---
 textproc/fcitx5/distinfo                           |   8 +-
 textproc/fcitx5/pkg-plist                          | 140 ++++++++++++++++
 x11/xcb-imdkit/Makefile                            |  10 +-
 x11/xcb-imdkit/distinfo                            |   6 +-
 45 files changed, 742 insertions(+), 233 deletions(-)

diff --git a/chinese/fcitx5-chewing/Makefile b/chinese/fcitx5-chewing/Makefile
index ae2113859f83..ae69e33f63ed 100644
--- a/chinese/fcitx5-chewing/Makefile
+++ b/chinese/fcitx5-chewing/Makefile
@@ -1,21 +1,19 @@
 PORTNAME=	fcitx5-chewing
-DISTVERSION=	5.0.7
+DISTVERSION=	5.0.14
 CATEGORIES=	chinese textproc
+MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/
 
 MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Chewing support for Fcitx5
 WWW=		https://github.com/fcitx/fcitx5-chewing
 
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
 
 LIB_DEPENDS=	libchewing.so:chinese/libchewing \
 		libFcitx5Core.so:textproc/fcitx5
 
-USES=		compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	fcitx
+USES=		compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig tar:xz
 
 USE_KDE=	ecm
 
diff --git a/chinese/fcitx5-chewing/distinfo b/chinese/fcitx5-chewing/distinfo
index 48abaacea96f..5cef44e845e7 100644
--- a/chinese/fcitx5-chewing/distinfo
+++ b/chinese/fcitx5-chewing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637876753
-SHA256 (fcitx-fcitx5-chewing-5.0.7_GH0.tar.gz) = 364b2898117391e780c67d3fdb0bf5757ee446c57a2944c6efb268c3c832fffc
-SIZE (fcitx-fcitx5-chewing-5.0.7_GH0.tar.gz) = 20634
+TIMESTAMP = 1679110391
+SHA256 (fcitx5-chewing-5.0.14.tar.xz) = 7000d66a341e3bdb5bdf8c948c20bf1b6f4cb08b458d13d4d3c2e3fd6e30e6f8
+SIZE (fcitx5-chewing-5.0.14.tar.xz) = 23780
diff --git a/chinese/fcitx5-chewing/pkg-plist b/chinese/fcitx5-chewing/pkg-plist
index 77b6dda92b77..b6c64e11b0bc 100644
--- a/chinese/fcitx5-chewing/pkg-plist
+++ b/chinese/fcitx5-chewing/pkg-plist
@@ -1,6 +1,12 @@
-lib/fcitx5/chewing.so
+lib/fcitx5/libchewing.so
 share/fcitx5/addon/chewing.conf
 share/fcitx5/inputmethod/chewing.conf
+share/icons/hicolor/16x16/apps/fcitx-chewing.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-chewing.png
+share/icons/hicolor/22x22/apps/fcitx-chewing.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-chewing.png
+share/icons/hicolor/24x24/apps/fcitx-chewing.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chewing.png
 share/icons/hicolor/48x48/apps/fcitx-chewing.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-chewing.png
 share/locale/ca/LC_MESSAGES/fcitx5-chewing.mo
diff --git a/chinese/fcitx5-chinese-addons/Makefile b/chinese/fcitx5-chinese-addons/Makefile
index b6511569efaa..886836647e51 100644
--- a/chinese/fcitx5-chinese-addons/Makefile
+++ b/chinese/fcitx5-chinese-addons/Makefile
@@ -1,9 +1,10 @@
 PORTNAME=	fcitx5-chinese-addons
-DISTVERSION=	5.0.8
-PORTREVISION=	4
+DISTVERSION=	5.0.17
 CATEGORIES=	chinese textproc
-MASTER_SITES=	https://download.fcitx-im.org/data/:py_stroke,py_table
-DISTFILES=	${PY_STROKE_TAR}:py_stroke \
+MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/ \
+		https://download.fcitx-im.org/data/:py_stroke,py_table
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PY_STROKE_TAR}:py_stroke \
 		${PY_TABLE_TAR}:py_table
 DIST_SUBDIR=	${PORTNAME}
 
@@ -15,15 +16,16 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
 
 BUILD_DEPENDS=	fcitx5-lua>0:textproc/fcitx5-lua
-LIB_DEPENDS=	libcurl.so:ftp/curl \
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
+		libcurl.so:ftp/curl \
+		libFcitx5Core.so:textproc/fcitx5 \
 		libfmt.so:devel/libfmt \
-		libopencc.so:chinese/opencc \
-		libboost_iostreams.so:devel/boost-libs \
 		libIMEPinyin.so:chinese/libime \
-		libFcitx5Core.so:textproc/fcitx5
+		libopencc.so:chinese/opencc
 RUN_DEPENDS=	fcitx5-lua>0:textproc/fcitx5-lua
 
-USES=		compiler:c++17-lang gettext cmake kde:5 localbase pkgconfig
+USES=		cmake compiler:c++17-lang gettext kde:5 localbase pkgconfig \
+		tar:xz
 
 OPTIONS_DEFINE=		GUI
 OPTIONS_DEFAULT=	GUI
@@ -32,13 +34,10 @@ USE_LDCONFIG=	yes
 
 GUI_DESC=	Configuration GUI
 GUI_USES=	qt:5
-GUI_USE=	qt=dbus,concurrent,webkit,buildtools:build,qmake:build
+GUI_USE=	qt=concurrent,dbus,webkit,buildtools:build,qmake:build
 GUI_LIB_DEPENDS=	libFcitx5Qt5DBusAddons.so:textproc/fcitx5-qt
 GUI_CMAKE_ON=	-DUSE_WEBKIT:BOOL=true
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	fcitx
-
 USE_KDE=	ecm
 
 CMAKE_ON=	ENABLE_OPENCC
diff --git a/chinese/fcitx5-chinese-addons/distinfo b/chinese/fcitx5-chinese-addons/distinfo
index 086fb351936a..2092cbdff534 100644
--- a/chinese/fcitx5-chinese-addons/distinfo
+++ b/chinese/fcitx5-chinese-addons/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1637876896
+TIMESTAMP = 1679110805
+SHA256 (fcitx5-chinese-addons/fcitx5-chinese-addons-5.0.17.tar.xz) = 9822aeac6b772d38df8bca4f806798d0cef8e8493cc601ddbe060b50b6f75f46
+SIZE (fcitx5-chinese-addons/fcitx5-chinese-addons-5.0.17.tar.xz) = 234696
 SHA256 (fcitx5-chinese-addons/py_stroke-20121124.tar.gz) = 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248
 SIZE (fcitx5-chinese-addons/py_stroke-20121124.tar.gz) = 445601
 SHA256 (fcitx5-chinese-addons/py_table-20121124.tar.gz) = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
 SIZE (fcitx5-chinese-addons/py_table-20121124.tar.gz) = 186822
-SHA256 (fcitx5-chinese-addons/fcitx-fcitx5-chinese-addons-5.0.8_GH0.tar.gz) = f712373bb9d424fc4d1d6d36e759c43718634b30e109c58d410baf94f6bd7072
-SIZE (fcitx5-chinese-addons/fcitx-fcitx5-chinese-addons-5.0.8_GH0.tar.gz) = 268813
diff --git a/chinese/fcitx5-chinese-addons/pkg-plist b/chinese/fcitx5-chinese-addons/pkg-plist
index 439b940f12c5..f51c642db894 100644
--- a/chinese/fcitx5-chinese-addons/pkg-plist
+++ b/chinese/fcitx5-chinese-addons/pkg-plist
@@ -8,14 +8,14 @@ lib/cmake/Fcitx5ModulePinyinHelper/Fcitx5ModulePinyinHelperConfig.cmake
 lib/cmake/Fcitx5ModulePinyinHelper/Fcitx5ModulePinyinHelperConfigVersion.cmake
 lib/cmake/Fcitx5ModulePunctuation/Fcitx5ModulePunctuationConfig.cmake
 lib/cmake/Fcitx5ModulePunctuation/Fcitx5ModulePunctuationConfigVersion.cmake
-lib/fcitx5/chttrans.so
-lib/fcitx5/cloudpinyin.so
-lib/fcitx5/fullwidth.so
-lib/fcitx5/pinyin.so
-lib/fcitx5/pinyinhelper.so
-lib/fcitx5/punctuation.so
+lib/fcitx5/libchttrans.so
+lib/fcitx5/libcloudpinyin.so
+lib/fcitx5/libfullwidth.so
+lib/fcitx5/libpinyin.so
+lib/fcitx5/libpinyinhelper.so
+lib/fcitx5/libpunctuation.so
+lib/fcitx5/libtable.so
 lib/fcitx5/qt5/libpinyindictmanager.so
-lib/fcitx5/table.so
 share/fcitx5/addon/chttrans.conf
 share/fcitx5/addon/cloudpinyin.conf
 share/fcitx5/addon/fullwidth.conf
@@ -42,30 +42,102 @@ share/fcitx5/pinyinhelper/py_table.mb
 share/fcitx5/punctuation/punc.mb.zh_CN
 share/fcitx5/punctuation/punc.mb.zh_HK
 share/fcitx5/punctuation/punc.mb.zh_TW
+share/icons/hicolor/16x16/apps/fcitx-cangjie.png
+share/icons/hicolor/16x16/apps/fcitx-chn.png
+share/icons/hicolor/16x16/apps/fcitx-chttrans-active.png
+share/icons/hicolor/16x16/apps/fcitx-chttrans-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-erbi.png
 share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
 share/icons/hicolor/16x16/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-pinyin.png
 share/icons/hicolor/16x16/apps/fcitx-punc-active.png
 share/icons/hicolor/16x16/apps/fcitx-punc-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-remind-active.png
+share/icons/hicolor/16x16/apps/fcitx-remind-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-shuangpin.png
+share/icons/hicolor/16x16/apps/fcitx-wbpy.png
+share/icons/hicolor/16x16/apps/fcitx-wubi.png
+share/icons/hicolor/16x16/apps/fcitx-ziranma.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-cangjie.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-chn.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-chttrans-active.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-chttrans-inactive.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-erbi.png
 share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-fullwidth-active.png
 share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-fullwidth-inactive.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-pinyin.png
 share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-punc-active.png
 share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-punc-inactive.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-remind-active.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-remind-inactive.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-shuangpin.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-wbpy.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-wubi.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-ziranma.png
+share/icons/hicolor/22x22/apps/fcitx-cangjie.png
+share/icons/hicolor/22x22/apps/fcitx-chn.png
+share/icons/hicolor/22x22/apps/fcitx-chttrans-active.png
+share/icons/hicolor/22x22/apps/fcitx-chttrans-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-erbi.png
 share/icons/hicolor/22x22/apps/fcitx-fullwidth-active.png
 share/icons/hicolor/22x22/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-pinyin.png
 share/icons/hicolor/22x22/apps/fcitx-punc-active.png
 share/icons/hicolor/22x22/apps/fcitx-punc-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-remind-active.png
+share/icons/hicolor/22x22/apps/fcitx-remind-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-shuangpin.png
+share/icons/hicolor/22x22/apps/fcitx-wbpy.png
+share/icons/hicolor/22x22/apps/fcitx-wubi.png
+share/icons/hicolor/22x22/apps/fcitx-ziranma.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-cangjie.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-chn.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-chttrans-active.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-chttrans-inactive.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-erbi.png
 share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-fullwidth-active.png
 share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-fullwidth-inactive.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-pinyin.png
 share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-punc-active.png
 share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-punc-inactive.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-remind-active.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-remind-inactive.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-shuangpin.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-wbpy.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-wubi.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-ziranma.png
+share/icons/hicolor/24x24/apps/fcitx-cangjie.png
+share/icons/hicolor/24x24/apps/fcitx-chn.png
+share/icons/hicolor/24x24/apps/fcitx-chttrans-active.png
+share/icons/hicolor/24x24/apps/fcitx-chttrans-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-erbi.png
 share/icons/hicolor/24x24/apps/fcitx-fullwidth-active.png
 share/icons/hicolor/24x24/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-pinyin.png
 share/icons/hicolor/24x24/apps/fcitx-punc-active.png
 share/icons/hicolor/24x24/apps/fcitx-punc-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-remind-active.png
+share/icons/hicolor/24x24/apps/fcitx-remind-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-shuangpin.png
+share/icons/hicolor/24x24/apps/fcitx-wbpy.png
+share/icons/hicolor/24x24/apps/fcitx-wubi.png
+share/icons/hicolor/24x24/apps/fcitx-ziranma.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-cangjie.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chn.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chttrans-active.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chttrans-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-erbi.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-fullwidth-active.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-fullwidth-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-pinyin.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punc-active.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punc-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-remind-active.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-remind-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-shuangpin.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wbpy.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wubi.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-ziranma.png
 share/icons/hicolor/48x48/apps/fcitx-cangjie.png
 share/icons/hicolor/48x48/apps/fcitx-chn.png
 share/icons/hicolor/48x48/apps/fcitx-chttrans-active.png
diff --git a/chinese/fcitx5-rime/Makefile b/chinese/fcitx5-rime/Makefile
index 5a9f4d2429dc..f774a50ec0d5 100644
--- a/chinese/fcitx5-rime/Makefile
+++ b/chinese/fcitx5-rime/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fcitx5-rime
-DISTVERSION=	5.0.8
-PORTREVISION=	1
+DISTVERSION=	5.0.16
 CATEGORIES=	chinese textproc
+MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/
 
 MAINTAINER=	khng@FreeBSD.org
 COMMENT=	RIME support for Fcitx5
@@ -11,24 +11,21 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
 
 BUILD_DEPENDS=	${_SCHEMA_DEPENDS}
-LIB_DEPENDS=	librime.so:chinese/librime \
-		libFcitx5Core.so:textproc/fcitx5
+LIB_DEPENDS=	libFcitx5Core.so:textproc/fcitx5 \
+		librime.so:chinese/librime
 RUN_DEPENDS=	${_SCHEMA_DEPENDS}
 
-USES=		compiler:c++17-lang gettext-tools cmake kde:5 localbase \
-		pkgconfig
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	fcitx
+USES=		cmake compiler:c++17-lang gettext-tools kde:5 localbase \
+		pkgconfig tar:xz
 
 USE_KDE=	ecm
 
 CONFLICTS_INSTALL=	zh-fcitx-rime # share/icons/hicolor/48x48/apps/fcitx-rime-deploy.png
 
 _SCHEMA_DEPENDS=	\
-	${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin	\
 	${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo	\
 	${LOCALBASE}/share/rime-data/cangjie5.schema.yaml:chinese/rime-cangjie	\
+	${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin	\
 	${LOCALBASE}/share/rime-data/stroke.schema.yaml:chinese/rime-stroke
 
 .include <bsd.port.mk>
diff --git a/chinese/fcitx5-rime/distinfo b/chinese/fcitx5-rime/distinfo
index 19e195f69d1d..f927f6017401 100644
--- a/chinese/fcitx5-rime/distinfo
+++ b/chinese/fcitx5-rime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637876884
-SHA256 (fcitx-fcitx5-rime-5.0.8_GH0.tar.gz) = ec91bc2f18a905e71dd6157c0ae7cf10d90001118325321b7d7f9f9c74545547
-SIZE (fcitx-fcitx5-rime-5.0.8_GH0.tar.gz) = 47496
+TIMESTAMP = 1679111062
+SHA256 (fcitx5-rime-5.0.16.tar.xz) = 5076d90b95d67bde6beffb48a3c9d643c60f54e82dc6e7243eb794cada8c7834
+SIZE (fcitx5-rime-5.0.16.tar.xz) = 44948
diff --git a/chinese/fcitx5-rime/pkg-plist b/chinese/fcitx5-rime/pkg-plist
index 8cc9936f9036..0d45808897aa 100644
--- a/chinese/fcitx5-rime/pkg-plist
+++ b/chinese/fcitx5-rime/pkg-plist
@@ -37,3 +37,4 @@ share/locale/vi/LC_MESSAGES/fcitx5-rime.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx5-rime.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx5-rime.mo
 share/metainfo/org.fcitx.Fcitx5.Addon.Rime.metainfo.xml
+share/rime-data/fcitx5.yaml
diff --git a/chinese/fcitx5-table-extra/Makefile b/chinese/fcitx5-table-extra/Makefile
index d41674891eb3..289cad8a2c9c 100644
--- a/chinese/fcitx5-table-extra/Makefile
+++ b/chinese/fcitx5-table-extra/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fcitx5-table-extra
-DISTVERSION=	5.0.6
-PORTREVISION=	1
+DISTVERSION=	5.0.13
 CATEGORIES=	chinese textproc
+MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/
 
 MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Extra table support for Fcitx5
@@ -10,13 +10,10 @@ WWW=		https://github.com/fcitx/fcitx5-table-extra
 LICENSE=	GPLv2+ GPLv3
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libIMETable.so:chinese/libime \
-		libFcitx5Core.so:textproc/fcitx5
+LIB_DEPENDS=	libFcitx5Core.so:textproc/fcitx5 \
+		libIMETable.so:chinese/libime
 
-USES=		gettext-tools cmake kde:5
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	fcitx
+USES=		cmake gettext-tools kde:5 tar:xz
 
 USE_KDE=	ecm
 
diff --git a/chinese/fcitx5-table-extra/distinfo b/chinese/fcitx5-table-extra/distinfo
index 7fbb04871716..99a9ed1ac0f9 100644
--- a/chinese/fcitx5-table-extra/distinfo
+++ b/chinese/fcitx5-table-extra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637876973
-SHA256 (fcitx-fcitx5-table-extra-5.0.6_GH0.tar.gz) = d962b6a0c448ed0a235c2b7ca4c17534b0e8b8c5f0c500cd3a45492596615761
-SIZE (fcitx-fcitx5-table-extra-5.0.6_GH0.tar.gz) = 8489591
+TIMESTAMP = 1679111138
+SHA256 (fcitx5-table-extra-5.0.13.tar.xz) = 6aec03e6cb1408d8447898226132e7226071535c0584e35e04159e4c5f74a016
+SIZE (fcitx5-table-extra-5.0.13.tar.xz) = 7288400
diff --git a/chinese/fcitx5-table-extra/pkg-plist b/chinese/fcitx5-table-extra/pkg-plist
index 6c7ef5122655..568799482634 100644
--- a/chinese/fcitx5-table-extra/pkg-plist
+++ b/chinese/fcitx5-table-extra/pkg-plist
@@ -16,6 +16,9 @@ share/fcitx5/inputmethod/stroke5.conf
 share/fcitx5/inputmethod/t9.conf
 share/fcitx5/inputmethod/wu.conf
 share/fcitx5/inputmethod/wubi-large.conf
+share/fcitx5/inputmethod/wubi98-pinyin.conf
+share/fcitx5/inputmethod/wubi98-single.conf
+share/fcitx5/inputmethod/wubi98.conf
 share/fcitx5/inputmethod/zhengma-large.conf
 share/fcitx5/inputmethod/zhengma-pinyin.conf
 share/fcitx5/inputmethod/zhengma.conf
@@ -37,27 +40,132 @@ share/fcitx5/table/stroke5.main.dict
 share/fcitx5/table/t9.main.dict
 share/fcitx5/table/wu.main.dict
 share/fcitx5/table/wubi-large.main.dict
+share/fcitx5/table/wubi98-pinyin.main.dict
+share/fcitx5/table/wubi98-single.main.dict
+share/fcitx5/table/wubi98.main.dict
 share/fcitx5/table/zhengma-large.main.dict
 share/fcitx5/table/zhengma-pinyin.main.dict
 share/fcitx5/table/zhengma.main.dict
+share/icons/hicolor/16x16/apps/fcitx-array30-large.png
+share/icons/hicolor/16x16/apps/fcitx-array30.png
+share/icons/hicolor/16x16/apps/fcitx-boshiamy.png
+share/icons/hicolor/16x16/apps/fcitx-cantonese.png
+share/icons/hicolor/16x16/apps/fcitx-cantonhk.png
+share/icons/hicolor/16x16/apps/fcitx-easy-large.png
+share/icons/hicolor/16x16/apps/fcitx-jyutping-table.png
+share/icons/hicolor/16x16/apps/fcitx-quick-classic.png
+share/icons/hicolor/16x16/apps/fcitx-quick3.png
+share/icons/hicolor/16x16/apps/fcitx-quick5.png
+share/icons/hicolor/16x16/apps/fcitx-scj6.png
+share/icons/hicolor/16x16/apps/fcitx-stroke5.png
+share/icons/hicolor/16x16/apps/fcitx-t9.png
+share/icons/hicolor/16x16/apps/fcitx-wu.png
+share/icons/hicolor/16x16/apps/fcitx-zhengma.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-array30.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-quick3.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-quick5.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-scj6.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-t9.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-wu.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
+share/icons/hicolor/22x22/apps/fcitx-array30-large.png
+share/icons/hicolor/22x22/apps/fcitx-array30.png
+share/icons/hicolor/22x22/apps/fcitx-boshiamy.png
+share/icons/hicolor/22x22/apps/fcitx-cantonese.png
+share/icons/hicolor/22x22/apps/fcitx-cantonhk.png
+share/icons/hicolor/22x22/apps/fcitx-easy-large.png
+share/icons/hicolor/22x22/apps/fcitx-jyutping-table.png
+share/icons/hicolor/22x22/apps/fcitx-quick-classic.png
+share/icons/hicolor/22x22/apps/fcitx-quick3.png
+share/icons/hicolor/22x22/apps/fcitx-quick5.png
+share/icons/hicolor/22x22/apps/fcitx-scj6.png
+share/icons/hicolor/22x22/apps/fcitx-stroke5.png
+share/icons/hicolor/22x22/apps/fcitx-t9.png
+share/icons/hicolor/22x22/apps/fcitx-wu.png
+share/icons/hicolor/22x22/apps/fcitx-zhengma.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-array30.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-quick3.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-quick5.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-scj6.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-t9.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-wu.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
+share/icons/hicolor/24x24/apps/fcitx-array30-large.png
+share/icons/hicolor/24x24/apps/fcitx-array30.png
+share/icons/hicolor/24x24/apps/fcitx-boshiamy.png
+share/icons/hicolor/24x24/apps/fcitx-cantonese.png
+share/icons/hicolor/24x24/apps/fcitx-cantonhk.png
+share/icons/hicolor/24x24/apps/fcitx-easy-large.png
+share/icons/hicolor/24x24/apps/fcitx-jyutping-table.png
+share/icons/hicolor/24x24/apps/fcitx-quick-classic.png
+share/icons/hicolor/24x24/apps/fcitx-quick3.png
+share/icons/hicolor/24x24/apps/fcitx-quick5.png
+share/icons/hicolor/24x24/apps/fcitx-scj6.png
+share/icons/hicolor/24x24/apps/fcitx-stroke5.png
+share/icons/hicolor/24x24/apps/fcitx-t9.png
+share/icons/hicolor/24x24/apps/fcitx-wu.png
+share/icons/hicolor/24x24/apps/fcitx-zhengma.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-array30.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-quick3.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-quick5.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-scj6.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-t9.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wu.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
+share/icons/hicolor/48x48/apps/fcitx-array30-large.png
+share/icons/hicolor/48x48/apps/fcitx-array30.png
+share/icons/hicolor/48x48/apps/fcitx-boshiamy.png
 share/icons/hicolor/48x48/apps/fcitx-cantonese.png
 share/icons/hicolor/48x48/apps/fcitx-cantonhk.png
+share/icons/hicolor/48x48/apps/fcitx-easy-large.png
 share/icons/hicolor/48x48/apps/fcitx-jyutping-table.png
 share/icons/hicolor/48x48/apps/fcitx-quick-classic.png
 share/icons/hicolor/48x48/apps/fcitx-quick3.png
 share/icons/hicolor/48x48/apps/fcitx-quick5.png
 share/icons/hicolor/48x48/apps/fcitx-scj6.png
 share/icons/hicolor/48x48/apps/fcitx-stroke5.png
+share/icons/hicolor/48x48/apps/fcitx-t9.png
 share/icons/hicolor/48x48/apps/fcitx-wu.png
+share/icons/hicolor/48x48/apps/fcitx-zhengma.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-array30.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-quick3.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-quick5.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-scj6.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-t9.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-wu.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
 share/icons/hicolor/64x64/apps/fcitx-array30-large.png
 share/icons/hicolor/64x64/apps/fcitx-array30.png
 share/icons/hicolor/64x64/apps/fcitx-boshiamy.png
diff --git a/chinese/fcitx5-table-other/Makefile b/chinese/fcitx5-table-other/Makefile
index f6b3c3f9ed11..1837e93b4403 100644
--- a/chinese/fcitx5-table-other/Makefile
+++ b/chinese/fcitx5-table-other/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fcitx5-table-other
-DISTVERSION=	5.0.6
-PORTREVISION=	1
+DISTVERSION=	5.0.11
 CATEGORIES=	chinese textproc
+MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/
 
 MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Other table support for Fcitx5
@@ -9,19 +9,16 @@ WWW=		https://github.com/fcitx/fcitx5-table-other
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libIMETable.so:chinese/libime \
-		libFcitx5Core.so:textproc/fcitx5
+LIB_DEPENDS=	libFcitx5Core.so:textproc/fcitx5 \
+		libIMETable.so:chinese/libime
 
-USES=		gettext-tools cmake kde:5
+USES=		cmake gettext-tools kde:5 tar:xz
 
 OPTIONS_DEFINE=	DEPRECATED
 
-DEPRECATED_DESC=	Deprecated tables
+DEPRECATED_DESC=	Enable deprecated tables
 DEPRECATED_CMAKE_BOOL=	ENABLE_DEPRECATED
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	fcitx
-
 USE_KDE=	ecm
 
 INSTALL_TARGET=	install
diff --git a/chinese/fcitx5-table-other/distinfo b/chinese/fcitx5-table-other/distinfo
index fb500cdb898d..7c90c7226700 100644
--- a/chinese/fcitx5-table-other/distinfo
+++ b/chinese/fcitx5-table-other/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637877005
-SHA256 (fcitx-fcitx5-table-other-5.0.6_GH0.tar.gz) = 3572b161768aaf3d46d9865048de2c68df9ca60bb0f14c5368f53d3abb15f512
-SIZE (fcitx-fcitx5-table-other-5.0.6_GH0.tar.gz) = 524102
+TIMESTAMP = 1679111241
+SHA256 (fcitx5-table-other-5.0.11.tar.xz) = 3f61b7f0364cb7149eaeaeac6fce3d00ab72d6cb5bb884760a41d4738df3244c
+SIZE (fcitx5-table-other-5.0.11.tar.xz) = 286136
diff --git a/chinese/fcitx5-table-other/pkg-plist b/chinese/fcitx5-table-other/pkg-plist
index 2c37d5a0cb1a..2914a44c59b6 100644
--- a/chinese/fcitx5-table-other/pkg-plist
+++ b/chinese/fcitx5-table-other/pkg-plist
@@ -28,14 +28,197 @@ share/fcitx5/table/translit-ua.main.dict
 share/fcitx5/table/translit.main.dict
 share/fcitx5/table/viqr.main.dict
 share/fcitx5/table/yawerty.main.dict
+share/icons/hicolor/16x16/apps/fcitx-amharic.png
+share/icons/hicolor/16x16/apps/fcitx-arabic.png
+share/icons/hicolor/16x16/apps/fcitx-bengali-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-bengali-probhat.png
+share/icons/hicolor/16x16/apps/fcitx-cns11643.png
+share/icons/hicolor/16x16/apps/fcitx-compose.png
+share/icons/hicolor/16x16/apps/fcitx-emoji.png
+share/icons/hicolor/16x16/apps/fcitx-gujarati-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-gujarati-phonetic.png
+share/icons/hicolor/16x16/apps/fcitx-hindi-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-hindi-phonetic.png
+share/icons/hicolor/16x16/apps/fcitx-ipa-x-sampa.png
+share/icons/hicolor/16x16/apps/fcitx-kannada-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-kannada-kgp.png
+share/icons/hicolor/16x16/apps/fcitx-latex.png
+share/icons/hicolor/16x16/apps/fcitx-malayalam-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-malayalam-phonetic.png
+share/icons/hicolor/16x16/apps/fcitx-nepali.png
+share/icons/hicolor/16x16/apps/fcitx-punjabi-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-punjabi-jhelum.png
+share/icons/hicolor/16x16/apps/fcitx-punjabi-phonetic.png
+share/icons/hicolor/16x16/apps/fcitx-rustrad.png
+share/icons/hicolor/16x16/apps/fcitx-tamil-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-tamil-phonetic.png
+share/icons/hicolor/16x16/apps/fcitx-tamil-remington.png
+share/icons/hicolor/16x16/apps/fcitx-telugu-inscript.png
+share/icons/hicolor/16x16/apps/fcitx-thai.png
+share/icons/hicolor/16x16/apps/fcitx-translit-ua.png
+share/icons/hicolor/16x16/apps/fcitx-translit.png
+share/icons/hicolor/16x16/apps/fcitx-viqr.png
+share/icons/hicolor/16x16/apps/fcitx-yawerty.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-amharic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-arabic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-bengali-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-bengali-probhat.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-cns11643.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-compose.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-emoji.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-gujarati-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-gujarati-phonetic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-hindi-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-hindi-phonetic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-ipa-x-sampa.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-kannada-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-kannada-kgp.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-latex.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-malayalam-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-malayalam-phonetic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-nepali.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-punjabi-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-punjabi-jhelum.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-punjabi-phonetic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-rustrad.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-tamil-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-tamil-phonetic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-tamil-remington.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-telugu-inscript.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-thai.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-translit-ua.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-translit.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-viqr.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-yawerty.png
+share/icons/hicolor/22x22/apps/fcitx-amharic.png
+share/icons/hicolor/22x22/apps/fcitx-arabic.png
+share/icons/hicolor/22x22/apps/fcitx-bengali-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-bengali-probhat.png
+share/icons/hicolor/22x22/apps/fcitx-cns11643.png
+share/icons/hicolor/22x22/apps/fcitx-compose.png
+share/icons/hicolor/22x22/apps/fcitx-emoji.png
+share/icons/hicolor/22x22/apps/fcitx-gujarati-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-gujarati-phonetic.png
+share/icons/hicolor/22x22/apps/fcitx-hindi-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-hindi-phonetic.png
+share/icons/hicolor/22x22/apps/fcitx-ipa-x-sampa.png
+share/icons/hicolor/22x22/apps/fcitx-kannada-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-kannada-kgp.png
+share/icons/hicolor/22x22/apps/fcitx-latex.png
+share/icons/hicolor/22x22/apps/fcitx-malayalam-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-malayalam-phonetic.png
+share/icons/hicolor/22x22/apps/fcitx-nepali.png
+share/icons/hicolor/22x22/apps/fcitx-punjabi-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-punjabi-jhelum.png
+share/icons/hicolor/22x22/apps/fcitx-punjabi-phonetic.png
+share/icons/hicolor/22x22/apps/fcitx-rustrad.png
+share/icons/hicolor/22x22/apps/fcitx-tamil-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-tamil-phonetic.png
+share/icons/hicolor/22x22/apps/fcitx-tamil-remington.png
+share/icons/hicolor/22x22/apps/fcitx-telugu-inscript.png
+share/icons/hicolor/22x22/apps/fcitx-thai.png
+share/icons/hicolor/22x22/apps/fcitx-translit-ua.png
+share/icons/hicolor/22x22/apps/fcitx-translit.png
+share/icons/hicolor/22x22/apps/fcitx-viqr.png
+share/icons/hicolor/22x22/apps/fcitx-yawerty.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-amharic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-arabic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-bengali-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-bengali-probhat.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-cns11643.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-compose.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-emoji.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-gujarati-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-gujarati-phonetic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-hindi-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-hindi-phonetic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-ipa-x-sampa.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-kannada-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-kannada-kgp.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-latex.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-malayalam-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-malayalam-phonetic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-nepali.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-punjabi-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-punjabi-jhelum.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-punjabi-phonetic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-rustrad.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-tamil-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-tamil-phonetic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-tamil-remington.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-telugu-inscript.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-thai.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-translit-ua.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-translit.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-viqr.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-yawerty.png
 share/icons/hicolor/24x24/apps/fcitx-amharic.png
 share/icons/hicolor/24x24/apps/fcitx-arabic.png
+share/icons/hicolor/24x24/apps/fcitx-bengali-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-bengali-probhat.png
+share/icons/hicolor/24x24/apps/fcitx-cns11643.png
+share/icons/hicolor/24x24/apps/fcitx-compose.png
+share/icons/hicolor/24x24/apps/fcitx-emoji.png
+share/icons/hicolor/24x24/apps/fcitx-gujarati-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-gujarati-phonetic.png
+share/icons/hicolor/24x24/apps/fcitx-hindi-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-hindi-phonetic.png
+share/icons/hicolor/24x24/apps/fcitx-ipa-x-sampa.png
+share/icons/hicolor/24x24/apps/fcitx-kannada-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-kannada-kgp.png
+share/icons/hicolor/24x24/apps/fcitx-latex.png
+share/icons/hicolor/24x24/apps/fcitx-malayalam-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-malayalam-phonetic.png
+share/icons/hicolor/24x24/apps/fcitx-nepali.png
+share/icons/hicolor/24x24/apps/fcitx-punjabi-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-punjabi-jhelum.png
+share/icons/hicolor/24x24/apps/fcitx-punjabi-phonetic.png
+share/icons/hicolor/24x24/apps/fcitx-rustrad.png
+share/icons/hicolor/24x24/apps/fcitx-tamil-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-tamil-phonetic.png
+share/icons/hicolor/24x24/apps/fcitx-tamil-remington.png
+share/icons/hicolor/24x24/apps/fcitx-telugu-inscript.png
+share/icons/hicolor/24x24/apps/fcitx-thai.png
+share/icons/hicolor/24x24/apps/fcitx-translit-ua.png
+share/icons/hicolor/24x24/apps/fcitx-translit.png
+share/icons/hicolor/24x24/apps/fcitx-viqr.png
+share/icons/hicolor/24x24/apps/fcitx-yawerty.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-amharic.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-arabic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-bengali-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-bengali-probhat.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-cns11643.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-compose.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-emoji.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-gujarati-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-gujarati-phonetic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-hindi-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-hindi-phonetic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-ipa-x-sampa.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-kannada-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-kannada-kgp.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-latex.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-malayalam-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-malayalam-phonetic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-nepali.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punjabi-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punjabi-jhelum.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punjabi-phonetic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-rustrad.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-tamil-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-tamil-phonetic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-tamil-remington.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-telugu-inscript.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-thai.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-translit-ua.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-translit.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-viqr.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-yawerty.png
 share/icons/hicolor/32x32/apps/fcitx-thai.png
 share/icons/hicolor/32x32/apps/org.fcitx.Fcitx5.fcitx-thai.png
 share/icons/hicolor/48x48/apps/fcitx-bengali-inscript.png
 share/icons/hicolor/48x48/apps/fcitx-bengali-probhat.png
+share/icons/hicolor/48x48/apps/fcitx-cns11643.png
 share/icons/hicolor/48x48/apps/fcitx-compose.png
 share/icons/hicolor/48x48/apps/fcitx-emoji.png
 share/icons/hicolor/48x48/apps/fcitx-gujarati-inscript.png
@@ -59,9 +242,11 @@ share/icons/hicolor/48x48/apps/fcitx-tamil-remington.png
 share/icons/hicolor/48x48/apps/fcitx-telugu-inscript.png
 share/icons/hicolor/48x48/apps/fcitx-translit-ua.png
 share/icons/hicolor/48x48/apps/fcitx-translit.png
+share/icons/hicolor/48x48/apps/fcitx-viqr.png
 share/icons/hicolor/48x48/apps/fcitx-yawerty.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-bengali-inscript.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-bengali-probhat.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-cns11643.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-compose.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-emoji.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-gujarati-inscript.png
@@ -85,6 +270,7 @@ share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-tamil-remington.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-telugu-inscript.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-translit-ua.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-translit.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-viqr.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-yawerty.png
 share/icons/hicolor/64x64/apps/fcitx-cns11643.png
 share/icons/hicolor/64x64/apps/fcitx-viqr.png
diff --git a/chinese/libime-jyutping/Makefile b/chinese/libime-jyutping/Makefile
index 9127ac3f80db..ab0bc22956bb 100644
--- a/chinese/libime-jyutping/Makefile
+++ b/chinese/libime-jyutping/Makefile
@@ -1,9 +1,10 @@
 PORTNAME=	libime-jyutping
-DISTVERSION=	1.0.3
-PORTREVISION=	3
+DISTVERSION=	1.0.6
 CATEGORIES=	chinese textproc
-MASTER_SITES=	https://download.fcitx-im.org/data/:dict,model
-DISTFILES=	${DICT_TAR}:dict \
+MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/ \
+		https://download.fcitx-im.org/data/:dict,model
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DICT_TAR}:dict \
 		${MODEL_TAR}:model
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -12,28 +13,25 @@ MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Library to support Jyutping through libime
 WWW=		https://github.com/fcitx/libime-jyutping
 
-LICENSE=	LGPL21+ GPLv3+
+LICENSE=	GPLv3+ LGPL21+
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/fcitx5/punctuation.so:chinese/fcitx5-chinese-addons
+BUILD_DEPENDS=	${LOCALBASE}/lib/fcitx5/libpunctuation.so:chinese/fcitx5-chinese-addons
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
-		libIMECore.so:chinese/libime \
-		libFcitx5Core.so:textproc/fcitx5
-RUN_DEPENDS=	${LOCALBASE}/lib/fcitx5/punctuation.so:chinese/fcitx5-chinese-addons
+		libFcitx5Core.so:textproc/fcitx5 \
+		libIMECore.so:chinese/libime
+RUN_DEPENDS=	${LOCALBASE}/lib/fcitx5/libpunctuation.so:chinese/fcitx5-chinese-addons
 
-USES=		compiler:c++17-lang cmake gettext-tools kde:5 localbase
+USES=		cmake compiler:c++17-lang gettext-tools kde:5 localbase tar:xz
 
 PLIST_SUB=	VER=${PORTVERSION}
 
 USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	fcitx
-
 USE_KDE=	ecm
 
 CMAKE_ON=	ENABLE_ENGINE
-CMAKE_OFF=	ENABLE_TEST ENABLE_DOC
+CMAKE_OFF=	ENABLE_DOC ENABLE_TEST
 MAKE_ENV=	FCITX5_DOWNLOAD_DISALLOWED=TRUE
 
 # These must follow data/CMakeLists.txt
diff --git a/chinese/libime-jyutping/distinfo b/chinese/libime-jyutping/distinfo
index 4cbfb8a775f4..4ce7bfa0fd32 100644
--- a/chinese/libime-jyutping/distinfo
+++ b/chinese/libime-jyutping/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1637881928
+TIMESTAMP = 1679111720
+SHA256 (libime-jyutping/libime-jyutping-1.0.6.tar.xz) = 3ba22518003650f9608870ace491b9bd48eef449bb763a5f8919c8e294716499
+SIZE (libime-jyutping/libime-jyutping-1.0.6.tar.xz) = 38476
 SHA256 (libime-jyutping/jyutping-dict-20180104.tar.xz) = e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
 SIZE (libime-jyutping/jyutping-dict-20180104.tar.xz) = 1987632
 SHA256 (libime-jyutping/jyutping-model-20180103.tar.xz) = 4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071
 SIZE (libime-jyutping/jyutping-model-20180103.tar.xz) = 11006680
-SHA256 (libime-jyutping/fcitx-libime-jyutping-1.0.3_GH0.tar.gz) = f3499dd8f343f96be0774c7fa17cfdc208553bfd0c905e532c44c8b7430aa9dc
-SIZE (libime-jyutping/fcitx-libime-jyutping-1.0.3_GH0.tar.gz) = 45582
diff --git a/chinese/libime-jyutping/pkg-plist b/chinese/libime-jyutping/pkg-plist
index 0acfd5e23fd3..d543a85b52d9 100644
--- a/chinese/libime-jyutping/pkg-plist
+++ b/chinese/libime-jyutping/pkg-plist
@@ -20,5 +20,8 @@ lib/libime/zh_HK.lm.predict
 share/fcitx5/addon/jyutping.conf
 share/fcitx5/inputmethod/jyutping.conf
 share/libime/jyutping.dict
+share/locale/de/LC_MESSAGES/fcitx5-jyutping.mo
+share/locale/ru/LC_MESSAGES/fcitx5-jyutping.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx5-jyutping.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx5-jyutping.mo
 share/metainfo/org.fcitx.Fcitx5.Addon.Jyutping.metainfo.xml
diff --git a/chinese/libime/Makefile b/chinese/libime/Makefile
index 561b9fb51329..79e593a33064 100644
--- a/chinese/libime/Makefile
+++ b/chinese/libime/Makefile
@@ -1,9 +1,10 @@
 PORTNAME=	libime
-DISTVERSION=	1.0.9
-PORTREVISION=	3
+DISTVERSION=	1.0.17
 CATEGORIES=	chinese textproc
-MASTER_SITES=	https://download.fcitx-im.org/data/:opengram_lm,opengram_dict,table_dict
-DISTFILES=	${OPENGRAM_LM_TAR}:opengram_lm \
+MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/ \
+		https://download.fcitx-im.org/data/:opengram_lm,opengram_dict,table_dict
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${OPENGRAM_LM_TAR}:opengram_lm \
 		${OPENGRAM_DICT_TAR}:opengram_dict \
 		${TABLE_DICT_TAR}:table_dict
 DIST_SUBDIR=	${PORTNAME}
@@ -17,24 +18,21 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libFcitx5Utils.so:textproc/fcitx5
 
-USES=		compiler:c++17-lang cmake kde:5
+USES=		cmake compiler:c++17-lang kde:5 tar:xz
 
-PLIST_SUB=	VER=${PORTVERSION} VER_MAJOR=${PORTVERSION:R:R}
+PLIST_SUB=	VER=${PORTVERSION} \
+		VER_MAJOR=${PORTVERSION:R:R}
 
 USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	fcitx
-GH_TUPLE=	kpu:kenlm:01c49fe:kenlm/src/libime/core/kenlm
-
 USE_KDE=	ecm
 
 CMAKE_OFF=	ENABLE_TEST
 MAKE_ENV=	FCITX5_DOWNLOAD_DISALLOWED=TRUE
 
 # These must follow data/CMakeLists.txt
-OPENGRAM_LM_TAR=	lm_sc.3gm.arpa-20140820.tar.bz2
-OPENGRAM_DICT_TAR=	dict.utf8-20211021.tar.xz
+OPENGRAM_LM_TAR=	lm_sc.arpa-20220810.tar.xz
+OPENGRAM_DICT_TAR=	dict-20220810.tar.xz
 TABLE_DICT_TAR=		table.tar.gz
 
 post-extract:
diff --git a/chinese/libime/distinfo b/chinese/libime/distinfo
index e808bf95b058..7a584192f4f2 100644
--- a/chinese/libime/distinfo
+++ b/chinese/libime/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1638408516
-SHA256 (libime/lm_sc.3gm.arpa-20140820.tar.bz2) = 751bab7c55ea93a2cedfb0fbb7eb09f67d4da9c2c55496e5f31eb8580f1d1e2f
*** 808 LINES SKIPPED ***