aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chinese/fcitx5-chewing/Makefile12
-rw-r--r--chinese/fcitx5-chewing/distinfo6
-rw-r--r--chinese/fcitx5-chewing/pkg-plist8
-rw-r--r--chinese/fcitx5-chinese-addons/Makefile25
-rw-r--r--chinese/fcitx5-chinese-addons/distinfo6
-rw-r--r--chinese/fcitx5-chinese-addons/pkg-plist86
-rw-r--r--chinese/fcitx5-rime/Makefile17
-rw-r--r--chinese/fcitx5-rime/distinfo6
-rw-r--r--chinese/fcitx5-rime/pkg-plist1
-rw-r--r--chinese/fcitx5-table-extra/Makefile13
-rw-r--r--chinese/fcitx5-table-extra/distinfo6
-rw-r--r--chinese/fcitx5-table-extra/pkg-plist108
-rw-r--r--chinese/fcitx5-table-other/Makefile15
-rw-r--r--chinese/fcitx5-table-other/distinfo6
-rw-r--r--chinese/fcitx5-table-other/pkg-plist186
-rw-r--r--chinese/libime-jyutping/Makefile26
-rw-r--r--chinese/libime-jyutping/distinfo6
-rw-r--r--chinese/libime-jyutping/pkg-plist3
-rw-r--r--chinese/libime/Makefile22
-rw-r--r--chinese/libime/distinfo16
-rw-r--r--chinese/libime/pkg-plist1
-rw-r--r--japanese/fcitx5-anthy/Makefile10
-rw-r--r--japanese/fcitx5-anthy/distinfo6
-rw-r--r--japanese/fcitx5-anthy/pkg-plist10
-rw-r--r--korean/fcitx5-hangul/Makefile20
-rw-r--r--korean/fcitx5-hangul/distinfo6
-rw-r--r--korean/fcitx5-hangul/pkg-plist20
-rw-r--r--textproc/fcitx5-configtool/Makefile30
-rw-r--r--textproc/fcitx5-configtool/distinfo6
-rw-r--r--textproc/fcitx5-configtool/pkg-plist3
-rw-r--r--textproc/fcitx5-gtk/Makefile16
-rw-r--r--textproc/fcitx5-gtk/distinfo6
-rw-r--r--textproc/fcitx5-lua/Makefile9
-rw-r--r--textproc/fcitx5-lua/distinfo6
-rw-r--r--textproc/fcitx5-lua/pkg-plist4
-rw-r--r--textproc/fcitx5-qt-common/Makefile2
-rw-r--r--textproc/fcitx5-qt/Makefile16
-rw-r--r--textproc/fcitx5-qt/distinfo8
-rw-r--r--textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt5
-rw-r--r--textproc/fcitx5-qt/pkg-plist.qt51
-rw-r--r--textproc/fcitx5/Makefile52
-rw-r--r--textproc/fcitx5/distinfo8
-rw-r--r--textproc/fcitx5/pkg-plist140
-rw-r--r--x11/xcb-imdkit/Makefile10
-rw-r--r--x11/xcb-imdkit/distinfo6
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
-SIZE (libime/lm_sc.3gm.arpa-20140820.tar.bz2) = 36623028
-SHA256 (libime/dict.utf8-20211021.tar.xz) = 300597e6f7f79f788480fd665de8a07bfe90227048b5a7e39f40f43a62a981df
-SIZE (libime/dict.utf8-20211021.tar.xz) = 528660
+TIMESTAMP = 1679111390
+SHA256 (libime/libime-1.0.17.tar.xz) = 23f87b8104b9161bdc41fbac44294fef825d586260afc698f6a85ff20ea65407
+SIZE (libime/libime-1.0.17.tar.xz) = 415804
+SHA256 (libime/lm_sc.arpa-20220810.tar.xz) = a11bc97d275adaf195f9bac854368ae06cdb4a0fe1eecf59db5ae580615db4fa
+SIZE (libime/lm_sc.arpa-20220810.tar.xz) = 21436544
+SHA256 (libime/dict-20220810.tar.xz) = 971752f413188007e8d19158c11b85c955e25d7b321ec2275c4b3af6d8a85d26
+SIZE (libime/dict-20220810.tar.xz) = 1160888
SHA256 (libime/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
SIZE (libime/table.tar.gz) = 4144686
-SHA256 (libime/fcitx-libime-1.0.9_GH0.tar.gz) = 2b0a2f94606209e3a09198177031d006b91dcb6d62abd10c124a1982f38538f3
-SIZE (libime/fcitx-libime-1.0.9_GH0.tar.gz) = 123889
-SHA256 (libime/kpu-kenlm-01c49fe_GH0.tar.gz) = 94919822e57cb019cd6a3c64ec00f44d17e3abe8410c07733c42ab2a8e83dc96
-SIZE (libime/kpu-kenlm-01c49fe_GH0.tar.gz) = 408488
diff --git a/chinese/libime/pkg-plist b/chinese/libime/pkg-plist
index 614785cf5022..8e68a95754dc 100644
--- a/chinese/libime/pkg-plist
+++ b/chinese/libime/pkg-plist
@@ -63,6 +63,7 @@ lib/libime/zh_CN.lm.predict
%%DATADIR%%/cj.main.dict
%%DATADIR%%/db.main.dict
%%DATADIR%%/erbi.main.dict
+%%DATADIR%%/extb.dict
%%DATADIR%%/qxm.main.dict
%%DATADIR%%/sc.dict
%%DATADIR%%/wanfeng.main.dict
diff --git a/japanese/fcitx5-anthy/Makefile b/japanese/fcitx5-anthy/Makefile
index f25a9154df39..f119f2af36d4 100644
--- a/japanese/fcitx5-anthy/Makefile
+++ b/japanese/fcitx5-anthy/Makefile
@@ -1,8 +1,9 @@
PORTNAME= fcitx5-anthy
-DISTVERSION= 5.0.2
+DISTVERSION= 5.0.14
CATEGORIES= japanese textproc
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
-MAINTAINER= khng300@gmail.com
+MAINTAINER= khng@FreeBSD.org
COMMENT= Anthy support for Fcitx5
WWW= https://github.com/fcitx/fcitx5-anthy
@@ -12,10 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
LIB_DEPENDS= libanthy.so:japanese/anthy \
libFcitx5Core.so:textproc/fcitx5
-USES= compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig
-
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
+USES= cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig tar:xz
USE_KDE= ecm
diff --git a/japanese/fcitx5-anthy/distinfo b/japanese/fcitx5-anthy/distinfo
index 7a8183d626e2..9b5b7fd092b3 100644
--- a/japanese/fcitx5-anthy/distinfo
+++ b/japanese/fcitx5-anthy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610441448
-SHA256 (fcitx-fcitx5-anthy-5.0.2_GH0.tar.gz) = a4ec3dfea46190262c0bbcf35b8a391c899a2baec83afc18c110f0f284d6f443
-SIZE (fcitx-fcitx5-anthy-5.0.2_GH0.tar.gz) = 98105
+TIMESTAMP = 1679111846
+SHA256 (fcitx5-anthy-5.0.14.tar.xz) = 0a874d70df4ef22f1eb868c27eaf66e3354e1609db8ded392544f8f6bc54a7b7
+SIZE (fcitx5-anthy-5.0.14.tar.xz) = 83236
diff --git a/japanese/fcitx5-anthy/pkg-plist b/japanese/fcitx5-anthy/pkg-plist
index 5a5c140ab574..f7440d427cc7 100644
--- a/japanese/fcitx5-anthy/pkg-plist
+++ b/japanese/fcitx5-anthy/pkg-plist
@@ -17,10 +17,16 @@ share/fcitx5/anthy/tsuki-2-203-106.sty
share/fcitx5/anthy/vje-delta.sty
share/fcitx5/anthy/wnn.sty
share/fcitx5/inputmethod/anthy.conf
+share/icons/hicolor/16x16/apps/fcitx-anthy.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-anthy.png
+share/icons/hicolor/22x22/apps/fcitx-anthy.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-anthy.png
share/icons/hicolor/22x22/status/fcitx-anthy-symbol.png
share/icons/hicolor/22x22/status/org.fcitx.Fcitx5.fcitx-anthy-symbol.png
-share/icons/hicolor/48x48/status/fcitx-anthy.png
-share/icons/hicolor/48x48/status/org.fcitx.Fcitx5.fcitx-anthy.png
+share/icons/hicolor/24x24/apps/fcitx-anthy.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-anthy.png
+share/icons/hicolor/48x48/apps/fcitx-anthy.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-anthy.png
share/icons/hicolor/scalable/status/fcitx-anthy-period-japanese.svg
share/icons/hicolor/scalable/status/fcitx-anthy-period-latin.svg
share/icons/hicolor/scalable/status/fcitx-anthy-period-wide-japanese.svg
diff --git a/korean/fcitx5-hangul/Makefile b/korean/fcitx5-hangul/Makefile
index 64c7bf71d600..05cc28870a57 100644
--- a/korean/fcitx5-hangul/Makefile
+++ b/korean/fcitx5-hangul/Makefile
@@ -1,21 +1,19 @@
PORTNAME= fcitx5-hangul
-DISTVERSION= 5.0.2
+DISTVERSION= 5.0.11
CATEGORIES= korean textproc
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
-MAINTAINER= khng300@gmail.com
+MAINTAINER= khng@FreeBSD.org
COMMENT= Hangul support for Fcitx5
-WWW= https://github.com/fcitx/fcitx5-anthy
+WWW= https://github.com/fcitx/fcitx5-hangul
-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= libhangul.so:korean/libhangul \
- libFcitx5Core.so:textproc/fcitx5
+LIB_DEPENDS= libFcitx5Core.so:textproc/fcitx5 \
+ libhangul.so:korean/libhangul
-USES= compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig
-
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
+USES= cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig tar:xz
USE_KDE= ecm
diff --git a/korean/fcitx5-hangul/distinfo b/korean/fcitx5-hangul/distinfo
index 901768ea58de..c37e44aaa090 100644
--- a/korean/fcitx5-hangul/distinfo
+++ b/korean/fcitx5-hangul/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610441454
-SHA256 (fcitx-fcitx5-hangul-5.0.2_GH0.tar.gz) = 55028fdcd9232330495800f29731dcbbc6baa9e66a429a9b8f9ac444c1f1bc6c
-SIZE (fcitx-fcitx5-hangul-5.0.2_GH0.tar.gz) = 29665
+TIMESTAMP = 1679111919
+SHA256 (fcitx5-hangul-5.0.11.tar.xz) = 6894702e73ef431c7699698b55421494419383170b502aa98209a7eff3fdd0d3
+SIZE (fcitx5-hangul-5.0.11.tar.xz) = 39072
diff --git a/korean/fcitx5-hangul/pkg-plist b/korean/fcitx5-hangul/pkg-plist
index eb9694299287..ca66f9620f32 100644
--- a/korean/fcitx5-hangul/pkg-plist
+++ b/korean/fcitx5-hangul/pkg-plist
@@ -2,8 +2,28 @@ lib/fcitx5/hangul.so
share/fcitx5/addon/hangul.conf
share/fcitx5/hangul/symbol.txt
share/fcitx5/inputmethod/hangul.conf
+share/icons/hicolor/16x16/apps/fcitx-hangul.png
+share/icons/hicolor/16x16/apps/fcitx-hanja-active.png
+share/icons/hicolor/16x16/apps/fcitx-hanja-inactive.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-hangul.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-hanja-active.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-hanja-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-hangul.png
+share/icons/hicolor/22x22/apps/fcitx-hanja-active.png
+share/icons/hicolor/22x22/apps/fcitx-hanja-inactive.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-hangul.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-hanja-active.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-hanja-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-hangul.png
+share/icons/hicolor/24x24/apps/fcitx-hanja-active.png
+share/icons/hicolor/24x24/apps/fcitx-hanja-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-hangul.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-hanja-active.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-hanja-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-hangul.png
share/icons/hicolor/48x48/apps/fcitx-hanja-active.png
share/icons/hicolor/48x48/apps/fcitx-hanja-inactive.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-hangul.png
share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-hanja-active.png
share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-hanja-inactive.png
share/icons/hicolor/64x64/apps/fcitx-hangul.png
diff --git a/textproc/fcitx5-configtool/Makefile b/textproc/fcitx5-configtool/Makefile
index 9ccadc7c0555..24af72b93f82 100644
--- a/textproc/fcitx5-configtool/Makefile
+++ b/textproc/fcitx5-configtool/Makefile
@@ -1,6 +1,7 @@
PORTNAME= fcitx5-configtool
-DISTVERSION= 5.0.8
+DISTVERSION= 5.0.17
CATEGORIES= textproc x11
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
MAINTAINER= khng@FreeBSD.org
COMMENT= Fcitx5 IM framework configuration tool
@@ -9,29 +10,28 @@ WWW= https://github.com/fcitx/fcitx5-configtool
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
-BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \
+BUILD_DEPENDS= fcitx5-qt5>=5.0.2:textproc/fcitx5-qt@qt5 \
fcitx5>=5.0.10:textproc/fcitx5 \
- fcitx5-qt5>=5.0.2:textproc/fcitx5-qt@qt5
-LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \
- libFcitx5Core.so:textproc/fcitx5 \
- libFcitx5Qt5DBusAddons.so:textproc/fcitx5-qt
-RUN_DEPENDS= xkeyboard-config>=0:x11/xkeyboard-config \
iso-codes>=0:misc/iso-codes
+LIB_DEPENDS= libFcitx5Core.so:textproc/fcitx5 \
+ libFcitx5Qt5DBusAddons.so:textproc/fcitx5-qt \
+ libxkbcommon.so:x11/libxkbcommon
+RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
+ xkeyboard-config>=0:x11/xkeyboard-config
-USES= compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig qt:5 xorg
+USES= cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig qt:5 \
+ tar:xz xorg
PLIST_SUB= VER=${PORTVERSION}
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
-
-USE_KDE= ecm coreaddons kdeclarative i18n itemviews kirigami2 package widgetsaddons
-USE_QT= concurrent core dbus declarative gui quickcontrols2 widgets x11extras \
- buildtools:build qmake:build
+USE_KDE= config coreaddons ecm i18n iconthemes itemviews kdeclarative \
+ kirigami2 package plasma-framework service widgetsaddons
+USE_QT= concurrent core dbus declarative gui quickcontrols2 widgets \
+ x11extras buildtools:build qmake:build
USE_XORG= x11 xkbfile
USE_LDCONFIG= yes
-CMAKE_ON= ENABLE_KCM ENABLE_CONFIG_QT
+CMAKE_ON= ENABLE_CONFIG_QT ENABLE_KCM
CMAKE_OFF= ENABLE_TEST
.include <bsd.port.mk>
diff --git a/textproc/fcitx5-configtool/distinfo b/textproc/fcitx5-configtool/distinfo
index c1a7610fac17..11d6433c77e1 100644
--- a/textproc/fcitx5-configtool/distinfo
+++ b/textproc/fcitx5-configtool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637876184
-SHA256 (fcitx-fcitx5-configtool-5.0.8_GH0.tar.gz) = d735d99a4c33eac044210ce1f7b97f06c9a99e38384dda96d02c54d4640c1654
-SIZE (fcitx-fcitx5-configtool-5.0.8_GH0.tar.gz) = 140040
+TIMESTAMP = 1679112108
+SHA256 (fcitx5-configtool-5.0.17.tar.xz) = f8b6196d23d14a6acc9a2b3dbc3772b6e5b2e3a5147b78b649238a3d775786d5
+SIZE (fcitx5-configtool-5.0.17.tar.xz) = 113760
diff --git a/textproc/fcitx5-configtool/pkg-plist b/textproc/fcitx5-configtool/pkg-plist
index 7748c1e70a39..fd893052e7c1 100644
--- a/textproc/fcitx5-configtool/pkg-plist
+++ b/textproc/fcitx5-configtool/pkg-plist
@@ -1,5 +1,6 @@
bin/fcitx5-config-qt
bin/fcitx5-migrator
+bin/fcitx5-plasma-theme-generator
bin/kbd-layout-viewer5
lib/libFcitx5Migrator.so
lib/libFcitx5Migrator.so.5
@@ -37,6 +38,8 @@ share/locale/da/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
share/locale/de/LC_MESSAGES/fcitx5-configtool.mo
share/locale/de/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
share/locale/es/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/fr/LC_MESSAGES/fcitx5-configtool.mo
+share/locale/fr/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
share/locale/he/LC_MESSAGES/fcitx5-configtool.mo
share/locale/he/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
share/locale/ja/LC_MESSAGES/fcitx5-configtool.mo
diff --git a/textproc/fcitx5-gtk/Makefile b/textproc/fcitx5-gtk/Makefile
index 0bb995ec2f22..c53ee656f860 100644
--- a/textproc/fcitx5-gtk/Makefile
+++ b/textproc/fcitx5-gtk/Makefile
@@ -1,7 +1,7 @@
PORTNAME= fcitx5-gtk
-DISTVERSION= 5.0.10
-PORTREVISION= 1
+DISTVERSION= 5.0.22
CATEGORIES= textproc
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
MAINTAINER= khng@FreeBSD.org
COMMENT?= Fcitx support for GTK+ ${FLAVOR}
@@ -20,16 +20,12 @@ gtk2_PKGNAMESUFFIX= 2
gtk3_PKGNAMESUFFIX= 3
gtk4_PKGNAMESUFFIX= 4
-USES= compiler:c++17-lang gettext-tools cmake gnome kde:5 pkgconfig xorg
+USES= cmake compiler:c++17-lang gettext-tools gnome kde:5 pkgconfig \
+ tar:xz xorg
-PLIST_SUB= VER=${PORTVERSION}
-
-USE_LDCONFIG= yes
-
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
USE_GNOME= cairo gdkpixbuf2 glib20 introspection
USE_KDE= ecm
+USE_LDCONFIG= yes
USE_XORG= x11
CMAKE_ON?= BUILD_ONLY_PLUGIN
@@ -48,4 +44,6 @@ USE_GNOME+= gtk40
PLIST?= ${PKGDIR}/pkg-plist.${FLAVOR}
PLIST_SUB= VER=${PORTVERSION}
+PLIST_SUB= VER=${PORTVERSION}
+
.include <bsd.port.mk>
diff --git a/textproc/fcitx5-gtk/distinfo b/textproc/fcitx5-gtk/distinfo
index 2d3c6fec4dc1..bececfe02876 100644
--- a/textproc/fcitx5-gtk/distinfo
+++ b/textproc/fcitx5-gtk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638990715
-SHA256 (fcitx-fcitx5-gtk-5.0.10_GH0.tar.gz) = 70d189d58d78ebf298162f44f506d68a2489c092ad938ed34429c272066e2eef
-SIZE (fcitx-fcitx5-gtk-5.0.10_GH0.tar.gz) = 76837
+TIMESTAMP = 1679112241
+SHA256 (fcitx5-gtk-5.0.22.tar.xz) = 5a8978a862be387d4800896f1cb6e1123980cf4f4c8cfc5e551d7670abd6ee5e
+SIZE (fcitx5-gtk-5.0.22.tar.xz) = 53416
diff --git a/textproc/fcitx5-lua/Makefile b/textproc/fcitx5-lua/Makefile
index bcbb4691badc..083889c4e157 100644
--- a/textproc/fcitx5-lua/Makefile
+++ b/textproc/fcitx5-lua/Makefile
@@ -1,6 +1,7 @@
PORTNAME= fcitx5-lua
-DISTVERSION= 5.0.5
+DISTVERSION= 5.0.10
CATEGORIES= textproc
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
MAINTAINER= khng@FreeBSD.org
COMMENT= Lua support for Fcitx5
@@ -11,10 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
LIB_DEPENDS= libFcitx5Core.so:textproc/fcitx5
-USES= compiler:c++17-lang gettext-tools cmake kde:5 lua:53 pkgconfig
-
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
+USES= cmake compiler:c++17-lang gettext-tools kde:5 lua:53 pkgconfig \
+ tar:xz
USE_KDE= ecm
diff --git a/textproc/fcitx5-lua/distinfo b/textproc/fcitx5-lua/distinfo
index 38e44fe27824..e7457c2582df 100644
--- a/textproc/fcitx5-lua/distinfo
+++ b/textproc/fcitx5-lua/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637881092
-SHA256 (fcitx-fcitx5-lua-5.0.5_GH0.tar.gz) = ac8db4865fa512375340a159a3ee04cf2b439d553756c4153d32cd1d3ed83abc
-SIZE (fcitx-fcitx5-lua-5.0.5_GH0.tar.gz) = 38453
+TIMESTAMP = 1679112308
+SHA256 (fcitx5-lua-5.0.10.tar.xz) = 29ddd350836d7a05a05b918897f8a4904b764f746cc42cb34c705c754f34708f
+SIZE (fcitx5-lua-5.0.10.tar.xz) = 34264
diff --git a/textproc/fcitx5-lua/pkg-plist b/textproc/fcitx5-lua/pkg-plist
index 8db14bbb4456..6c83445ab2cc 100644
--- a/textproc/fcitx5-lua/pkg-plist
+++ b/textproc/fcitx5-lua/pkg-plist
@@ -1,13 +1,15 @@
include/Fcitx5/Module/fcitx-module/luaaddonloader/luaaddon_public.h
lib/cmake/Fcitx5ModuleLuaAddonLoader/Fcitx5ModuleLuaAddonLoaderConfig.cmake
lib/cmake/Fcitx5ModuleLuaAddonLoader/Fcitx5ModuleLuaAddonLoaderConfigVersion.cmake
-lib/fcitx5/luaaddonloader.so
+lib/fcitx5/libluaaddonloader.so
share/fcitx5/addon/imeapi.conf
share/fcitx5/addon/luaaddonloader.conf
share/fcitx5/lua/imeapi/imeapi.lua
share/locale/da/LC_MESSAGES/fcitx5-lua.mo
+share/locale/fr/LC_MESSAGES/fcitx5-lua.mo
share/locale/ja/LC_MESSAGES/fcitx5-lua.mo
share/locale/ko/LC_MESSAGES/fcitx5-lua.mo
+share/locale/ru/LC_MESSAGES/fcitx5-lua.mo
share/locale/zh_CN/LC_MESSAGES/fcitx5-lua.mo
share/locale/zh_TW/LC_MESSAGES/fcitx5-lua.mo
share/metainfo/org.fcitx.Fcitx5.Addon.Lua.metainfo.xml
diff --git a/textproc/fcitx5-qt-common/Makefile b/textproc/fcitx5-qt-common/Makefile
index 48a6209023db..ee94b38374b3 100644
--- a/textproc/fcitx5-qt-common/Makefile
+++ b/textproc/fcitx5-qt-common/Makefile
@@ -1,5 +1,3 @@
-PORTREVISION= 0
-
COMMENT= Fcitx support for Qt (common files)
PKGNAMESUFFIX= -common
diff --git a/textproc/fcitx5-qt/Makefile b/textproc/fcitx5-qt/Makefile
index 4a3fdd0cccb6..43253f487674 100644
--- a/textproc/fcitx5-qt/Makefile
+++ b/textproc/fcitx5-qt/Makefile
@@ -1,15 +1,13 @@
PORTNAME= fcitx5-qt
-DISTVERSION= 5.0.8
+DISTVERSION= 5.0.17
CATEGORIES= textproc
-
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES= f7f983e1e709.patch:-p1
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
MAINTAINER= khng@FreeBSD.org
COMMENT?= Fcitx support for Qt (${FLAVOR})
WWW= https://github.com/fcitx/fcitx5-qt
-LICENSE= LGPL21+ BSD3CLAUSE
+LICENSE= BSD3CLAUSE LGPL21+
LICENSE_COMB= multi
LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSES/BSD-3-Clause.txt
@@ -23,13 +21,15 @@ FLAVOR?= ${FLAVORS:[1]}
qt5_PKGNAMESUFFIX= 5
qt6_PKGNAMESUFFIX= 6
-USES= compiler:c++17-lang gettext-tools cmake kde:5 pkgconfig xorg
+USES= cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig tar:xz \
+ xorg
CMAKE_OFF?= ENABLE_QT4
.if ${FLAVOR} == qt5
USES+= qt:5
-USE_QT= concurrent core dbus gui widgets xml buildtools:build qmake:build
+USE_QT= concurrent core dbus gui widgets xml buildtools:build \
+ qmake:build
CMAKE_ON= ENABLE_QT5
CMAKE_OFF+= ENABLE_QT6
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt
@@ -46,8 +46,6 @@ RUN_DEPENDS= fcitx5-qt-common>=${DISTVERSION}:textproc/fcitx5-qt-common
PLIST?= ${PKGDIR}/pkg-plist.${FLAVOR}
PLIST_SUB= VER=${PORTVERSION}
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
USE_KDE= ecm
USE_XORG= x11 xcb
USE_LDCONFIG= yes
diff --git a/textproc/fcitx5-qt/distinfo b/textproc/fcitx5-qt/distinfo
index c8972fb77d47..92d1d31efaa6 100644
--- a/textproc/fcitx5-qt/distinfo
+++ b/textproc/fcitx5-qt/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1638997683
-SHA256 (fcitx-fcitx5-qt-5.0.8_GH0.tar.gz) = 6a5141d25e39ec7843b69cf4dac6b16b1301a9db42b9ad140a9d002c5c6a0bf8
-SIZE (fcitx-fcitx5-qt-5.0.8_GH0.tar.gz) = 127492
-SHA256 (f7f983e1e709.patch) = fdde230d40bf4d4593ee2fcfe9eabe99bfe48c00cba65a7126e814a71beebdcb
-SIZE (f7f983e1e709.patch) = 1280
+TIMESTAMP = 1679112362
+SHA256 (fcitx5-qt-5.0.17.tar.xz) = 4268e7a1277692a79dcff08e662d1e74407e598a61d3d0386bc64a51809e91f4
+SIZE (fcitx5-qt-5.0.17.tar.xz) = 84680
diff --git a/textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt b/textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt
index 7fa1abdc5bf2..553090d8b2bb 100644
--- a/textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt
+++ b/textproc/fcitx5-qt/files/extra-patch-CMakeLists.txt
@@ -1,11 +1,10 @@
---- CMakeLists.txt.orig 2022-08-31 10:36:00 UTC
+--- CMakeLists.txt.orig 2022-12-30 15:40:01 UTC
+++ CMakeLists.txt
-@@ -80,11 +80,6 @@ if(ENABLE_QT6)
+@@ -84,10 +84,6 @@ endif()
add_subdirectory(qt6)
endif()
-if(NOT BUILD_ONLY_PLUGIN)
--find_package(Gettext REQUIRED)
-add_subdirectory(po)
-endif()
-
diff --git a/textproc/fcitx5-qt/pkg-plist.qt5 b/textproc/fcitx5-qt/pkg-plist.qt5
index 0da39797c8e6..2bc012f37753 100644
--- a/textproc/fcitx5-qt/pkg-plist.qt5
+++ b/textproc/fcitx5-qt/pkg-plist.qt5
@@ -29,3 +29,4 @@ lib/libFcitx5Qt5WidgetsAddons.so.2
lib/libFcitx5Qt5WidgetsAddons.so.%%VER%%
%%QT_PLUGINDIR%%/platforminputcontexts/libfcitx5platforminputcontextplugin.so
libexec/fcitx5-qt5-gui-wrapper
+share/applications/org.fcitx.fcitx5-qt5-gui-wrapper.desktop
diff --git a/textproc/fcitx5/Makefile b/textproc/fcitx5/Makefile
index 2f508a972b3a..3ee72df35afb 100644
--- a/textproc/fcitx5/Makefile
+++ b/textproc/fcitx5/Makefile
@@ -1,15 +1,13 @@
PORTNAME= fcitx5
-DISTVERSION= 5.0.11
-PORTREVISION= 2
+DISTVERSION= 5.0.22
CATEGORIES= textproc
-MASTER_SITES= https://download.fcitx-im.org/data/:dict
-DISTFILES= ${SPELL_EN_DICT_TAR}:dict
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/ \
+ https://download.fcitx-im.org/data/:dict
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ ${SPELL_EN_DICT_TAR}:dict
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+= 0b46063c0e9f.patch:-p1 # wlroots 0.15
-
MAINTAINER= khng@FreeBSD.org
COMMENT= New implementation of the Fcitx IME framework
WWW= https://github.com/fcitx/fcitx5
@@ -20,38 +18,39 @@ BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \
uthash>=0:devel/uthash
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libevent.so:devel/libevent \
- libuuid.so:misc/e2fsprogs-libuuid \
- libfmt.so:devel/libfmt \
- libxkbcommon.so:x11/libxkbcommon \
libexpat.so:textproc/expat2 \
- libjson-c.so:devel/json-c
+ libfmt.so:devel/libfmt \
+ libjson-c.so:devel/json-c \
+ libuuid.so:misc/e2fsprogs-libuuid \
+ libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
xkeyboard-config>=0:x11/xkeyboard-config
# gettext-tools for both build-time hard requirement and Fcitx5 helper shell scripts
-USES= cmake compiler:c++17-lang gettext-runtime gettext-tools:build,run gl gnome kde:5 pkgconfig
+USES= cmake compiler:c++17-lang gettext-runtime \
+ gettext-tools:build,run gl gnome kde:5 pkgconfig tar:xz
-PLIST_SUB= VER=${PORTVERSION}
+PLIST_SUB= VER=${DISTVERSION}
CONFLICTS= zh-fcitx
-OPTIONS_DEFINE= X11 WAYLAND ENCHANT
-OPTIONS_DEFAULT= X11 WAYLAND ENCHANT
+OPTIONS_DEFINE= ENCHANT WAYLAND X11
+OPTIONS_DEFAULT= ENCHANT WAYLAND X11
OPTIONS_SUB= yes
SUB_FILES= pkg-message
-X11_USES= xorg
-X11_USE= xorg=xcb,xkbfile
+X11_USES= xorg
+X11_USE= XORG=xcb,xkbfile
X11_BUILD_DEPENDS= xcb-imdkit>=1.0.3:x11/xcb-imdkit
-X11_LIB_DEPENDS= libxcb-util.so:x11/xcb-util \
+X11_LIB_DEPENDS= libxcb-ewmh.so:x11/xcb-util-wm \
+ libxcb-icccm.so:x11/xcb-util-wm \
libxcb-keysyms.so:x11/xcb-util-keysyms \
- libxcb-ewmh.so:x11/xcb-util-wm \
- libxcb-icccm.so:x11/xcb-util-wm
+ libxcb-util.so:x11/xcb-util
X11_RUN_DEPENDS= xcb-imdkit>=1.0.3:x11/xcb-imdkit
-WAYLAND_BUILD_DEPENDS= wayland-scanner:graphics/wayland \
- wayland-protocols>=0:graphics/wayland-protocols
+WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \
+ wayland-scanner:graphics/wayland
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libwayland-egl.so:graphics/wayland
@@ -59,24 +58,21 @@ ENCHANT_DESC= Dictionary/spellchecking framework
ENCHANT_LIB_DEPENDS= libenchant-2.so:textproc/enchant2
ENCHANT_CMAKE_BOOL= ENABLE_ENCHANT
-CMAKE_ON= SYSTEM_USE_UTHASH FCITX5_DOWNLOAD_DISALLOWED
+CMAKE_ON= FCITX5_DOWNLOAD_DISALLOWED SYSTEM_USE_UTHASH
CMAKE_OFF= ENABLE_TEST
MAKE_ENV= FCITX5_DOWNLOAD_DISALLOWED=TRUE
USE_GL= egl
-USE_GNOME= cairo glib20 gdkpixbuf2 pango
+USE_GNOME= cairo gdkpixbuf2 glib20 pango
USE_KDE= ecm
USE_LDCONFIG= yes
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
-
# These must follow src/modules/spell/dict/CMakeLists.txt
SPELL_EN_DICT_VER= 20121020
SPELL_EN_DICT_TAR= en_dict-${SPELL_EN_DICT_VER}.tar.gz
post-extract:
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPELL_EN_DICT_TAR} ${WRKSRC}/src/modules/spell/dict
+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPELL_EN_DICT_TAR} ${WRKSRC}/src/modules/spell/
.include <bsd.port.mk>
diff --git a/textproc/fcitx5/distinfo b/textproc/fcitx5/distinfo
index a8b59c9f4929..ae22df3ca0ef 100644
--- a/textproc/fcitx5/distinfo
+++ b/textproc/fcitx5/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1638988155
+TIMESTAMP = 1679112011
+SHA256 (fcitx5/fcitx5-5.0.22.tar.xz) = 1320d0e8a8b3930a8a956eab80aceef9624946129236515be36c8b75ab04c878
+SIZE (fcitx5/fcitx5-5.0.22.tar.xz) = 6831060
SHA256 (fcitx5/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb
SIZE (fcitx5/en_dict-20121020.tar.gz) = 630491
-SHA256 (fcitx5/fcitx-fcitx5-5.0.11_GH0.tar.gz) = 14208907f9d43e2d06257d28edf825380acd7288e6d4275138781c8cbe4d395d
-SIZE (fcitx5/fcitx-fcitx5-5.0.11_GH0.tar.gz) = 1953703
-SHA256 (fcitx5/0b46063c0e9f.patch) = 51fb37b55923f84f32449109c03cbb9a7cd36552966e5efb41b4cb5290d16590
-SIZE (fcitx5/0b46063c0e9f.patch) = 1335
diff --git a/textproc/fcitx5/pkg-plist b/textproc/fcitx5/pkg-plist
index c676b2fdf3ae..eaae56bfd1ec 100644
--- a/textproc/fcitx5/pkg-plist
+++ b/textproc/fcitx5/pkg-plist
@@ -143,6 +143,7 @@ lib/fcitx5/libclassicui.so
lib/fcitx5/libclipboard.so
lib/fcitx5/libdbus.so
lib/fcitx5/libdbusfrontend.so
+lib/fcitx5/libemoji.so
lib/fcitx5/libexec/comp-spell-dict
lib/fcitx5/libfcitx4frontend.so
lib/fcitx5/libibusfrontend.so
@@ -169,6 +170,7 @@ lib/libFcitx5Core.so.7
lib/libFcitx5Utils.so
lib/libFcitx5Utils.so.2
lib/libFcitx5Utils.so.%%VER%%
+libexec/fcitx5-wayland-launcher
libdata/pkgconfig/Fcitx5Config.pc
libdata/pkgconfig/Fcitx5Core.pc
libdata/pkgconfig/Fcitx5Module.pc
@@ -180,6 +182,7 @@ share/dbus-1/services/org.fcitx.Fcitx5.service
%%DATADIR%%/addon/clipboard.conf
%%DATADIR%%/addon/dbus.conf
%%DATADIR%%/addon/dbusfrontend.conf
+%%DATADIR%%/addon/emoji.conf
%%DATADIR%%/addon/fcitx4frontend.conf
%%DATADIR%%/addon/ibusfrontend.conf
%%DATADIR%%/addon/imselector.conf
@@ -246,6 +249,142 @@ share/dbus-1/services/org.fcitx.Fcitx5.service
%%DATADIR%%/default/zh_CN
%%DATADIR%%/default/zh_HK
%%DATADIR%%/default/zh_TW
+%%DATADIR%%/emoji/data/af.dict
+%%DATADIR%%/emoji/data/am.dict
+%%DATADIR%%/emoji/data/ar.dict
+%%DATADIR%%/emoji/data/ar_SA.dict
+%%DATADIR%%/emoji/data/as.dict
+%%DATADIR%%/emoji/data/ast.dict
+%%DATADIR%%/emoji/data/az.dict
+%%DATADIR%%/emoji/data/be.dict
+%%DATADIR%%/emoji/data/bg.dict
+%%DATADIR%%/emoji/data/bn.dict
+%%DATADIR%%/emoji/data/br.dict
+%%DATADIR%%/emoji/data/bs.dict
+%%DATADIR%%/emoji/data/ca.dict
+%%DATADIR%%/emoji/data/ccp.dict
+%%DATADIR%%/emoji/data/ceb.dict
+%%DATADIR%%/emoji/data/chr.dict
+%%DATADIR%%/emoji/data/ckb.dict
+%%DATADIR%%/emoji/data/cs.dict
+%%DATADIR%%/emoji/data/cy.dict
+%%DATADIR%%/emoji/data/da.dict
+%%DATADIR%%/emoji/data/de.dict
+%%DATADIR%%/emoji/data/de_CH.dict
+%%DATADIR%%/emoji/data/dsb.dict
+%%DATADIR%%/emoji/data/el.dict
+%%DATADIR%%/emoji/data/en.dict
+%%DATADIR%%/emoji/data/en_001.dict
+%%DATADIR%%/emoji/data/en_AU.dict
+%%DATADIR%%/emoji/data/en_CA.dict
+%%DATADIR%%/emoji/data/en_GB.dict
+%%DATADIR%%/emoji/data/es.dict
+%%DATADIR%%/emoji/data/es_419.dict
+%%DATADIR%%/emoji/data/es_MX.dict
+%%DATADIR%%/emoji/data/es_US.dict
+%%DATADIR%%/emoji/data/et.dict
+%%DATADIR%%/emoji/data/eu.dict
+%%DATADIR%%/emoji/data/fa.dict
+%%DATADIR%%/emoji/data/fi.dict
+%%DATADIR%%/emoji/data/fil.dict
+%%DATADIR%%/emoji/data/fo.dict
+%%DATADIR%%/emoji/data/fr.dict
+%%DATADIR%%/emoji/data/fr_CA.dict
+%%DATADIR%%/emoji/data/ga.dict
+%%DATADIR%%/emoji/data/gd.dict
+%%DATADIR%%/emoji/data/gl.dict
+%%DATADIR%%/emoji/data/gu.dict
+%%DATADIR%%/emoji/data/ha.dict
+%%DATADIR%%/emoji/data/he.dict
+%%DATADIR%%/emoji/data/hi.dict
+%%DATADIR%%/emoji/data/hi_Latn.dict
+%%DATADIR%%/emoji/data/hr.dict
+%%DATADIR%%/emoji/data/hsb.dict
+%%DATADIR%%/emoji/data/hu.dict
+%%DATADIR%%/emoji/data/hy.dict
+%%DATADIR%%/emoji/data/ia.dict
+%%DATADIR%%/emoji/data/id.dict
+%%DATADIR%%/emoji/data/ig.dict
+%%DATADIR%%/emoji/data/is.dict
+%%DATADIR%%/emoji/data/it.dict
+%%DATADIR%%/emoji/data/ja.dict
+%%DATADIR%%/emoji/data/jv.dict
+%%DATADIR%%/emoji/data/ka.dict
+%%DATADIR%%/emoji/data/kab.dict
+%%DATADIR%%/emoji/data/kk.dict
+%%DATADIR%%/emoji/data/kl.dict
+%%DATADIR%%/emoji/data/km.dict
+%%DATADIR%%/emoji/data/kn.dict
+%%DATADIR%%/emoji/data/ko.dict
+%%DATADIR%%/emoji/data/kok.dict
+%%DATADIR%%/emoji/data/ky.dict
+%%DATADIR%%/emoji/data/lb.dict
+%%DATADIR%%/emoji/data/lo.dict
+%%DATADIR%%/emoji/data/lt.dict
+%%DATADIR%%/emoji/data/lv.dict
+%%DATADIR%%/emoji/data/mi.dict
+%%DATADIR%%/emoji/data/mk.dict
+%%DATADIR%%/emoji/data/ml.dict
+%%DATADIR%%/emoji/data/mn.dict
+%%DATADIR%%/emoji/data/mni.dict
+%%DATADIR%%/emoji/data/mr.dict
+%%DATADIR%%/emoji/data/ms.dict
+%%DATADIR%%/emoji/data/mt.dict
+%%DATADIR%%/emoji/data/my.dict
+%%DATADIR%%/emoji/data/ne.dict
+%%DATADIR%%/emoji/data/nl.dict
+%%DATADIR%%/emoji/data/nn.dict
+%%DATADIR%%/emoji/data/no.dict
+%%DATADIR%%/emoji/data/or.dict
+%%DATADIR%%/emoji/data/pa.dict
+%%DATADIR%%/emoji/data/pa_Arab.dict
+%%DATADIR%%/emoji/data/pcm.dict
+%%DATADIR%%/emoji/data/pl.dict
+%%DATADIR%%/emoji/data/ps.dict
+%%DATADIR%%/emoji/data/pt.dict
+%%DATADIR%%/emoji/data/pt_PT.dict
+%%DATADIR%%/emoji/data/qu.dict
+%%DATADIR%%/emoji/data/rm.dict
+%%DATADIR%%/emoji/data/ro.dict
+%%DATADIR%%/emoji/data/ru.dict
+%%DATADIR%%/emoji/data/rw.dict
+%%DATADIR%%/emoji/data/sc.dict
+%%DATADIR%%/emoji/data/sd.dict
+%%DATADIR%%/emoji/data/si.dict
+%%DATADIR%%/emoji/data/sk.dict
+%%DATADIR%%/emoji/data/sl.dict
+%%DATADIR%%/emoji/data/so.dict
+%%DATADIR%%/emoji/data/sq.dict
+%%DATADIR%%/emoji/data/sr.dict
+%%DATADIR%%/emoji/data/sr_Cyrl_BA.dict
+%%DATADIR%%/emoji/data/sr_Latn.dict
+%%DATADIR%%/emoji/data/sr_Latn_BA.dict
+%%DATADIR%%/emoji/data/sv.dict
+%%DATADIR%%/emoji/data/sw.dict
+%%DATADIR%%/emoji/data/sw_KE.dict
+%%DATADIR%%/emoji/data/ta.dict
+%%DATADIR%%/emoji/data/te.dict
+%%DATADIR%%/emoji/data/tg.dict
+%%DATADIR%%/emoji/data/th.dict
+%%DATADIR%%/emoji/data/ti.dict
+%%DATADIR%%/emoji/data/tk.dict
+%%DATADIR%%/emoji/data/to.dict
+%%DATADIR%%/emoji/data/tr.dict
+%%DATADIR%%/emoji/data/ug.dict
+%%DATADIR%%/emoji/data/uk.dict
+%%DATADIR%%/emoji/data/ur.dict
+%%DATADIR%%/emoji/data/uz.dict
+%%DATADIR%%/emoji/data/vi.dict
+%%DATADIR%%/emoji/data/wo.dict
+%%DATADIR%%/emoji/data/xh.dict
+%%DATADIR%%/emoji/data/yo.dict
+%%DATADIR%%/emoji/data/yo_BJ.dict
+%%DATADIR%%/emoji/data/yue.dict
+%%DATADIR%%/emoji/data/yue_Hans.dict
+%%DATADIR%%/emoji/data/zh.dict
+%%DATADIR%%/emoji/data/zh_Hant.dict
+%%DATADIR%%/emoji/data/zh_Hant_HK.dict
+%%DATADIR%%/emoji/data/zu.dict
%%DATADIR%%/spell/en_dict.fscd
%%DATADIR%%/testing/addon/testfrontend.conf
%%DATADIR%%/testing/addon/testim.conf
@@ -281,6 +420,7 @@ share/locale/he/LC_MESSAGES/fcitx5.mo
share/locale/ja/LC_MESSAGES/fcitx5.mo
share/locale/ko/LC_MESSAGES/fcitx5.mo
share/locale/ru/LC_MESSAGES/fcitx5.mo
+share/locale/vi/LC_MESSAGES/fcitx5.mo
share/locale/zh_CN/LC_MESSAGES/fcitx5.mo
share/locale/zh_TW/LC_MESSAGES/fcitx5.mo
share/metainfo/org.fcitx.Fcitx5.metainfo.xml
diff --git a/x11/xcb-imdkit/Makefile b/x11/xcb-imdkit/Makefile
index 0cbb19dfef56..5e1321170c5e 100644
--- a/x11/xcb-imdkit/Makefile
+++ b/x11/xcb-imdkit/Makefile
@@ -1,6 +1,7 @@
PORTNAME= xcb-imdkit
DISTVERSION= 1.0.5
CATEGORIES= x11 textproc
+MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
MAINTAINER= khng@FreeBSD.org
COMMENT= Input method development support for XCB
@@ -10,13 +11,10 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-2.1-only.txt
BUILD_DEPENDS= uthash>=0:devel/uthash
-LIB_DEPENDS= libxcb-util.so:x11/xcb-util \
- libxcb-keysyms.so:x11/xcb-util-keysyms
+LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms \
+ libxcb-util.so:x11/xcb-util
-USES= compiler:c11 cmake pkgconfig kde:5 xorg
-
-USE_GITHUB= yes
-GH_ACCOUNT= fcitx
+USES= cmake compiler:c11 kde:5 pkgconfig tar:xz xorg
USE_KDE= ecm
USE_XORG= xcb
diff --git a/x11/xcb-imdkit/distinfo b/x11/xcb-imdkit/distinfo
index 749c6b4db4f4..e939f4684f4d 100644
--- a/x11/xcb-imdkit/distinfo
+++ b/x11/xcb-imdkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678770310
-SHA256 (fcitx-xcb-imdkit-1.0.5_GH0.tar.gz) = 3e3cdb272c84805d75ab233d757908278fe649d63a4f998ab116a74c57795e93
-SIZE (fcitx-xcb-imdkit-1.0.5_GH0.tar.gz) = 659326
+TIMESTAMP = 1679112437
+SHA256 (xcb-imdkit-1.0.5.tar.xz) = 373fcd26d99254b1260fd0254bcea1d346e1061cc5707f4d71b4a091418f03cc
+SIZE (xcb-imdkit-1.0.5.tar.xz) = 347460