diff --git a/japanese/fcitx-anthy/Makefile b/japanese/fcitx-anthy/Makefile
index 11a908cff815..80e17e226c2d 100644
--- a/japanese/fcitx-anthy/Makefile
+++ b/japanese/fcitx-anthy/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	fcitx-anthy
 DISTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://download.fcitx-im.org/${PORTNAME}/
 DIST_SUBDIR=	fcitx
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Anthy support for Fcitx
 WWW=		https://fcitx-im.org/wiki/Fcitx
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		fcitx:chinese/fcitx
 LIB_DEPENDS=	libanthy-unicode.so:japanese/anthy-unicode
 
 USES=		cmake gettext gnome pkgconfig tar:xz
 
 .include <bsd.port.mk>
diff --git a/japanese/fcitx5-anthy/Makefile b/japanese/fcitx5-anthy/Makefile
index b398651dc6ff..c3531cd83682 100644
--- a/japanese/fcitx5-anthy/Makefile
+++ b/japanese/fcitx5-anthy/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	fcitx5-anthy
 DISTVERSION=	5.1.9
+PORTREVISION=	1
 CATEGORIES=	japanese textproc
 MASTER_SITES=	https://download.fcitx-im.org/fcitx5/${PORTNAME}/
 
 MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Anthy support for Fcitx5
 WWW=		https://github.com/fcitx/fcitx5-anthy
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
 
 LIB_DEPENDS=	libFcitx5Core.so:textproc/fcitx5 \
 		libanthy-unicode.so:japanese/anthy-unicode
 
 USES=		cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig tar:zst
 
 USE_KDE=	ecm
 
 .include <bsd.port.mk>
diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index fc10a92e0856..47794c706a8d 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	ibus-anthy
 DISTVERSION=	1.5.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	https://github.com/ibus/ibus-anthy/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	ja-
 
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Anthy engine for IBus
 WWW=		https://github.com/ibus/ibus-anthy
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus \
 		libanthy-unicode.so:japanese/anthy-unicode
 
 USES=		gettext gmake gnome libtool pkgconfig python
 USE_GNOME=	pygobject3
 GLIB_SCHEMAS=	org.freedesktop.ibus.engine.anthy.gschema.xml
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-layout=default
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/japanese/kasumi-unicode/Makefile b/japanese/kasumi-unicode/Makefile
index fe1a6daccc59..6fca2db616a0 100644
--- a/japanese/kasumi-unicode/Makefile
+++ b/japanese/kasumi-unicode/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	kasumi-unicode
 DISTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	japanese
 
 MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	Dictionary management tool for anthy-unicode
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libanthy-unicode.so:japanese/anthy-unicode
 
 USES=		autoreconf compiler:c++11-lang gmake gnome iconv:wchar_t \
 		libtool pkgconfig
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 GH_ACCOUNT=	fujiwarat
 USE_GNOME=	gtk30
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 4fdb6396363e..d9a3923b32ab 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	scim-anthy
 PORTVERSION=	1.2.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	OSDN/scim-imengine
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Anthy
 WWW=		https://sourceforge.jp/projects/scim-imengine/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	scim:textproc/scim
 LIB_DEPENDS=	libanthy-unicode.so:japanese/anthy-unicode \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		kasumi:japanese/kasumi-unicode
 
 USES=		gettext-runtime gmake gnome iconv libtool:keepla pkgconfig
 USE_GNOME=	atk cairo gdkpixbuf glib20 gtk20 pango
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include/anthy-unicode-1.0
 
 .include <bsd.port.mk>
diff --git a/japanese/uim-anthy-unicode/Makefile b/japanese/uim-anthy-unicode/Makefile
index 1c4a26dc86ee..4a4d305ede9e 100644
--- a/japanese/uim-anthy-unicode/Makefile
+++ b/japanese/uim-anthy-unicode/Makefile
@@ -1,43 +1,44 @@
+PORTREVISION=	1
 CATEGORIES=	japanese
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-anthy-unicode-nox11
 .else
 PKGNAMESUFFIX=	-anthy-unicode
 .endif
 
 COMMENT=	Uim plugin using Anthy Unicode input method
 
 .if !defined(WITHOUT_X11)
 USE_GNOME=	cairo gdkpixbuf gtk30
 .endif
 
 LIB_DEPENDS=	libanthy-unicode.so:japanese/anthy-unicode \
 		libfreetype.so:print/freetype2 \
 		libuim.so:textproc/uim \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-anthy-utf8
 
 .if !defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-gtk3 --enable-dict
 .endif
 
 UIM_SLAVE=	yes
 
 do-build:
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy-utf8.la)
 .if !defined(WITHOUT_X11)
 	(cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} uim-dict-gtk3)
 .endif
 
 do-install:
 	(cd ${WRKSRC}/uim && \
 	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES)
 .if !defined(WITHOUT_X11)
 	(cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 INSTALL_STRIP_FLAG=-s install-binPROGRAMS install-uim_dict_uiDATA)
 .endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 50051c7a8ed4..13094a20bce1 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,139 +1,140 @@
 PORTNAME=	uim
 PORTVERSION=	1.9.6
