textproc/uim: Update to 1.9.0

- Add RUN_DEPENDS on japanese/skk-jisyo
- Fix default SKK-JISYO.L dictionary file path setting for SKK input method
- Rename textproc/uim-gtk port to textproc/uim-gtk2
- Add textproc/uim-qt6 port of Qt6 input method module
- Bump PORTREVISION of the ports that depend on textproc/uim port

21 files changed, 126 insertions, 32 deletions

diff --git a/MOVED b/MOVED
index 0bddcf544c0d..169d0b28ceee 100644
--- a/MOVED
+++ b/MOVED
@@ -4162,3 +4162,4 @@ deskutils/knotes||2025-02-22|Discontinued upstream
 net-im/kopete||2025-02-22|Discontinued upstream
 sysutils/shim||2025-02-22|Has expired: upstream has been inactive for 10 years and does not build with GCC 14
 devel/py-python-gilt|devel/gilt|2025-02-23|Project switched language from python to go
+textproc/uim-gtk|textproc/uim-gtk2|2025-02-23|Rename with versioned suffix
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 06eaf74e7438..36169d64a802 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index 27a333c1994d..5620d3ff8774 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	7
+PORTREVISION=	8
 PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 01645982fea6..d3d140a8e3b3 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.6.0
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/Makefile b/textproc/Makefile
index bc61dd3c2cc0..ee29b1dc883a 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -2132,10 +2132,11 @@
     SUBDIR += ugrep
     SUBDIR += uim
     SUBDIR += uim-el
-    SUBDIR += uim-gtk
+    SUBDIR += uim-gtk2
     SUBDIR += uim-gtk3
     SUBDIR += uim-m17nlib
     SUBDIR += uim-qt5
+    SUBDIR += uim-qt6
     SUBDIR += uml2svg
     SUBDIR += uncle
     SUBDIR += uncrustify
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 3b49136de21b..2c76facf97f3 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	uim-el
-PORTVERSION=	1.9.0.b.${SNAPDATE}
-PORTREVISION=	2
+PORTVERSION=	1.9.0
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
@@ -22,9 +21,6 @@ USE_PERL5=	build
 USE_GITHUB=	yes
 GH_ACCOUNT=	uim
 GH_PROJECT=	uim
-GH_TAGNAME=	f7cdc9d
-
-SNAPDATE=	20240306
 
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index a7c11557f313..3c75d5fcf770 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1740307779
+SHA256 (uim-uim-1.9.0_GH0.tar.gz) = e1fb10b1e2b8bf633f69f5f681b4398e10129e912ed204c6af74405c27da6045
+SIZE (uim-uim-1.9.0_GH0.tar.gz) = 4050531
diff --git a/textproc/uim-el/files/patch-autogen.sh b/textproc/uim-el/files/patch-autogen.sh
new file mode 100644
index 000000000000..38c1ef7aa378
--- /dev/null
+++ b/textproc/uim-el/files/patch-autogen.sh
@@ -0,0 +1,15 @@
+--- autogen.sh.orig	2025-02-23 08:00:09 UTC
++++ autogen.sh
+@@ -3,9 +3,6 @@ ${AUTORECONF:-autoreconf} --force --install "$@"
+ set -e
+ 
+ ${AUTORECONF:-autoreconf} --force --install "$@"
+-# WORKAROUND: intltool-merge creates .intltool-merge-cache.lock but
+-# it's not listed in mostlyclean in po/Makefile.in.in. It causes a
+-# "make distcheck" failure.
+-sed -i.bak -e 's/ \.intltool-merge-cache$/ .intltool-merge-cache{,.lock}/g' \
+-  po/Makefile.in.in
+-rm -f po/Makefile.in.in.bak
++if command -v intltoolize >/dev/null; then
++    intltoolize --copy --force --automake
++fi
diff --git a/textproc/uim-gtk/pkg-descr b/textproc/uim-gtk/pkg-descr
deleted file mode 100644
index c796f503a5ad..000000000000
--- a/textproc/uim-gtk/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ modules of uim input method.
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk2/Makefile
index eff2972dcd27..e78ef1908d60 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk2/Makefile
@@ -1,6 +1,6 @@
-PKGNAMESUFFIX=	-gtk
+PKGNAMESUFFIX=	-gtk2
 
