git: 1c99ec1d1da0 - main - textproc/uim: Update to 1.9.1

From: MANTANI Nobutaka <nobutaka_at_FreeBSD.org>
Date: Sun, 20 Apr 2025 11:00:15 UTC
The branch main has been updated by nobutaka:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1c99ec1d1da053d45b7555f2c48374b228a5b619

commit 1c99ec1d1da053d45b7555f2c48374b228a5b619
Author:     MANTANI Nobutaka <nobutaka@FreeBSD.org>
AuthorDate: 2025-04-20 10:54:49 +0000
Commit:     MANTANI Nobutaka <nobutaka@FreeBSD.org>
CommitDate: 2025-04-20 10:59:06 +0000

    textproc/uim: Update to 1.9.1
    
    - Add japanese/uim-anthy-unicode port that supports Anthy Unicode
      (japanese/anthy-unicode)
    - Bump PORTREVISION of the ports that depend on textproc/uim port
---
 japanese/Makefile                     |  1 +
 japanese/mozc-server/Makefile         |  2 +-
 japanese/scim-uim/Makefile            |  2 +-
 japanese/uim-anthy-unicode/Makefile   | 45 +++++++++++++++++++++++++++++++++++
 japanese/uim-anthy-unicode/pkg-descr  |  1 +
 japanese/uim-anthy-unicode/pkg-plist  |  5 ++++
 japanese/uim-anthy/Makefile           |  2 ++
 japanese/uim-mozc/Makefile            |  2 +-
 japanese/uim-tomoe-gtk/Makefile       |  2 +-
 textproc/uim-el/Makefile              |  3 +--
 textproc/uim-el/distinfo              |  6 ++---
 textproc/uim/Makefile                 |  2 +-
 textproc/uim/distinfo                 |  6 ++---
 textproc/uim/files/patch-configure.ac | 16 ++++++-------
 14 files changed, 74 insertions(+), 21 deletions(-)

diff --git a/japanese/Makefile b/japanese/Makefile
index a044b552d562..b03a3dc6ac45 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -281,6 +281,7 @@
     SUBDIR += today
     SUBDIR += tomoe
     SUBDIR += uim-anthy
+    SUBDIR += uim-anthy-unicode
     SUBDIR += uim-mozc
     SUBDIR += uim-tomoe-gtk
     SUBDIR += vera-fpw
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 2617ddfbf21e..dc52258725ee 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mozc
 PORTVERSION=	2.23.2815.102.01
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	27
+PORTREVISION?=	28
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 36169d64a802..6fc2af0c1cdf 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/uim-anthy-unicode/Makefile b/japanese/uim-anthy-unicode/Makefile
new file mode 100644
index 000000000000..a737bab1e8b1
--- /dev/null
+++ b/japanese/uim-anthy-unicode/Makefile
@@ -0,0 +1,45 @@
+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
+
+CONFLICTS_INSTALL=	ja-uim-anthy
+
+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/japanese/uim-anthy-unicode/pkg-descr b/japanese/uim-anthy-unicode/pkg-descr
new file mode 100644
index 000000000000..dfa21a50a5cb
--- /dev/null
+++ b/japanese/uim-anthy-unicode/pkg-descr
@@ -0,0 +1 @@
+uim plugin using Anthy Unicode input method.
diff --git a/japanese/uim-anthy-unicode/pkg-plist b/japanese/uim-anthy-unicode/pkg-plist
new file mode 100644
index 000000000000..4cb81e231d05
--- /dev/null
+++ b/japanese/uim-anthy-unicode/pkg-plist
@@ -0,0 +1,5 @@
+%%X11%%bin/uim-dict-gtk3
+lib/uim/plugin/libuim-anthy-utf8.so
+%%X11%%%%DATADIR%%/helperdata/uim-dict-ui.xml
+@postexec uim-module-manager --register anthy-utf8
+@preunexec uim-module-manager --unregister anthy-utf8
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index 5776c44736d7..3e9bd2fda066 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -25,6 +25,8 @@ CONFIGURE_ARGS=	--with-anthy --with-anthy-utf8
 CONFIGURE_ARGS+=	--with-gtk3 --enable-dict
 .endif
 
