diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index fb620d20069c..06eaf74e7438 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
 
 MAINTAINER=	s_yanagita@ybb.ne.jp
 COMMENT=	SCIM IMEngine module using UIM input method library
 WWW=		https://sourceforge.net/projects/scim/files/scim-uim/
 
 BUILD_DEPENDS=	scim:textproc/scim
 LIB_DEPENDS=	libuim.so:textproc/uim
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake iconv libtool:keepla pkgconfig
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index 6ba91bafd3cb..17a5fff312c9 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -1,46 +1,45 @@
 CATEGORIES=	japanese
-PORTREVISION=	2
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-anthy-nox11
 .else
 PKGNAMESUFFIX=	-anthy
 .endif
 
 COMMENT=	Uim plugin using Anthy input method
 
 .if !defined(WITHOUT_X11)
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 .endif
 
 LIB_DEPENDS=	libanthy.so:japanese/anthy \
 		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 --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.la)
 	(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.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES && \
 	${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/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index 162f9b3053b3..27a333c1994d 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,13 +1,13 @@
-PORTREVISION=	6
+PORTREVISION=	7
 PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim
 
 MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
 FILESDIR=	${.CURDIR}/files
 DATADIR=	${PREFIX}/share/uim
 SUB_FILES=	pkg-message
 
 BUILD_MOZC_LIST=uim_mozc
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index fbd2db84c669..01645982fea6 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.6.0
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	UIM helper program for Tomoe
 WWW=		https://sourceforge.jp/projects/tomoe/
 
 LIB_DEPENDS=	libtomoe.so:japanese/tomoe \
 		libtomoe-gtk.so:japanese/libtomoe-gtk \
 		libuim.so:textproc/uim
 
 USES=		gettext gmake gnome libtool pkgconfig
 USE_GNOME=	gtk20 intltool
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/uim-tomoe-gtk \
 		share/locale/ja/LC_MESSAGES/uim-tomoe-gtk.mo
 
 CONFIGURE_ENV+=	GMSGFMT="${LOCALBASE}/bin/msgfmt"
 
 .include <bsd.port.mk>
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index da876a37beaf..e97ecb0947a2 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,54 +1,53 @@
 PORTNAME=	uim-el
 PORTVERSION=	1.9.0.b.${SNAPDATE}
-PORTREVISION=	8
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Emacs lisp for uim input method library
 WWW=		https://github.com/uim/uim
 
 LICENSE=	BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	uim-el-agent:textproc/uim
 
 USES=		autoreconf:build,2.69 emacs gettext gmake gnome iconv libtool \
 		pathfix perl5 pkgconfig
 USE_GNOME=	intltool
 USE_PERL5=	build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uim
 GH_PROJECT=	uim
-GH_TAGNAME=	15f0788
+GH_TAGNAME=	f7cdc9d
 
-SNAPDATE=	20220927
+SNAPDATE=	20240306
 
 GNU_CONFIGURE=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/emacs
 INSTALL_WRKSRC=	${WRKSRC}/emacs
 
 CONFIGURE_ARGS?=--enable-maintainer-mode --enable-emacs \
 		--with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim-el
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
 	${INSTALL_DATA} ${WRKSRC}/emacs/README ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.ja
 
 .include <bsd.port.mk>
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index c8a3a13e01f7..a7c11557f313 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669529204
-SHA256 (uim-uim-1.9.0.b.20220927-15f0788_GH0.tar.gz) = 263ee5f19320274c251bf817213e9e19c8d563ff7cebfb2064374890cfaf59b7
-SIZE (uim-uim-1.9.0.b.20220927-15f0788_GH0.tar.gz) = 4054813
+TIMESTAMP = 1713707153
+SHA256 (uim-uim-1.9.0.b.20240306-f7cdc9d_GH0.tar.gz) = 79b2e3c9029fe063653c8fe59038b78bd377f9425c162bcd18a0b21ab37aa1c9
+SIZE (uim-uim-1.9.0.b.20240306-f7cdc9d_GH0.tar.gz) = 4053878
diff --git a/textproc/uim-el/files/patch-emacs_uim-var.el b/textproc/uim-el/files/patch-emacs_uim-var.el
deleted file mode 100644
index b4b926167dda..000000000000
--- a/textproc/uim-el/files/patch-emacs_uim-var.el
+++ /dev/null
@@ -1,20 +0,0 @@
---- emacs/uim-var.el.orig	2023-08-22 15:31:18 UTC
-+++ emacs/uim-var.el
-@@ -435,7 +435,7 @@ keeps the size of it when showing the candidates.")
- (make-face 'uim-preedit-face)
- 
- (copy-face 'uim-preedit-face 'uim-preedit-underline-face)
--(set-face-underline-p        'uim-preedit-underline-face t)
-+(set-face-underline          'uim-preedit-underline-face t)
- 
- ;; highlight
- (make-face 'uim-preedit-highlight-face)
-@@ -443,7 +443,7 @@ keeps the size of it when showing the candidates.")
- (set-face-background 'uim-preedit-highlight-face "Blue3")
- 
- (copy-face 'uim-preedit-highlight-face 'uim-preedit-highlight-underline-face)
--(set-face-underline-p 'uim-preedit-highlight-underline-face t)
-+(set-face-underline 'uim-preedit-highlight-underline-face t)
- 
- ;; separator
- (make-face 'uim-separator-face)
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 1d6ea68e0868..eff2972dcd27 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -1,29 +1,28 @@
 PKGNAMESUFFIX=	-gtk
-PORTREVISION=	1
 
 COMMENT=	GTK modules of uim input method
 
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 LIB_DEPENDS=	libuim.so:textproc/uim \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-gtk2 --enable-pref
 
 UIM_SLAVE=	yes
 
 .if defined(WITHOUT_X11)
 IGNORE=		requires X11
 .endif
 
 do-build:
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
 	(cd ${WRKSRC}/gtk2 && ${MAKE_CMD})
 
 do-install:
 	(cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile
index 3ec968e64784..78ec3659df57 100644
--- a/textproc/uim-gtk3/Makefile
+++ b/textproc/uim-gtk3/Makefile
@@ -1,35 +1,34 @@
 PKGNAMESUFFIX=	-gtk3
-PORTREVISION=	2
 
 COMMENT=	GTK 3.x modules of uim input method
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 LIB_DEPENDS=	libuim.so:textproc/uim \
 		libharfbuzz.so:print/harfbuzz
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-gtk3 --enable-pref --enable-default-toolkit=gtk3
 
 UIM_SLAVE=	yes
 
 .if defined(WITHOUT_X11)
 IGNORE=		requires X11
 .endif
 
 do-build:
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
 	(cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD})
 	(cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD})
 	(cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD})
 	(cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD})
 	(cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD})
 
 do-install:
 	(cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 	(cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 	(cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 	(cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 	(cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 1caeb69b4a57..e82ff248abd0 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,137 +1,136 @@
 PORTNAME=	uim
 PORTVERSION=	1.9.0.b.${SNAPDATE}
-PORTREVISION=	3
 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_TAGNAME=	15f0788
+GH_TAGNAME=	f7cdc9d
 GH_TUPLE=	uim:sigscheme:beb8fbd:sigscheme \
 		uim:libgcroots:d362356:libgcroots
 
-SNAPDATE=	20220927
+SNAPDATE=	20240306
 
 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
 .if ${PORT_OPTIONS:MX11}
 USE_GNOME+=	cairo gdkpixbuf2 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 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
 
 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>
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 4423e0a537b2..9351704bc1b6 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1669528723
-SHA256 (uim-uim-1.9.0.b.20220927-15f0788_GH0.tar.gz) = 263ee5f19320274c251bf817213e9e19c8d563ff7cebfb2064374890cfaf59b7
-SIZE (uim-uim-1.9.0.b.20220927-15f0788_GH0.tar.gz) = 4054813
+TIMESTAMP = 1713706909
+SHA256 (uim-uim-1.9.0.b.20240306-f7cdc9d_GH0.tar.gz) = 79b2e3c9029fe063653c8fe59038b78bd377f9425c162bcd18a0b21ab37aa1c9
+SIZE (uim-uim-1.9.0.b.20240306-f7cdc9d_GH0.tar.gz) = 4053878
 SHA256 (uim-sigscheme-beb8fbd_GH0.tar.gz) = c3ad5cbec2ff32bb97aed4273e7a61ee74b2a0da301490349798e475c894a25c
 SIZE (uim-sigscheme-beb8fbd_GH0.tar.gz) = 570745
 SHA256 (uim-libgcroots-d362356_GH0.tar.gz) = ae01589f5a7b49cf78418aca8679a7cd46a177a37d7776a4353b517d88cef451
 SIZE (uim-libgcroots-d362356_GH0.tar.gz) = 88740