-COMMENT=	GTK modules of uim input method
+COMMENT=	GTK 2.x modules of uim input method
 
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 LIB_DEPENDS=	libuim.so:textproc/uim \
diff --git a/textproc/uim-gtk2/pkg-descr b/textproc/uim-gtk2/pkg-descr
new file mode 100644
index 000000000000..c55045b0cdfc
--- /dev/null
+++ b/textproc/uim-gtk2/pkg-descr
@@ -0,0 +1 @@
+GTK+ 2.x modules of uim input method.
diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk2/pkg-plist
index 1a2e1d2daee2..1a2e1d2daee2 100644
--- a/textproc/uim-gtk/pkg-plist
+++ b/textproc/uim-gtk2/pkg-plist
diff --git a/textproc/uim-qt6/Makefile b/textproc/uim-qt6/Makefile
new file mode 100644
index 000000000000..b7116ac7ac4d
--- /dev/null
+++ b/textproc/uim-qt6/Makefile
@@ -0,0 +1,34 @@
+PKGNAMESUFFIX=	-qt6
+
+COMMENT=	Qt6 modules of uim input method
+
+LIB_DEPENDS=	libuim.so:textproc/uim
+
+USES=		cmake:indirect compiler:c++11-lang gl iconv kde:6 libtool qt:6
+USE_GL=		gl
+USE_KDE=	ecm:build
+USE_QT=		declarative
+
+MASTERDIR=	${.CURDIR}/../../textproc/uim
+PKGDIR=		${.CURDIR}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--with-qt6 --with-qt6-immodule
+CONFIGURE_ENV=	DATADIRNAME="share"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+UIM_SLAVE=	yes
+
+.if defined(WITHOUT_X11)
+IGNORE=		cannot be built without X11. Please, unset WITHOUT_X11
+.endif
+
+do-build:
+	(cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
+	(cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
+	(cd ${WRKSRC}/qt6 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
+
+do-install:
+	(cd ${WRKSRC}/qt6 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-qt6/pkg-descr b/textproc/uim-qt6/pkg-descr
new file mode 100644
index 000000000000..759eaabd474d
--- /dev/null
+++ b/textproc/uim-qt6/pkg-descr
@@ -0,0 +1 @@
+Qt6 IM modules of uim input method.
diff --git a/textproc/uim-qt6/pkg-plist b/textproc/uim-qt6/pkg-plist
new file mode 100644
index 000000000000..e46753775b47
--- /dev/null
+++ b/textproc/uim-qt6/pkg-plist
@@ -0,0 +1,6 @@
+bin/uim-chardict-qt6
+bin/uim-im-switcher-qt6
+bin/uim-pref-qt6
+bin/uim-toolbar-qt6
+%%QT_PLUGINDIR%%/platforminputcontexts/libuimplatforminputcontextplugin.so
+libexec/uim-candwin-qt6
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index e82ff248abd0..203bf875f4ec 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	uim
-PORTVERSION=	1.9.0.b.${SNAPDATE}
+PORTVERSION=	1.9.0
 CATEGORIES?=	textproc
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
@@ -21,11 +21,8 @@ USE_LDCONFIG=	yes
 USE_GNOME+=	glib20 intltool
 
 USE_GITHUB=	yes
-GH_TAGNAME=	f7cdc9d
-GH_TUPLE=	uim:sigscheme:beb8fbd:sigscheme \
-		uim:libgcroots:d362356:libgcroots
-
-SNAPDATE=	20240306
+GH_TUPLE=	uim:sigscheme:ccf1f92:sigscheme \
+		uim:libgcroots:f019129:libgcroots
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
@@ -47,6 +44,7 @@ CONFIGURE_ARGS+=	--with-x --with-xft
 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 gdkpixbuf2 gtk30
 LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
@@ -80,7 +78,7 @@ PLIST_SUB+=	X11=""
 CONFIGURE_ARGS+=	--enable-storage=fatty
 .endif
 
-.for _x in x xft gtk2 gtk3 qt5 anthy canna m17nlib prime scim dict
+.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
@@ -96,6 +94,11 @@ post-extract:
 	${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
 
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 9351704bc1b6..ac69a21aa698 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,7 +1,7 @@
-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
+TIMESTAMP = 1740302751
+SHA256 (uim-uim-1.9.0_GH0.tar.gz) = e1fb10b1e2b8bf633f69f5f681b4398e10129e912ed204c6af74405c27da6045
+SIZE (uim-uim-1.9.0_GH0.tar.gz) = 4050531
+SHA256 (uim-sigscheme-ccf1f92_GH0.tar.gz) = 320e0e9af6c64fb9fa2b58643792b9ed5b66b9add3ed233a391b6a2518a6313f
+SIZE (uim-sigscheme-ccf1f92_GH0.tar.gz) = 570780
+SHA256 (uim-libgcroots-f019129_GH0.tar.gz) = b88a61336ddf230b083f7185eb94aa0f1d3168204a84d35578eccaf0a61c1800
+SIZE (uim-libgcroots-f019129_GH0.tar.gz) = 88746
diff --git a/textproc/uim/files/patch-autogen.sh b/textproc/uim/files/patch-autogen.sh
new file mode 100644
index 000000000000..38c1ef7aa378
--- /dev/null
+++ b/textproc/uim/files/patch-autogen.sh
@@ -0,0 +1,15 @@
+--- autogen.sh.orig	2025-02-23 08:00:09 UTC
++++ autogen.sh
+@@ -3,9 +3,6 @@ ${AUTORECONF:-autoreconf} --force --install "$@"
+ set -e
+ 
+ ${AUTORECONF:-autoreconf} --force --install "$@"
+-# WORKAROUND: intltool-merge creates .intltool-merge-cache.lock but
+-# it's not listed in mostlyclean in po/Makefile.in.in. It causes a
+-# "make distcheck" failure.
+-sed -i.bak -e 's/ \.intltool-merge-cache$/ .intltool-merge-cache{,.lock}/g' \
+-  po/Makefile.in.in
+-rm -f po/Makefile.in.in.bak
++if command -v intltoolize >/dev/null; then
++    intltoolize --copy --force --automake
++fi
diff --git a/textproc/uim/files/patch-configure.ac b/textproc/uim/files/patch-configure.ac
index 54ea5d240826..321bf7faf9a1 100644
--- a/textproc/uim/files/patch-configure.ac
+++ b/textproc/uim/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2022-03-18 00:54:17 UTC
+--- configure.ac.orig	2025-02-23 08:00:09 UTC
 +++ configure.ac
-@@ -123,7 +123,7 @@ fi
+@@ -124,7 +124,7 @@ if test "x$with_anthy" = xyes; then
  if test "x$with_anthy" = xyes; then
    ANTHY_LIBS="-lanthy -lanthydic"
    ANTHY_CFLAGS=""
@@ -9,7 +9,7 @@
                     [AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
                      "libanthy can handle UTF-8")])
  fi
-@@ -141,7 +141,7 @@ AC_ARG_WITH(anthy-utf8,
+@@ -142,7 +142,7 @@ if test "x$with_anthy_utf8" != xno; then
    [with_anthy_utf8=no])
  
  if test "x$with_anthy_utf8" != xno; then
diff --git a/textproc/uim/files/patch-scm_predict-custom.scm b/textproc/uim/files/patch-scm_predict-custom.scm
new file mode 100644
index 000000000000..c7dd90b79d55
--- /dev/null
+++ b/textproc/uim/files/patch-scm_predict-custom.scm
@@ -0,0 +1,11 @@
+--- scm/predict-custom.scm.orig	2025-02-23 08:00:09 UTC
++++ scm/predict-custom.scm
+@@ -110,7 +110,7 @@
+                      (N_ "Look-SKK prediction")
+                      (N_ "long description will be here."))
+ 
+-(define-custom 'predict-custom-look-skk-jisyo "/usr/share/skk/SKK-JISYO.L"
++(define-custom 'predict-custom-look-skk-jisyo "%PREFIX%/share/skk/SKK-JISYO.L"
+                '(predict predict-look-skk)
+                '(pathname regular-file)
+                (N_ "Sorted SKK-JISYO dictionary file")
diff --git a/textproc/uim/files/patch-scm_predict-look-skk.scm b/textproc/uim/files/patch-scm_predict-look-skk.scm
new file mode 100644
index 000000000000..6a7726d76a4b
--- /dev/null
+++ b/textproc/uim/files/patch-scm_predict-look-skk.scm
@@ -0,0 +1,11 @@
+--- scm/predict-look-skk.scm.orig	2025-02-23 08:00:09 UTC
++++ scm/predict-look-skk.scm
+@@ -37,7 +37,7 @@
+ 
+ (define-class predict-look-skk predict
+   '((limit 10)
+-    (jisyo "/usr/share/skk/SKK-JISYO.L")) ;; SKK-JISYO
++    (jisyo "%PREFIX%/share/skk/SKK-JISYO.L")) ;; SKK-JISYO
+   '(search))
+ 
+ (class-set-method! predict-look-skk search