+CONFLICTS_INSTALL=	ja-uim-anthy-unicode
+
 UIM_SLAVE=	yes
 
 do-build:
diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index 5620d3ff8774..7e4ec75e4af2 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	8
+PORTREVISION=	9
 PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index d3d140a8e3b3..fcd4331801d3 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=	21
+PORTREVISION=	22
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 86780e5ec25b..ad1538efca96 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	uim-el
-PORTVERSION=	1.9.0
-PORTREVISION=	1
+PORTVERSION=	1.9.1
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index 3c75d5fcf770..12a5be3cdcd8 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740307779
-SHA256 (uim-uim-1.9.0_GH0.tar.gz) = e1fb10b1e2b8bf633f69f5f681b4398e10129e912ed204c6af74405c27da6045
-SIZE (uim-uim-1.9.0_GH0.tar.gz) = 4050531
+TIMESTAMP = 1745067376
+SHA256 (uim-uim-1.9.1_GH0.tar.gz) = a0af856130a0da6e3b42304a55c59f4acb5f8ad88d6886111241c36951b1be0e
+SIZE (uim-uim-1.9.1_GH0.tar.gz) = 4050008
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 40ec99fb94bc..31ead1715646 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	uim
-PORTVERSION=	1.9.0
+PORTVERSION=	1.9.1
 CATEGORIES?=	textproc
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index ac69a21aa698..a76b61b8cf63 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1740302751
-SHA256 (uim-uim-1.9.0_GH0.tar.gz) = e1fb10b1e2b8bf633f69f5f681b4398e10129e912ed204c6af74405c27da6045
-SIZE (uim-uim-1.9.0_GH0.tar.gz) = 4050531
+TIMESTAMP = 1744556086
+SHA256 (uim-uim-1.9.1_GH0.tar.gz) = a0af856130a0da6e3b42304a55c59f4acb5f8ad88d6886111241c36951b1be0e
+SIZE (uim-uim-1.9.1_GH0.tar.gz) = 4050008
 SHA256 (uim-sigscheme-ccf1f92_GH0.tar.gz) = 320e0e9af6c64fb9fa2b58643792b9ed5b66b9add3ed233a391b6a2518a6313f
 SIZE (uim-sigscheme-ccf1f92_GH0.tar.gz) = 570780
 SHA256 (uim-libgcroots-f019129_GH0.tar.gz) = b88a61336ddf230b083f7185eb94aa0f1d3168204a84d35578eccaf0a61c1800
diff --git a/textproc/uim/files/patch-configure.ac b/textproc/uim/files/patch-configure.ac
index 321bf7faf9a1..d0447119aa33 100644
--- a/textproc/uim/files/patch-configure.ac
+++ b/textproc/uim/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig	2025-02-23 08:00:09 UTC
+--- configure.ac.orig	2025-04-13 09:17:52 UTC
 +++ configure.ac
 @@ -124,7 +124,7 @@ if test "x$with_anthy" = xyes; then
  if test "x$with_anthy" = xyes; then
@@ -9,12 +9,12 @@
                     [AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
                      "libanthy can handle UTF-8")])
  fi
-@@ -142,7 +142,7 @@ if test "x$with_anthy_utf8" != xno; then
-   [with_anthy_utf8=no])
- 
- if test "x$with_anthy_utf8" != xno; then
--  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
-+  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
+@@ -146,7 +146,7 @@ if test "x$with_anthy_utf8" != xno; then
                      [with_anthy_utf8=yes
                       AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
-                      [libanthy can handle UTF-8])],
+                      [libanthy-unicode can handle UTF-8])],
+-                    [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
++                    [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
+                                        [with_anthy_utf8=yes
+                                         AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
+                                         [libanthy can handle UTF-8])],