+PORTREVISION?=	0
 CATEGORIES?=	textproc
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 .endif
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Input method library
 WWW=		https://github.com/uim/uim
 
 LICENSE=	BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to configure: ./include/private/gcconfig.h:492:5: The collector has not been ported to this machine/OS combination
 
 USES+=		autoreconf:build,2.69 gettext gmake gnome iconv libedit \
 		libtool pathfix pkgconfig sqlite
 USE_LDCONFIG=	yes
 USE_GNOME+=	glib20 intltool
 
 USE_GITHUB=	yes
 GH_TUPLE=	uim:sigscheme:ccf1f92:sigscheme \
 		uim:libgcroots:f019129:libgcroots
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=	--enable-maintainer-mode
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=	X11
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
 USES+=		xorg
 USE_XORG+=	x11 xext
 LIB_DEPENDS+=	libXft.so:x11-fonts/libXft
 CONFIGURE_ARGS+=	--with-x --with-xft
 .endif
 
 .if !defined(UIM_SLAVE)
 USES+=		perl5 ruby:build
 USE_GNOME+=	librsvg2:build
 USE_PERL5=	build
 RUN_DEPENDS=	${LOCALBASE}/share/skk/SKK-JISYO.L:japanese/skk-jisyo
 .if ${PORT_OPTIONS:MX11}
 USE_GNOME+=	cairo gdkpixbuf gtk30
 LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz
 CONFIGURE_ARGS+=	--with-gtk3 --enable-default-toolkit=gtk3
 .endif
 CONFIGURE_ARGS+=	--enable-emacs --with-sj3 --with-canna --with-prime
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 .if !defined(UIM_SLAVE)
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
 DOCSDIR_SIGSCHEME=	${PREFIX}/share/doc/uim/sigscheme
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \
 		DOCSDIR_SIGSCHEME="${DOCSDIR_SIGSCHEME:S,^${PREFIX}/,,}"
 .endif
 
 .if empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	X11="@comment "
 .else
 PLIST_SUB+=	X11=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--enable-storage=fatty
 .endif
 
 .for _x in x xft gtk2 gtk3 qt5 qt6 anthy canna m17nlib prime scim dict
 .if ${CONFIGURE_ARGS:M--with-${_x}} == ""
 CONFIGURE_ARGS+=--without-${_x}
 .endif
 .endfor
 .for _x in gnome-applet kde-applet emacs pref
 .if ${CONFIGURE_ARGS:M--enable-${_x}} == ""
 CONFIGURE_ARGS+=--disable-${_x}
 .endif
 .endfor
 
 post-extract:
 	${CP} -R ${WRKSRC_sigscheme}/* ${WRKSRC}/sigscheme
 	${MKDIR} ${WRKSRC}/sigscheme/libgcroots
 	${CP} -R ${WRKSRC_libgcroots}/* ${WRKSRC}/sigscheme/libgcroots
 
 post-patch:
 .for f in predict-custom.scm predict-look-skk.scm
 	${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|g' ${WRKSRC}/scm/${f}
 .endfor
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh
 
 do-build:
 .if !defined(UIM_SLAVE)
 .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables
 	cd ${WRKSRC}/${d} && ${MAKE_CMD}
 .endfor
 .if ${PORT_OPTIONS:MX11}
 	cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD}
 .endif
 .endif
 
 do-install:
 .if !defined(UIM_SLAVE)
 	cd ${WRKSRC} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-data-am
 .for d in sigscheme uim scm xim fep emacs pixmaps tables
 	cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip
 .endfor
 	cd ${WRKSRC}/po && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
 .if ${PORT_OPTIONS:MX11}
 	cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip
 .endif
 .endif
 
 .if !defined(UIM_SLAVE)
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/helperdata
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
 	${INSTALL_DATA} ${WRKSRC}/doc/KEY ${STAGEDIR}${DOCSDIR}/KEY
 	${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.fep
 	${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.key
 	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.fep
 	${INSTALL_DATA} ${WRKSRC}/xim/README ${STAGEDIR}${DOCSDIR}/README.xim
 .endif
 
 .include <bsd.port.post.mk>